From cc70d325dbf92ceb34e78ccbff6398446a39c264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20A=CC=8Ahle=CC=81n?= Date: Mon, 8 Jul 2024 11:16:05 +0200 Subject: [PATCH] [ui-core] Upgrade all jest related libraries This upgrades all the jest testing libraries to the latest possible versions. The primary reason was to provide a fix for CVE-2023-48631, a vulnerability with @adobe/css-tools which is a transient dependency of jest-jsdom. - Updated snapshots due to improved format - Moved console.log of editor v2 up to the app.js as it appears in the tests - jest config updated for deprecated configs Manual testing and unit test runs. --- .../desktop/js/apps/editor/EditorViewModel.js | 3 - .../core/src/desktop/js/apps/editor/app.js | 2 + .../__snapshots__/ko.paginator.test.js.snap | 12 +- .../ko.savedQueries.test.js.snap | 12 +- .../ko.syntaxDropdown.test.js.snap | 20 +- .../__snapshots__/LabeledInfo.test.ts.snap | 2 - .../__snapshots__/Modal.test.ts.snap | 7 +- .../components/__snapshots__/Tab.test.ts.snap | 4 +- .../__snapshots__/Tabs.test.ts.snap | 6 +- .../__snapshots__/DropdownDrawer.test.ts.snap | 4 +- .../ko.stickVertical.test.js.snap | 4 +- .../ko.templateContextMenu.test.js.snap | 2 +- .../ko.templatePopover.test.js.snap | 2 +- .../ko.toggleOverflow.test.js.snap | 2 +- .../__snapshots__/ko.toogle.test.js.snap | 2 +- .../__snapshots__/ko.tooltip.test.js.snap | 2 +- .../ko.truncatedText.test.js.snap | 2 +- .../ko.verticalSlide.test.js.snap | 2 +- .../ko.visibleOnHover.test.js.snap | 2 +- .../ko.contextSelector.test.js.snap | 2 +- .../ko.createDirectoryModal.test.js.snap | 22 +- .../ko.deleteDocModal.test.js.snap | 24 +- .../__snapshots__/ko.dropDown.test.js.snap | 12 +- .../ko.executionAnalysis.test.js.snap | 4 +- .../__snapshots__/ko.favoriteApp.test.js.snap | 8 +- .../ko.fieldSamples.test.js.snap | 56 +- .../ko.globalSearch.test.js.snap | 20 +- .../ko.historyPanel.test.js.snap | 28 +- .../ko.importDocumentsModal.test.js.snap | 46 +- .../ko.inlineAutocomplete.test.js.snap | 18 +- .../ko.jobBrowserLinks.test.js.snap | 2 +- .../ko.navProperties.test.js.snap | 42 +- .../__snapshots__/ko.navTags.test.js.snap | 8 +- .../ko.pollingCatalogEntriesList.test.js.snap | 2 +- .../ko.quickQueryAction.test.js.snap | 6 +- .../ko.sentryPrivileges.test.js.snap | 110 +- .../ko.sessionAuthModal.test.js.snap | 42 +- .../ko.sessionPanel.test.js.snap | 10 +- .../ko.shareGistModal.test.js.snap | 26 +- .../ko.sqlColumnsTable.test.js.snap | 36 +- .../__snapshots__/ko.assistKey.test.js.snap | 8 +- .../ko.popoverOnHover.test.js.snap | 2 +- .../__snapshots__/ko.linkSharing.test.js.snap | 44 +- .../ko.shareDocModal.test.js.snap | 16 +- jest.config.js | 7 +- package-lock.json | 3980 +++++++++++------ package.json | 20 +- 47 files changed, 3041 insertions(+), 1652 deletions(-) diff --git a/desktop/core/src/desktop/js/apps/editor/EditorViewModel.js b/desktop/core/src/desktop/js/apps/editor/EditorViewModel.js index d46364a3253..059abb38480 100644 --- a/desktop/core/src/desktop/js/apps/editor/EditorViewModel.js +++ b/desktop/core/src/desktop/js/apps/editor/EditorViewModel.js @@ -37,9 +37,6 @@ import getParameter from 'utils/url/getParameter'; export default class EditorViewModel { constructor(options, CoordinatorEditorViewModel, RunningCoordinatorModel) { - // eslint-disable-next-line no-restricted-syntax - console.log('Editor v2 enabled.'); - this.snippetViewSettings = options.snippetViewSettings; this.URLS = { diff --git a/desktop/core/src/desktop/js/apps/editor/app.js b/desktop/core/src/desktop/js/apps/editor/app.js index d7242bb6c42..82c6ed10dc2 100644 --- a/desktop/core/src/desktop/js/apps/editor/app.js +++ b/desktop/core/src/desktop/js/apps/editor/app.js @@ -49,6 +49,8 @@ huePubSub.subscribe('app.dom.loaded', app => { if (app === 'editor') { window.MAIN_SCROLLABLE = '.page-content'; + console.info('Editor v2 enabled.'); + let isLeftNavOpen = false; huePubSub.subscribe( 'left.nav.open.toggle', diff --git a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.paginator.test.js.snap b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.paginator.test.js.snap index 69ef74204dd..5a218b8267f 100644 --- a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.paginator.test.js.snap +++ b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.paginator.test.js.snap @@ -1,14 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.paginator.js should render component 1`] = ` -"
1\\" style=\\"\\"> +"
" diff --git a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.savedQueries.test.js.snap b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.savedQueries.test.js.snap index 785ddccf0b3..b0a1f68ad58 100644 --- a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.savedQueries.test.js.snap +++ b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.savedQueries.test.js.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.savedQueries.js should render component 1`] = ` -"
-
-
+ + + "> -
+
-

Loading...

+

Loading...

diff --git a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.syntaxDropdown.test.js.snap b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.syntaxDropdown.test.js.snap index dd7db50bfcc..fa011adb04d 100644 --- a/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.syntaxDropdown.test.js.snap +++ b/desktop/core/src/desktop/js/apps/editor/components/__snapshots__/ko.syntaxDropdown.test.js.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.syntaxDropdown.js should match snapshot 1`] = ` -"
-
+
+" style="left: 10px; top: 20px;"> -
-
0\\"> +
+ " `; -exports[`ko.syntaxDropdown.js should render component on show event 1`] = `"
"`; +exports[`ko.syntaxDropdown.js should render component on show event 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/__snapshots__/LabeledInfo.test.ts.snap b/desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/__snapshots__/LabeledInfo.test.ts.snap index ca5343261b2..5c757650112 100644 --- a/desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/__snapshots__/LabeledInfo.test.ts.snap +++ b/desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/__snapshots__/LabeledInfo.test.ts.snap @@ -11,12 +11,10 @@ exports[`LabeledInfo.vue should render 1`] = ` class="labled-info-value" > -
Some item
-
`; diff --git a/desktop/core/src/desktop/js/components/__snapshots__/Modal.test.ts.snap b/desktop/core/src/desktop/js/components/__snapshots__/Modal.test.ts.snap index ae8d380cebf..ff47687bd25 100644 --- a/desktop/core/src/desktop/js/components/__snapshots__/Modal.test.ts.snap +++ b/desktop/core/src/desktop/js/components/__snapshots__/Modal.test.ts.snap @@ -1,7 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Modal.vue should render a modal 1`] = ` - +
diff --git a/desktop/core/src/desktop/js/components/__snapshots__/Tab.test.ts.snap b/desktop/core/src/desktop/js/components/__snapshots__/Tab.test.ts.snap index a7437ef00d5..2f7d7b1c15f 100644 --- a/desktop/core/src/desktop/js/components/__snapshots__/Tab.test.ts.snap +++ b/desktop/core/src/desktop/js/components/__snapshots__/Tab.test.ts.snap @@ -5,7 +5,9 @@ exports[`Tab.vue should render 1`] = ` style="display: none;" > - +
+ Some tab content +
`; diff --git a/desktop/core/src/desktop/js/components/__snapshots__/Tabs.test.ts.snap b/desktop/core/src/desktop/js/components/__snapshots__/Tabs.test.ts.snap index ea1d031f34b..285490b4c78 100644 --- a/desktop/core/src/desktop/js/components/__snapshots__/Tabs.test.ts.snap +++ b/desktop/core/src/desktop/js/components/__snapshots__/Tabs.test.ts.snap @@ -39,8 +39,9 @@ exports[`Tabs.vue should render tabs 1`] = ` class="hue-tab-container" > - -
+
foo @@ -53,7 +54,6 @@ exports[`Tabs.vue should render tabs 1`] = `
-
`; diff --git a/desktop/core/src/desktop/js/components/dropdown/__snapshots__/DropdownDrawer.test.ts.snap b/desktop/core/src/desktop/js/components/dropdown/__snapshots__/DropdownDrawer.test.ts.snap index 2d33462ebc9..9e4e3fec831 100644 --- a/desktop/core/src/desktop/js/components/dropdown/__snapshots__/DropdownDrawer.test.ts.snap +++ b/desktop/core/src/desktop/js/components/dropdown/__snapshots__/DropdownDrawer.test.ts.snap @@ -10,7 +10,9 @@ exports[`DropdownDrawer.vue should render dropdown drawer with slots 1`] = ` style="top: 100%; left: 0px;" > - +
+ Some item +
diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.stickVertical.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.stickVertical.test.js.snap index 64309d6042e..09a95a6336f 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.stickVertical.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.stickVertical.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.stickVertical.js should render binding 1`] = ` -"
-
+"
+
" `; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templateContextMenu.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templateContextMenu.test.js.snap index 143a56456a6..39517cdd8d7 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templateContextMenu.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templateContextMenu.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.templateContextMenu.js should render binding 1`] = `"
"`; +exports[`ko.templateContextMenu.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templatePopover.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templatePopover.test.js.snap index d2f391e7991..5b14524cf71 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templatePopover.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.templatePopover.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.templatePopover.js should render binding 1`] = `"
"`; +exports[`ko.templatePopover.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toggleOverflow.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toggleOverflow.test.js.snap index 5ea6e91d701..b4ee14620d3 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toggleOverflow.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toggleOverflow.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.toggleOverflow.js should render binding 1`] = `"
Some text
"`; +exports[`ko.toggleOverflow.js should render binding 1`] = `"
Some text
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toogle.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toogle.test.js.snap index 1353f8b3734..edeaade97f9 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toogle.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.toogle.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.toggle.js should render binding 1`] = `"
"`; +exports[`ko.toggle.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.tooltip.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.tooltip.test.js.snap index ba821681579..d043d35a9c1 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.tooltip.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.tooltip.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.tooltip.js should render binding 1`] = `"
"`; +exports[`ko.tooltip.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.truncatedText.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.truncatedText.test.js.snap index 8f656382af9..44f55a40b56 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.truncatedText.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.truncatedText.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.truncatedText.js should render binding 1`] = `"
More than 20 charact...
"`; +exports[`ko.truncatedText.js should render binding 1`] = `"
More than 20 charact...
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.verticalSlide.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.verticalSlide.test.js.snap index 3b0d9d611d1..d7e3cfab287 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.verticalSlide.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.verticalSlide.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.verticalSlide.js should render binding 1`] = `"
"`; +exports[`ko.verticalSlide.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.visibleOnHover.test.js.snap b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.visibleOnHover.test.js.snap index 850637318c9..cf9c5dacd91 100644 --- a/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.visibleOnHover.test.js.snap +++ b/desktop/core/src/desktop/js/ko/bindings/__snapshots__/ko.visibleOnHover.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ko.visibleOnHover.js should render binding 1`] = `"
"`; +exports[`ko.visibleOnHover.js should render binding 1`] = `"
"`; diff --git a/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.contextSelector.test.js.snap b/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.contextSelector.test.js.snap index ad6d2234e14..775d27064f3 100644 --- a/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.contextSelector.test.js.snap +++ b/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.contextSelector.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.contextSelector.js should render component 1`] = ` -"
+"
diff --git a/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.createDirectoryModal.test.js.snap b/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.createDirectoryModal.test.js.snap index f228ef51594..5c38ea9227a 100644 --- a/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.createDirectoryModal.test.js.snap +++ b/desktop/core/src/desktop/js/ko/components/__snapshots__/ko.createDirectoryModal.test.js.snap @@ -1,21 +1,21 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ko.createDirectoryModal.js should render component 1`] = ` -"
+"