Merge branch 'master' into dependabot/npm_and_yarn/babel/eslint-parse…

…r-7.22.15

.github/workflows/yamcs-quickstart-e2e.yml

@@ -54,7 +54,7 @@ jobs:
           elif [ "${{ matrix.openmct-version }}" = "stable" ]; then
             npm run build:example
           fi
-      - run: npx playwright@1.36.2 install chromium
+      - run: npx playwright@1.39.0 install chromium
       - name: Get Open MCT e2e tests
         uses: nick-fields/retry@v2
         with:

package.json

@@ -37,7 +37,7 @@
     "@babel/core": "7.20.12",
     "@babel/eslint-parser": "7.22.15",
     "@deploysentinel/playwright": "0.3.4",
-    "@playwright/test": "1.36.2",
+    "@playwright/test": "1.39.0",
     "babel-loader": "9.1.0",
     "babel-plugin-istanbul": "6.1.1",
     "eslint": "8.38.0",
@@ -48,7 +48,7 @@
     "source-map-loader": "4.0.1",
     "uuid": "9.0.0",
     "wait-on": "7.0.1",
-    "webpack": "5.75.0",
+    "webpack": "5.88.2",
     "webpack-cli": "5.0.1",
     "webpack-dev-server": "4.11.1",
     "webpack-merge": "5.8.0"

src/providers/fault-mgmt-providers/utils.js

@@ -20,13 +20,21 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+import { getValue } from '../../utils.js';
+
 function faultModelConvertor(faultData, type) {
+
+    const currentValue = faultData?.parameterDetail?.currentValue
+        && getValue(faultData.parameterDetail.currentValue);
+    const triggerValue = faultData?.parameterDetail?.triggerValue
+        && getValue(faultData.parameterDetail.triggerValue);
+
     return {
         type: type || faultData?.type,
         fault: {
             acknowledged: Boolean(faultData?.acknowledged),
             currentValueInfo: {
-                value: faultData?.parameterDetail?.currentValue?.engValue?.doubleValue,
+                value: currentValue,
                 rangeCondition: faultData?.parameterDetail?.currentValue?.rangeCondition,
                 monitoringResult: faultData?.parameterDetail?.currentValue?.monitoringResult
             },
@@ -39,7 +47,7 @@ function faultModelConvertor(faultData, type) {
             shortDescription: faultData?.parameterDetail?.parameter?.shortDescription,
             triggerTime: faultData?.triggerTime,
             triggerValueInfo: {
-                value: faultData?.parameterDetail?.triggerValue?.engValue?.doubleValue,
+                value: triggerValue,
                 rangeCondition: faultData?.parameterDetail?.triggerValue?.rangeCondition,
                 monitoringResult: faultData?.parameterDetail?.triggerValue?.monitoringResult
             }

src/providers/limit-provider.js

@@ -100,9 +100,7 @@ export default class LimitProvider {
         const limits = domainObject.configuration.limits;
 
         return {
-            limits: () => {
-                return limits;
-            }
+            limits: async () => limits
         };
     }
 

tests/README.md

@@ -11,7 +11,7 @@ yamcs/quickstart and openmct-yamcs (this one).
 3. `make all` in yamcs/quickstart
 4. `cd openmct-yamcs` to move out of yamcs/quickstart
 5. `npm install` in openmct-yamcs
-6. `npx playwright@1.36.2 install chromium` in openmct-yamcs
+6. `npx playwright@1.39.0 install chromium` in openmct-yamcs
 7. Sanity test that yamcs is up with `npm run wait-for-yamcs` in openmct-yamcs
 8. `npm run build:example`
 9. `npm run test:getopensource`

tests/e2e/yamcs/filters.e2e.spec.js

@@ -25,7 +25,7 @@ Filter Specific Tests
 */
 
 const { test, expect } = require('../opensource/pluginFixtures');
-const { createDomainObjectWithDefaults, selectInspectorTab } = require('../opensource/appActions');
+const { createDomainObjectWithDefaults } = require('../opensource/appActions');
 
 test.describe("Filter tests @yamcs", () => {
     test('Can filter events by severity', async ({ page }) => {
@@ -41,7 +41,7 @@ test.describe("Filter tests @yamcs", () => {
         await eventsTreeItem.dragTo(objectPane);
 
         // ensure global filters work
-        await selectInspectorTab(page, 'Filters');
+        await page.getByRole('tab', { name: 'Filters' }).click();
         await page.getByRole('listitem').filter({ hasText: 'Global Filtering' }).locator('span').click();
         await page.getByRole('listitem').filter({ hasText: 'Events' }).locator('span').click();
         await page.locator('[aria-label="Global Filter"]').selectOption('critical');

tests/e2e/yamcs/limits.e2e.spec.js

@@ -25,7 +25,7 @@ MDB Limits Specific Tests
 */
 
 const { test, expect } = require('../opensource/pluginFixtures');
-const { createDomainObjectWithDefaults, selectInspectorTab, waitForPlotsToRender } = require('../opensource/appActions');
+const { createDomainObjectWithDefaults, waitForPlotsToRender } = require('../opensource/appActions');
 
 test.describe("Mdb runtime limits tests @yamcs", () => {
     test('Can show mdb limits when changed', async ({ page }) => {
@@ -69,7 +69,7 @@ test.describe("Mdb runtime limits tests @yamcs", () => {
         await page.click('button[title="Edit"]');
 
         // Expand the "Detector_Temp" plot series options and enable limit lines
-        await selectInspectorTab(page, 'Config');
+        await page.getByRole('tab', { name: 'Config' }).click();
         await page
             .getByRole('list', { name: 'Plot Series Properties' })
             .locator('span')
@@ -154,7 +154,7 @@ test.describe("Mdb runtime limits tests @yamcs", () => {
         await page.click('button[title="Edit"]');
 
         // Expand the "Detector_Temp" plot series options and enable limit lines
-        await selectInspectorTab(page, 'Config');
+        await page.getByRole('tab', { name: 'Config' }).click();
         await page
             .getByRole('list', { name: 'Plot Series Properties' })
             .locator('span')