From d48cc36061e1069dd92edc65c0c1fbc32cf89489 Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Fri, 24 Jan 2025 15:55:48 +0200 Subject: [PATCH] feat(editor): Remove bug reporting button from new canvas (no-changelog) (#12831) --- .../src/components/canvas/Canvas.vue | 2 -- .../src/components/canvas/WorkflowCanvas.vue | 2 -- .../buttons/CanvasControlButtons.test.ts | 22 -------------- .../elements/buttons/CanvasControlButtons.vue | 18 ------------ .../CanvasControlButtons.test.ts.snap | 29 ------------------- .../src/plugins/i18n/locales/en.json | 1 - packages/editor-ui/src/views/NodeView.v2.vue | 1 - 7 files changed, 75 deletions(-) diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue index be51e1f81f..44a5ceaed4 100644 --- a/packages/editor-ui/src/components/canvas/Canvas.vue +++ b/packages/editor-ui/src/components/canvas/Canvas.vue @@ -85,7 +85,6 @@ const props = withDefaults( readOnly?: boolean; executing?: boolean; keyBindings?: boolean; - showBugReportingButton?: boolean; loading?: boolean; }>(), { @@ -771,7 +770,6 @@ provide(CanvasKey, { :class="$style.canvasControls" :position="controlsPosition" :show-interactive="false" - :show-bug-reporting-button="showBugReportingButton" :zoom="viewport.zoom" @zoom-to-fit="onFitView" @zoom-in="onZoomIn" diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue index d32b974a40..1e6ee9972b 100644 --- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue +++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue @@ -23,7 +23,6 @@ const props = withDefaults( eventBus?: EventBus; readOnly?: boolean; executing?: boolean; - showBugReportingButton?: boolean; }>(), { id: 'canvas', @@ -70,7 +69,6 @@ onNodesInitialized(() => { :id="id" :nodes="mappedNodes" :connections="mappedConnections" - :show-bug-reporting-button="showBugReportingButton" :event-bus="eventBus" :read-only="readOnly" v-bind="$attrs" diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts index 9b157da1b8..235f63e085 100644 --- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts +++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts @@ -3,12 +3,6 @@ import CanvasControlButtons from './CanvasControlButtons.vue'; import { setActivePinia } from 'pinia'; import { createTestingPinia } from '@pinia/testing'; -const MOCK_URL = 'mock-url'; - -vi.mock('@/composables/useBugReporting', () => ({ - useBugReporting: () => ({ getReportingURL: () => MOCK_URL }), -})); - const renderComponent = createComponentRenderer(CanvasControlButtons); describe('CanvasControlButtons', () => { @@ -17,27 +11,11 @@ describe('CanvasControlButtons', () => { }); it('should render correctly', () => { - const wrapper = renderComponent({ - props: { - showBugReportingButton: true, - }, - }); - - expect(wrapper.getByTestId('zoom-in-button')).toBeVisible(); - expect(wrapper.getByTestId('zoom-out-button')).toBeVisible(); - expect(wrapper.getByTestId('zoom-to-fit')).toBeVisible(); - expect(wrapper.getByTestId('report-bug')).toBeVisible(); - - expect(wrapper.html()).toMatchSnapshot(); - }); - - it('should render correctly without bug reporting button', () => { const wrapper = renderComponent(); expect(wrapper.getByTestId('zoom-in-button')).toBeVisible(); expect(wrapper.getByTestId('zoom-out-button')).toBeVisible(); expect(wrapper.getByTestId('zoom-to-fit')).toBeVisible(); - expect(wrapper.queryByTestId('report-bug')).not.toBeInTheDocument(); expect(wrapper.html()).toMatchSnapshot(); }); diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue index 72e1e6251c..5d9a7a3435 100644 --- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue +++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue @@ -2,18 +2,14 @@ import { Controls } from '@vue-flow/controls'; import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue'; import { computed } from 'vue'; -import { useBugReporting } from '@/composables/useBugReporting'; -import { useTelemetry } from '@/composables/useTelemetry'; import { useI18n } from '@/composables/useI18n'; const props = withDefaults( defineProps<{ zoom?: number; - showBugReportingButton?: boolean; }>(), { zoom: 1, - showBugReportingButton: false, }, ); @@ -24,8 +20,6 @@ const emit = defineEmits<{ 'zoom-to-fit': []; }>(); -const { getReportingURL } = useBugReporting(); -const telemetry = useTelemetry(); const i18n = useI18n(); const isResetZoomVisible = computed(() => props.zoom !== 1); @@ -45,10 +39,6 @@ function onZoomOut() { function onZoomToFit() { emit('zoom-to-fit'); } - -function trackBugReport() { - telemetry.track('User clicked bug report button in canvas', {}, { withPostHog: true }); -} diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap index cf8ea70a93..d5e55528b1 100644 --- a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap +++ b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap @@ -20,35 +20,6 @@ exports[`CanvasControlButtons > should render correctly 1`] = ` - - - -" -`; - -exports[`CanvasControlButtons > should render correctly without bug reporting button 1`] = ` -"
- - - - - - - - -
" `; diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index be4c0e5fec..25eebc86ae 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -1319,7 +1319,6 @@ "nodeView.redirecting": "Redirecting", "nodeView.refresh": "Refresh", "nodeView.resetZoom": "Reset Zoom", - "nodeView.reportBug": "Report a bug", "nodeView.runButtonText.executeWorkflow": "Test workflow", "nodeView.runButtonText.executingWorkflow": "Executing workflow", "nodeView.runButtonText.waitingForTriggerEvent": "Waiting for trigger event", diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue index 41b765a2d0..459812e946 100644 --- a/packages/editor-ui/src/views/NodeView.v2.vue +++ b/packages/editor-ui/src/views/NodeView.v2.vue @@ -1702,7 +1702,6 @@ onBeforeUnmount(() => { :event-bus="canvasEventBus" :read-only="isCanvasReadOnly" :executing="isWorkflowRunning" - :show-bug-reporting-button="!isDemoRoute || !!executionsStore.activeExecution" :key-bindings="keyBindingsEnabled" @update:nodes:position="onUpdateNodesPosition" @update:node:position="onUpdateNodePosition"