mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(editor): Remove execution annotation feature flag (#11020)

Browse source
This commit is contained in:
Eugene 2024-10-01 15:24:52 +02:00 committed by GitHub
parent 72b70d9d98
commit e7199dbfcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/editor-ui/src/components/executions/ExecutionsFilter.vue
View file

@ -8,10 +8,9 @@ import type {
} from '@/Interface'; } from '@/Interface';
import { i18n as locale } from '@/plugins/i18n'; import { i18n as locale } from '@/plugins/i18n';
import { getObjectKeys, isEmpty } from '@/utils/typesUtils'; import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
import { EnterpriseEditionFeature, EXECUTION_ANNOTATION_EXPERIMENT } from '@/constants'; import { EnterpriseEditionFeature } from '@/constants';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
import { useUIStore } from '@/stores/ui.store'; import { useUIStore } from '@/stores/ui.store';
import { usePostHog } from '@/stores/posthog.store';
import { useTelemetry } from '@/composables/useTelemetry'; import { useTelemetry } from '@/composables/useTelemetry';
import type { Placement } from '@floating-ui/core'; import type { Placement } from '@floating-ui/core';
import { useDebounce } from '@/composables/useDebounce'; import { useDebounce } from '@/composables/useDebounce';
@ -27,7 +26,6 @@ const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
const uiStore = useUIStore(); const uiStore = useUIStore();
const posthogStore = usePostHog();
const { debounce } = useDebounce(); const { debounce } = useDebounce();
const telemetry = useTelemetry(); const telemetry = useTelemetry();
@ -48,11 +46,7 @@ const isCustomDataFilterTracked = ref(false);
const isAdvancedExecutionFilterEnabled = computed( const isAdvancedExecutionFilterEnabled = computed(
() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters], () => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
); );
const isAnnotationFiltersEnabled = computed( const isAnnotationFiltersEnabled = computed(() => isAdvancedExecutionFilterEnabled.value);
() =>
isAdvancedExecutionFilterEnabled.value &&
posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
);
const showTags = computed(() => false); const showTags = computed(() => false);
const getDefaultFilter = (): ExecutionFilterType => ({ const getDefaultFilter = (): ExecutionFilterType => ({

12
packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
View file

@ -2,11 +2,7 @@
import { watch, computed, ref, onMounted } from 'vue'; import { watch, computed, ref, onMounted } from 'vue';
import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue'; import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue'; import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue';
import { import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
EnterpriseEditionFeature,
EXECUTION_ANNOTATION_EXPERIMENT,
MODAL_CONFIRM,
} from '@/constants';
import { useToast } from '@/composables/useToast'; import { useToast } from '@/composables/useToast';
import { useMessage } from '@/composables/useMessage'; import { useMessage } from '@/composables/useMessage';
import { useI18n } from '@/composables/useI18n'; import { useI18n } from '@/composables/useI18n';
@ -17,7 +13,6 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
import { useExecutionsStore } from '@/stores/executions.store'; import { useExecutionsStore } from '@/stores/executions.store';
import type { PermissionsRecord } from '@/permissions'; import type { PermissionsRecord } from '@/permissions';
import { getResourcePermissions } from '@/permissions'; import { getResourcePermissions } from '@/permissions';
import { usePostHog } from '@/stores/posthog.store';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
const props = withDefaults( const props = withDefaults(
@ -42,7 +37,6 @@ const i18n = useI18n();
const telemetry = useTelemetry(); const telemetry = useTelemetry();
const workflowsStore = useWorkflowsStore(); const workflowsStore = useWorkflowsStore();
const executionsStore = useExecutionsStore(); const executionsStore = useExecutionsStore();
const posthogStore = usePostHog();
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
const isMounted = ref(false); const isMounted = ref(false);
@ -72,9 +66,7 @@ const workflows = computed<IWorkflowDb[]>(() => {
}); });
const isAnnotationEnabled = computed( const isAnnotationEnabled = computed(
() => () => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters] &&
posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
); );
watch( watch(

10
packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
View file

@ -2,14 +2,13 @@
import { computed, onMounted } from 'vue'; import { computed, onMounted } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import type { IExecutionUIData } from '@/composables/useExecutionHelpers'; import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
import { EnterpriseEditionFeature, EXECUTION_ANNOTATION_EXPERIMENT, VIEWS } from '@/constants'; import { EnterpriseEditionFeature, VIEWS } from '@/constants';
import ExecutionsTime from '@/components/executions/ExecutionsTime.vue'; import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
import { useExecutionHelpers } from '@/composables/useExecutionHelpers'; import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
import type { ExecutionSummary } from 'n8n-workflow'; import type { ExecutionSummary } from 'n8n-workflow';
import { useWorkflowsStore } from '@/stores/workflows.store'; import { useWorkflowsStore } from '@/stores/workflows.store';
import { useI18n } from '@/composables/useI18n'; import { useI18n } from '@/composables/useI18n';
import type { PermissionsRecord } from '@/permissions'; import type { PermissionsRecord } from '@/permissions';
import { usePostHog } from '@/stores/posthog.store';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
import { toDayMonth, toTime } from '@/utils/formatters/dateFormatter'; import { toDayMonth, toTime } from '@/utils/formatters/dateFormatter';
@ -30,17 +29,12 @@ const locale = useI18n();
const executionHelpers = useExecutionHelpers(); const executionHelpers = useExecutionHelpers();
const workflowsStore = useWorkflowsStore(); const workflowsStore = useWorkflowsStore();
const posthogStore = usePostHog();
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
const isAdvancedExecutionFilterEnabled = computed( const isAdvancedExecutionFilterEnabled = computed(
() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters], () => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
); );
const isAnnotationEnabled = computed( const isAnnotationEnabled = computed(() => isAdvancedExecutionFilterEnabled.value);
() =>
isAdvancedExecutionFilterEnabled.value &&
posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
);
const currentWorkflow = computed(() => (route.params.name as string) || workflowsStore.workflowId); const currentWorkflow = computed(() => (route.params.name as string) || workflowsStore.workflowId);
const retryExecutionActions = computed(() => [ const retryExecutionActions = computed(() => [

14
packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
View file

@ -4,20 +4,15 @@ import { useRoute } from 'vue-router';
import { ElDropdown } from 'element-plus'; import { ElDropdown } from 'element-plus';
import { useExecutionDebugging } from '@/composables/useExecutionDebugging'; import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
import { useMessage } from '@/composables/useMessage'; import { useMessage } from '@/composables/useMessage';
import WorkflowExecutionAnnotationPanel from '@/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue';
import WorkflowPreview from '@/components/WorkflowPreview.vue'; import WorkflowPreview from '@/components/WorkflowPreview.vue';
import { import { EnterpriseEditionFeature, MODAL_CONFIRM, VIEWS } from '@/constants';
EnterpriseEditionFeature,
EXECUTION_ANNOTATION_EXPERIMENT,
MODAL_CONFIRM,
VIEWS,
} from '@/constants';
import type { ExecutionSummary } from 'n8n-workflow'; import type { ExecutionSummary } from 'n8n-workflow';
import type { IExecutionUIData } from '@/composables/useExecutionHelpers'; import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
import { useExecutionHelpers } from '@/composables/useExecutionHelpers'; import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
import { useWorkflowsStore } from '@/stores/workflows.store'; import { useWorkflowsStore } from '@/stores/workflows.store';
import { useI18n } from '@/composables/useI18n'; import { useI18n } from '@/composables/useI18n';
import { getResourcePermissions } from '@/permissions'; import { getResourcePermissions } from '@/permissions';
import { usePostHog } from '@/stores/posthog.store';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
type RetryDropdownRef = InstanceType<typeof ElDropdown>; type RetryDropdownRef = InstanceType<typeof ElDropdown>;
@ -39,7 +34,6 @@ const executionHelpers = useExecutionHelpers();
const message = useMessage(); const message = useMessage();
const executionDebugging = useExecutionDebugging(); const executionDebugging = useExecutionDebugging();
const workflowsStore = useWorkflowsStore(); const workflowsStore = useWorkflowsStore();
const posthogStore = usePostHog();
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
const retryDropdownRef = ref<RetryDropdownRef | null>(null); const retryDropdownRef = ref<RetryDropdownRef | null>(null);
@ -67,9 +61,7 @@ const isRetriable = computed(
); );
const isAnnotationEnabled = computed( const isAnnotationEnabled = computed(
() => () => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters] &&
posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
); );
const hasAnnotation = computed( const hasAnnotation = computed(

1
packages/editor-ui/src/constants.ts
View file

@ -693,7 +693,6 @@ export const MORE_ONBOARDING_OPTIONS_EXPERIMENT = {
variant: 'variant', variant: 'variant',
}; };
export const EXECUTION_ANNOTATION_EXPERIMENT = '023_execution_annotation';
export const CREDENTIAL_DOCS_EXPERIMENT = { export const CREDENTIAL_DOCS_EXPERIMENT = {
name: '024_credential_docs', name: '024_credential_docs',
control: 'control', control: 'control',