From 29335b9b6acf97c817bea70688e8a2786fbd8889 Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Mon, 20 Jan 2025 18:48:16 +0200 Subject: [PATCH] feat(editor): Force final canvas v2 migration and remove switcher from UI (#12717) --- cypress/support/commands.ts | 2 +- .../components/MainHeader/WorkflowDetails.vue | 100 +----------------- .../composables/useNodeViewVersionSwitcher.ts | 2 +- .../src/plugins/i18n/locales/en.json | 7 -- 4 files changed, 7 insertions(+), 104 deletions(-) diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index c414c9fea9..69d245d01a 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -77,7 +77,7 @@ Cypress.Commands.add('signin', ({ email, password }) => { // @TODO Remove this once the switcher is removed cy.window().then((win) => { - win.localStorage.setItem('NodeView.migrated', 'true'); + win.localStorage.setItem('NodeView.migrated.release', 'true'); win.localStorage.setItem('NodeView.switcher.discovered.beta', 'true'); const nodeViewVersion = Cypress.env('NODE_VIEW_VERSION'); diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue index 39fc08ceb2..ba357b1a8d 100644 --- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue +++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue @@ -3,7 +3,6 @@ import { DUPLICATE_MODAL_KEY, EnterpriseEditionFeature, MAX_WORKFLOW_NAME_LENGTH, - MODAL_CLOSE, MODAL_CONFIRM, PLACEHOLDER_EMPTY_WORKFLOW_ID, SOURCE_CONTROL_PUSH_MODAL_KEY, @@ -55,7 +54,6 @@ import { useI18n } from '@/composables/useI18n'; import { useTelemetry } from '@/composables/useTelemetry'; import type { BaseTextKey } from '@/plugins/i18n'; import { useNpsSurveyStore } from '@/stores/npsSurvey.store'; -import { useNodeViewVersionSwitcher } from '@/composables/useNodeViewVersionSwitcher'; import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper'; const props = defineProps<{ @@ -102,16 +100,6 @@ const importFileRef = ref(); const tagsEventBus = createEventBus(); const sourceControlModalEventBus = createEventBus(); -const { - isNewUser, - nodeViewVersion, - nodeViewSwitcherDiscovered, - isNodeViewDiscoveryTooltipVisible, - switchNodeViewVersion, - setNodeViewSwitcherDropdownOpened, - setNodeViewSwitcherDiscovered, -} = useNodeViewVersionSwitcher(); - const hasChanged = (prev: string[], curr: string[]) => { if (prev.length !== curr.length) { return true; @@ -191,33 +179,6 @@ const workflowMenuItems = computed(() => { disabled: !onWorkflowPage.value || isNewWorkflow.value, }); - if (settingsStore.isCanvasV2Enabled) { - actions.push({ - id: WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION, - ...(nodeViewVersion.value === '2' - ? nodeViewSwitcherDiscovered.value || isNewUser.value - ? {} - : { - badge: locale.baseText('menuActions.badge.new'), - } - : nodeViewSwitcherDiscovered.value - ? { - badge: locale.baseText('menuActions.badge.beta'), - badgeProps: { - theme: 'tertiary', - }, - } - : { - badge: locale.baseText('menuActions.badge.new'), - }), - label: - nodeViewVersion.value === '2' - ? locale.baseText('menuActions.switchToOldNodeViewVersion') - : locale.baseText('menuActions.switchToNewNodeViewVersion'), - disabled: !onWorkflowPage.value, - }); - } - if ((workflowPermissions.value.delete && !props.readOnly) || isNewWorkflow.value) { actions.push({ id: WORKFLOW_MENU_ACTIONS.DELETE, @@ -417,10 +378,6 @@ async function handleFileImport(): Promise { } } -function onWorkflowMenuOpen(visible: boolean) { - setNodeViewSwitcherDropdownOpened(visible); -} - async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise { switch (action) { case WORKFLOW_MENU_ACTIONS.DUPLICATE: { @@ -520,36 +477,6 @@ async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise - - - - + diff --git a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts index b0ef4a4f4c..16e1f06977 100644 --- a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts +++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts @@ -15,7 +15,7 @@ export function useNodeViewVersionSwitcher() { const defaultVersion = settingsStore.isCanvasV2Enabled ? '2' : '1'; const nodeViewVersion = useLocalStorage('NodeView.version', defaultVersion); - const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated', false); + const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated.release', false); function setNodeViewSwitcherDropdownOpened(visible: boolean) { if (!visible) { diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 0c227d5462..363f70d42d 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -939,13 +939,6 @@ "menuActions.importFromUrl": "Import from URL...", "menuActions.importFromFile": "Import from File...", "menuActions.delete": "Delete", - "menuActions.switchToNewNodeViewVersion": "Switch to new canvas", - "menuActions.switchToOldNodeViewVersion": "Switch to old canvas", - "menuActions.badge.new": "NEW", - "menuActions.badge.alpha": "ALPHA", - "menuActions.badge.beta": "BETA", - "menuActions.nodeViewDiscovery.tooltip": "You're currently using our new, more performant canvas.", - "menuActions.nodeViewDiscovery.tooltip.switchBack": "You can switch back to the old version using this menu.", "multipleParameter.addItem": "Add item", "multipleParameter.currentlyNoItemsExist": "Currently no items exist", "multipleParameter.deleteItem": "Delete item",