Merge branch 'master' into fix-line-view-edit

nasa · Jul 31, 2023 · 9cbce3c · 9cbce3c
2 parents fcd9024 + f0ef93d
commit 9cbce3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js b/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
@@ -80,19 +80,21 @@ test.describe('Example Imagery Object', () => {
     // flip on independent time conductor
     await page.getByRole('switch', { name: 'Enable Independent Time Conductor' }).click();
     await page.getByRole('button', { name: 'Independent Time Conductor Settings' }).click();
-    await page.getByRole('textbox', { name: 'Start date' }).click();
     await page.getByRole('textbox', { name: 'Start date' }).fill('');
     await page.getByRole('textbox', { name: 'Start date' }).fill('2021-12-30');
-    await page.getByRole('textbox', { name: 'Start time' }).click();
+    await page.keyboard.press('Tab');
     await page.getByRole('textbox', { name: 'Start time' }).fill('');
-    await page.getByRole('textbox', { name: 'Start time' }).fill('01:01:00');
-    await page.getByRole('textbox', { name: 'End date' }).click();
+    await page.getByRole('textbox', { name: 'Start time' }).type('01:01:00');
+    await page.keyboard.press('Tab');
     await page.getByRole('textbox', { name: 'End date' }).fill('');
-    await page.getByRole('textbox', { name: 'End date' }).fill('2021-12-30');
-    await page.getByRole('textbox', { name: 'End time' }).click();
+    await page.getByRole('textbox', { name: 'End date' }).type('2021-12-30');
+    await page.keyboard.press('Tab');
     await page.getByRole('textbox', { name: 'End time' }).fill('');
-    await page.getByRole('textbox', { name: 'End time' }).fill('01:11:00');
-    await page.getByRole('button', { name: 'Submit time bounds' }).click();
+    await page.getByRole('textbox', { name: 'End time' }).type('01:11:00');
+    await page.keyboard.press('Tab');
+    await page.keyboard.press('Enter');
+    // expect(await page.getByRole('button', { name: 'Submit time bounds' }).isEnabled()).toBe(true);
+    // await page.getByRole('button', { name: 'Submit time bounds' }).click();
 
     // check image date
     await expect(page.getByText('2021-12-30 01:11:00.000Z').first()).toBeVisible();

diff --git a/src/ui/layout/mct-tree.vue b/src/ui/layout/mct-tree.vue
@@ -97,7 +97,6 @@
             :loading-items="treeItemLoading"
             :targeted-path="targetedPath"
             @tree-item-mounted="scrollToCheck($event)"
-            @tree-item-destroyed="removeCompositionListenerFor($event)"
             @tree-item-action="treeItemAction(treeItem, $event)"
             @tree-item-selection="treeItemSelection(treeItem)"
             @targeted-path-animation-end="targetedPathAnimationEnd()"

diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue
@@ -191,7 +191,6 @@ export default {
   },
   unmounted() {
     this.openmct.router.off('change:path', this.highlightIfNavigated);
-    this.$emit('tree-item-destroyed', this.navigationPath);
   },
   methods: {
     targetedPathAnimationEnd($event) {