merge main

Author: Anemy

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-unsafe-declaration-merging': 'warn',
 };
 
 const tsRules = {

packages/compass-components/src/components/guide-cue/guide-cue-service.ts

@@ -16,29 +16,14 @@ export type ShowCueEventDetail = CustomEvent<{
   groupId?: GroupName;
 }>;
 
+type CustomEventListenerOrEventListenerObject<E> =
+  | { handleEvent: (evt: E) => void }
+  | ((evt: E) => void);
+
 interface GuideCueEventMap {
   'show-cue': ShowCueEventDetail;
 }
 
-export interface GuideCueService extends EventTarget {
-  addEventListener<K extends keyof GuideCueEventMap>(
-    type: K,
-    listener: (this: GuideCueEventMap, ev: GuideCueEventMap[K]) => void
-  ): void;
-  addEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject
-  ): void;
-  removeEventListener<K extends keyof GuideCueEventMap>(
-    type: K,
-    listener: (this: GuideCueEventMap, ev: GuideCueEventMap[K]) => void
-  ): void;
-  removeEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject
-  ): void;
-}
-
 export type Cue = {
   groupId?: GroupName;
   step: number;
@@ -261,6 +246,30 @@ export class GuideCueService extends EventTarget {
       return this.onNext();
     }
   }
+
+  addEventListener<K extends keyof GuideCueEventMap>(
+    type: K,
+    listener: CustomEventListenerOrEventListenerObject<
+      GuideCueEventMap[K]
+    > | null
+  ): void {
+    return super.addEventListener(
+      type,
+      listener as EventListenerOrEventListenerObject
+    );
+  }
+
+  removeEventListener<K extends keyof GuideCueEventMap>(
+    type: K,
+    listener: CustomEventListenerOrEventListenerObject<
+      GuideCueEventMap[K]
+    > | null
+  ): void {
+    return super.removeEventListener(
+      type,
+      listener as EventListenerOrEventListenerObject
+    );
+  }
 }
 
 export const guideCueService = new GuideCueService(

packages/compass-e2e-tests/helpers/test-runner-context.ts

@@ -344,7 +344,7 @@ process.env.HADRON_DISTRIBUTION ??= context.hadronDistribution;
 process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG ??=
   context.atlasCloudSandboxCloudConfig ?? 'dev';
 
-if (isTestingAtlasCloudSandbox(context)) {
+if (isTestingWeb()) {
   process.env.E2E_TEST_CLOUD_WEB_ENABLE_PREFERENCE_SAVING ??= 'true';
 }
 

packages/compass-e2e-tests/tests/data-modeling-tab.test.ts

@@ -4,7 +4,6 @@ import {
   init,
   cleanup,
   screenshotIfFailed,
-  skipForWeb,
   DEFAULT_CONNECTION_NAME_1,
 } from '../helpers/compass';
 import type { Compass } from '../helpers/compass';
@@ -38,12 +37,10 @@ describe('Data Modeling tab', function () {
   let browser: CompassBrowser;
 
   before(async function () {
-    skipForWeb(this, 'data modeling not yet available in compass-web');
-
     compass = await init(this.test?.fullTitle());
     browser = compass.browser;
-    await browser.setFeature('enableDataModeling', true);
     await browser.setupDefaultConnections();
+    await browser.setFeature('enableDataModeling', true);
   });
 
   beforeEach(async function () {

packages/compass-preferences-model/src/compass-web-preferences-access.ts

@@ -17,6 +17,7 @@ const editablePreferences: (keyof UserPreferences)[] = [
   'enableGenAISampleDocumentPassingOnAtlasProject',
   'enableGenAIFeaturesAtlasOrg',
   'enableGenAIFeaturesAtlasProject',
+  'enableDataModeling',
 ];
 
 export class CompassWebPreferencesAccess implements PreferencesAccess {