From 95a58c983e2ac0eafe7350c6a8718af3fa89a88a Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Thu, 19 Jun 2025 13:19:14 +0200 Subject: [PATCH] chore(eslint-config): re-enable no-duplicate-type-constituents rule --- configs/eslint-config-compass/index.js | 1 - .../modules/pipeline-builder/pipeline-ai.ts | 9 ++++--- .../modules/pipeline-builder/stage-editor.ts | 1 - .../src/components/workspace-container.tsx | 2 +- .../compass-telemetry/src/telemetry-events.ts | 3 +-- .../compass-renderer-connection-storage.ts | 24 ++++++++----------- .../src/pipeline-storage-schema.ts | 4 +--- 7 files changed, 17 insertions(+), 27 deletions(-) diff --git a/configs/eslint-config-compass/index.js b/configs/eslint-config-compass/index.js index a7f2479d9b6..aa248ca4963 100644 --- a/configs/eslint-config-compass/index.js +++ b/configs/eslint-config-compass/index.js @@ -26,7 +26,6 @@ const extraTsRules = { '@typescript-eslint/no-explicit-any': 'warn', '@typescript-eslint/no-base-to-string': 'warn', '@typescript-eslint/unbound-method': 'warn', - '@typescript-eslint/no-duplicate-type-constituents': 'warn', '@typescript-eslint/no-unsafe-declaration-merging': 'warn', }; diff --git a/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-ai.ts b/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-ai.ts index f2f980d485a..c932aadfe67 100644 --- a/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-ai.ts +++ b/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-ai.ts @@ -430,14 +430,14 @@ export const cancelAIPipelineGeneration = (): PipelineBuilderThunkAction< }; }; -type resetIsAggregationGeneratedFromQueryAction = { +type ResetIsAggregationGeneratedFromQueryAction = { type: AIPipelineActionTypes.resetIsAggregationGeneratedFromQuery; }; export const resetIsAggregationGeneratedFromQuery = (): PipelineBuilderThunkAction< void, - resetIsAggregationGeneratedFromQueryAction + ResetIsAggregationGeneratedFromQueryAction > => { return (dispatch) => { dispatch({ @@ -477,9 +477,8 @@ export type AIPipelineAction = | AIPipelineFailedAction | LoadGeneratedPipelineAction | PipelineGeneratedFromQueryAction - | LoadGeneratedPipelineAction | CancelAIPipelineGenerationAction - | resetIsAggregationGeneratedFromQueryAction + | ResetIsAggregationGeneratedFromQueryAction | ShowInputAction | HideInputAction | ChangeAIPromptTextAction; @@ -567,7 +566,7 @@ const aiPipelineReducer: Reducer = ( } if ( - isAction( + isAction( action, AIPipelineActionTypes.resetIsAggregationGeneratedFromQuery ) diff --git a/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.ts b/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.ts index 2058bf21da0..5134f9bdf2e 100644 --- a/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.ts +++ b/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.ts @@ -171,7 +171,6 @@ export type StageEditorAction = | ChangeStageValueAction | ChangeStageOperatorAction | ChangeStageCollapsedAction - | ChangeStageOperatorAction | ChangeStageDisabledAction | StageAddAction | StageRemoveAction diff --git a/packages/compass-components/src/components/workspace-container.tsx b/packages/compass-components/src/components/workspace-container.tsx index 06e16747154..5bd5650927a 100644 --- a/packages/compass-components/src/components/workspace-container.tsx +++ b/packages/compass-components/src/components/workspace-container.tsx @@ -120,7 +120,7 @@ function WorkspaceContainer({ children: | React.ReactNode | (( - scrollTriggerRef: (node?: Element | null | undefined) => void + scrollTriggerRef: (node?: Element | null) => void ) => React.ReactNode); }) { const darkMode = useDarkMode(); diff --git a/packages/compass-telemetry/src/telemetry-events.ts b/packages/compass-telemetry/src/telemetry-events.ts index 74efba55607..1676d4dd147 100644 --- a/packages/compass-telemetry/src/telemetry-events.ts +++ b/packages/compass-telemetry/src/telemetry-events.ts @@ -205,8 +205,7 @@ type AggregationEditedEvent = ConnectionScopedEvent<{ | 'stage_renamed' | 'stage_added' | 'stage_deleted' - | 'stage_reordered' - | 'stage_added'; + | 'stage_reordered'; /** * The name of the stage edited. diff --git a/packages/connection-storage/src/compass-renderer-connection-storage.ts b/packages/connection-storage/src/compass-renderer-connection-storage.ts index d12f32e3a68..e5cb8574d49 100644 --- a/packages/connection-storage/src/compass-renderer-connection-storage.ts +++ b/packages/connection-storage/src/compass-renderer-connection-storage.ts @@ -53,9 +53,9 @@ class CompassRendererConnectionStorage implements ConnectionStorage { return ipc; } - loadAll( - options?: { signal?: AbortSignal | undefined } | undefined - ): Promise { + loadAll(options?: { + signal?: AbortSignal | undefined; + }): Promise { return this.ipc.loadAll(options); } @@ -86,9 +86,9 @@ class CompassRendererConnectionStorage implements ConnectionStorage { return await this.ipc.getAutoConnectInfo(autoConnectPreferences); } - getLegacyConnections( - options?: { signal?: AbortSignal | undefined } | undefined - ): Promise<{ name: string }[]> { + getLegacyConnections(options?: { + signal?: AbortSignal | undefined; + }): Promise<{ name: string }[]> { return this.ipc.getLegacyConnections(options); } @@ -100,14 +100,10 @@ class CompassRendererConnectionStorage implements ConnectionStorage { return this.ipc.deserializeConnections(args); } - exportConnections( - args?: - | { - options?: ExportConnectionOptions | undefined; - signal?: AbortSignal | undefined; - } - | undefined - ): Promise { + exportConnections(args?: { + options?: ExportConnectionOptions | undefined; + signal?: AbortSignal | undefined; + }): Promise { return this.ipc.exportConnections(args); } diff --git a/packages/my-queries-storage/src/pipeline-storage-schema.ts b/packages/my-queries-storage/src/pipeline-storage-schema.ts index 198ab2685eb..35bfbe53ada 100644 --- a/packages/my-queries-storage/src/pipeline-storage-schema.ts +++ b/packages/my-queries-storage/src/pipeline-storage-schema.ts @@ -26,9 +26,7 @@ type StoredLegacyPipelineStage = { stage: string; }; -function savedPipelineToText( - pipeline?: StoredLegacyPipelineStage[] | undefined -): string { +function savedPipelineToText(pipeline?: StoredLegacyPipelineStage[]): string { const stages = pipeline?.map(({ stageOperator, isEnabled, stage }) => { return stageToString(stageOperator, stage, !isEnabled);