@finos/legend-application-studio 28.21.42 → 28.21.44

package/src/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.ts

@@ -15,10 +15,8 @@
  */
 
 import {
-  type AppDirNode,
   type ArtifactGenerationExtensionResult,
   type BatchLambdasRelationTypeResult,
-  type IngestDefinition,
   type Mapping,
   type PackageableElement,
   type RawLambda,
@@ -31,7 +29,6 @@ import {
   type V1_RawLineageModel,
   AccessPoint,
   AccessPointGroup,
-  AppDirOwner,
   CodeCompletionResult,
   DataElement,
   DataElementReference,
@@ -70,10 +67,8 @@ import {
   ActionState,
   addUniqueEntry,
   assertErrorThrown,
-  assertTrue,
   deleteEntry,
   filterByType,
-  guaranteeNonNullable,
   guaranteeType,
   LogEvent,
   returnUndefOnError,
@@ -98,11 +93,6 @@ import {
   EditorInitialConfiguration,
 } from '../ElementEditorInitialConfiguration.js';
 import { EXTERNAL_APPLICATION_NAVIGATION__generateUrlWithEditorConfig } from '../../../../../__lib__/LegendStudioNavigation.js';
-import type {
-  AdhocDataProductDeployResponse,
-  LakehouseIngestionManager,
-} from '@finos/legend-server-lakehouse';
-import { LegendStudioTelemetryHelper } from '../../../../../__lib__/LegendStudioTelemetryHelper.js';
 
 export enum DATA_PRODUCT_TAB {
   HOME = 'Home',
@@ -307,7 +297,6 @@ export class LakehouseAccessPointState extends AccessPointState {
   generatingArtifactState = ActionState.create();
   relationElementState: RelationElementState | undefined;
   showSampleValuesEditor = true;
-  showSampleValuesModal = false;
 
   // Add lineage state and isGeneratingLineage
   lineageState: LineageState;
@@ -324,8 +313,6 @@ export class LakehouseAccessPointState extends AccessPointState {
       relationElementState: observable,
       showSampleValuesEditor: observable,
       setShowSampleValuesEditor: action,
-      showSampleValuesModal: observable,
-      setShowSampleValuesModal: action,
       addRelationElement: action,
       deleteRelationElement: action,
       createAndaddRelationElement: flow,
@@ -386,10 +373,6 @@ export class LakehouseAccessPointState extends AccessPointState {
     this.showSampleValuesEditor = value;
   }
 
-  setShowSampleValuesModal(value: boolean): void {
-    this.showSampleValuesModal = value;
-  }
-
   getRelationElementState(): RelationElementState | undefined {
     const relationElement = this.getRelationElement();
     return relationElement
@@ -457,10 +440,11 @@ export class LakehouseAccessPointState extends AccessPointState {
     }
 
     newElement.rows = [];
-    this.addRelationElement(observe_RelationElement(newElement), true);
+    this.addRelationElement(observe_RelationElement(newElement));
+    this.relationElementState?.addRow();
   }
 
-  addRelationElement(newElement: RelationElement, openModal: boolean): void {
+  addRelationElement(newElement: RelationElement): void {
     const product = this.state.state.product;
 
     let relationElementsData = product.sampleValues?.find(
@@ -480,10 +464,6 @@ export class LakehouseAccessPointState extends AccessPointState {
     addUniqueEntry(relationElementsData.relationElements, newElement);
 
     this.relationElementState = new RelationElementState(newElement);
-
-    if (openModal) {
-      this.setShowSampleValuesModal(true);
-    }
   }
 
   deleteRelationElement(): void {
@@ -795,11 +775,9 @@ export const generateUrlToDeployOnOpen = (
 };
 
 export class DataProductEditorState extends ElementEditorState {
-  deploymentState = ActionState.create();
   accessPointGroupStates: AccessPointGroupState[] = [];
   isConvertingTransformLambdaObjects = false;
   deployOnOpen = false;
-  deployResponse: AdhocDataProductDeployResponse | undefined;
   selectedGroupState: AccessPointGroupState | undefined;
   selectedTab: DATA_PRODUCT_TAB;
   modelledDataProduct = false;
@@ -821,11 +799,8 @@ export class DataProductEditorState extends ElementEditorState {
       setSelectedTab: action,
       addGroupState: action,
       deleteGroupState: action,
-      deploy: flow,
       deployOnOpen: observable,
-      deployResponse: observable,
       setDeployOnOpen: action,
-      setDeployResponse: action,
       addAccessPoint: action,
       convertAccessPointsFuncObjects: flow,
       batchUpdateLambdaRelationColumns: flow,
@@ -862,12 +837,6 @@ export class DataProductEditorState extends ElementEditorState {
     this.deployOnOpen = value;
   }
 
-  setDeployResponse(
-    response: AdhocDataProductDeployResponse | undefined,
-  ): void {
-    this.deployResponse = response;
-  }
-
   setSelectedTab(value: DATA_PRODUCT_TAB): void {
     this.selectedTab = value;
   }
@@ -1075,57 +1044,6 @@ export class DataProductEditorState extends ElementEditorState {
     }
   }
 
-  *deploy(token: string | undefined): GeneratorFn<void> {
-    try {
-      assertTrue(
-        this.validForDeployment,
-        'Data product definition is not valid for deployment',
-      );
-      this.deploymentState.inProgress();
-      // The grammar we provide will be for the current data product + all ingests (used for compilation)
-      const grammar =
-        (yield this.editorStore.graphManagerState.graphManager.elementsToPureCode(
-          [...this.editorStore.graphManagerState.graph.ingests, this.product],
-        )) as unknown as string;
-
-      const response = (yield guaranteeNonNullable(
-        this.ingestionManager,
-      ).deployDataProduct(
-        grammar,
-        guaranteeNonNullable(this.appDirDeployment),
-        (val: string) =>
-          this.editorStore.applicationStore.alertService.setBlockingAlert({
-            message: val,
-            showLoading: true,
-          }),
-        token,
-      )) as unknown as AdhocDataProductDeployResponse;
-      LegendStudioTelemetryHelper.logEvent_LakehouseDeployDataProduct(
-        this.editorStore.applicationStore.telemetryService,
-        this.editorStore.editorMode.getSourceInfo(),
-        this.product.path,
-      );
-
-      this.setDeployResponse(response);
-    } catch (error) {
-      assertErrorThrown(error);
-      this.editorStore.applicationStore.notificationService.notifyError(
-        `Ingest definition failed to deploy: ${error.message}`,
-      );
-      LegendStudioTelemetryHelper.logEvent_LakehouseDeployDataProductFailure(
-        this.editorStore.applicationStore.telemetryService,
-        this.editorStore.editorMode.getSourceInfo(),
-        this.product.path,
-        error.message,
-      );
-    } finally {
-      this.deploymentState.complete();
-      this.editorStore.applicationStore.alertService.setBlockingAlert(
-        undefined,
-      );
-    }
-  }
-
   clearSupportInfo(): void {
     const supportInfo = this.product.supportInfo;
     runInAction(() => {
@@ -1160,44 +1078,10 @@ export class DataProductEditorState extends ElementEditorState {
     );
   }
 
-  get validForDeployment(): boolean {
-    return Boolean(this.appDirDeployment && this.ingestionManager);
-  }
-
   get accessPoints(): AccessPoint[] {
     return this.product.accessPointGroups.map((e) => e.accessPoints).flat();
   }
 
-  get ingestionManager(): LakehouseIngestionManager | undefined {
-    return this.editorStore.ingestionManager;
-  }
-
-  get deployValidationMessage(): string {
-    if (!this.appDirDeployment) {
-      return 'No app dir deployment found';
-    } else if (!this.ingestionManager) {
-      return 'No ingestion manager found';
-    }
-    return 'Deploy';
-  }
-
-  // Use explicit owner from the data product if available, otherwise fall back to the associated ingest's app dir deployment
-  get appDirDeployment(): AppDirNode | undefined {
-    const owner = this.product.owner;
-    if (owner instanceof AppDirOwner) {
-      return owner.production;
-    }
-    return this.associatedIngest?.appDirDeployment;
-  }
-
-  // We need to get the associated Ingest to get the app dir deployment
-  // We could do a more in depth check on the access point lambdas to check which ingest it uses but for now
-  // we will assume all ingests have the same DID
-  // we get the last one, to prioritize the ones in the current project followed by dependency ones
-  get associatedIngest(): IngestDefinition | undefined {
-    return this.editorStore.graphManagerState.graph.ingests.slice(-1)[0];
-  }
-
   override reprocess(
     newElement: PackageableElement,
     editorStore: EditorStore,

package/src/stores/editor/editor-state/element-editor-state/ingest/IngestDefinitionEditorState.ts

@@ -28,35 +28,17 @@ import type { EditorStore } from '../../../EditorStore.js';
 import {
   ActionState,
   assertErrorThrown,
-  assertTrue,
-  guaranteeNonNullable,
   guaranteeType,
   LogEvent,
-  removePrefix,
   type GeneratorFn,
 } from '@finos/legend-shared';
-import {
-  action,
-  computed,
-  flow,
-  flowResult,
-  makeObservable,
-  observable,
-} from 'mobx';
-import type {
-  IngestDefinitionDeploymentResponse,
-  IngestDefinitionValidationResponse,
-  LakehouseIngestionManager,
-  ValidateAndDeploymentResponse,
-} from '@finos/legend-server-lakehouse';
+import { action, flow, makeObservable, observable } from 'mobx';
 import {
   EditorInitialConfiguration,
   IngestElementEditorInitialConfiguration,
 } from '../ElementEditorInitialConfiguration.js';
-import type { AuthContextProps } from 'react-oidc-context';
 import { EXTERNAL_APPLICATION_NAVIGATION__generateUrlWithEditorConfig } from '../../../../../__lib__/LegendStudioNavigation.js';
 import { LineageState } from '@finos/legend-query-builder';
-import { LegendStudioTelemetryHelper } from '../../../../../__lib__/LegendStudioTelemetryHelper.js';
 import { IngestTestableState } from './IngestTestableState.js';
 
 export enum INGEST_DEFINITION_TAB {
@@ -88,8 +70,6 @@ export const generateUrlToDeployOnOpen = (
   );
 };
 
-const PARSER_SECTION = `###Lakehouse`;
-
 type CachedIngestArtifact = {
   hashCode: string;
   artifact: IngestionDefinitionArtifact;
@@ -97,8 +77,6 @@ type CachedIngestArtifact = {
 
 export class IngestDefinitionEditorState extends ElementEditorState {
   selectedTab = INGEST_DEFINITION_TAB.DEFINITION;
-  validateAndDeployResponse: ValidateAndDeploymentResponse | undefined;
-  deploymentState = ActionState.create();
   lineageGenerationState = ActionState.create();
   artifactGenerationState = ActionState.create();
   ingestionArtifact: IngestionDefinitionArtifact | undefined;
@@ -116,19 +94,13 @@ export class IngestDefinitionEditorState extends ElementEditorState {
 
     makeObservable(this, {
       selectedTab: observable,
-      deploymentState: observable,
       deployOnOpen: observable,
       setDeployOnOpen: observable,
       cachedArtfact: observable,
-      validateAndDeployResponse: observable,
       ingestionArtifact: observable,
-      deploymentResponse: computed,
       setSelectedTab: action,
-      setValidateAndDeployResponse: action,
       setIngestCachedArtifact: action,
       setIngestionArtifact: action,
-      init_with_deploy: flow,
-      deploy: flow,
       generateLineage: flow,
       generateArtifact: flow,
     });
@@ -148,26 +120,6 @@ export class IngestDefinitionEditorState extends ElementEditorState {
     this.selectedTab = val;
   }
 
-  get deploymentResponse():
-    | IngestDefinitionDeploymentResponse
-    | IngestDefinitionValidationResponse
-    | undefined {
-    return (
-      this.validateAndDeployResponse?.deploymentResponse ??
-      this.validateAndDeployResponse?.validationResponse
-    );
-  }
-
-  get ingestionManager(): LakehouseIngestionManager | undefined {
-    return this.editorStore.ingestionManager;
-  }
-
-  setValidateAndDeployResponse(
-    val: ValidateAndDeploymentResponse | undefined,
-  ): void {
-    this.validateAndDeployResponse = val;
-  }
-
   setDeployOnOpen(value: boolean): void {
     this.deployOnOpen = value;
   }
@@ -180,76 +132,6 @@ export class IngestDefinitionEditorState extends ElementEditorState {
     this.cachedArtfact = val;
   }
 
-  *init_with_deploy(auth: AuthContextProps): GeneratorFn<void> {
-    this.setDeployOnOpen(false);
-    if (!auth.isAuthenticated) {
-      auth
-        .signinRedirect({
-          state: generateUrlToDeployOnOpen(this),
-        })
-        .catch(this.editorStore.applicationStore.alertUnhandledError);
-      return;
-    }
-    const token = auth.user?.access_token;
-    yield flowResult(this.generateElementGrammar()).catch(
-      this.editorStore.applicationStore.alertUnhandledError,
-    );
-    flowResult(this.deploy(token)).catch(
-      this.editorStore.applicationStore.alertUnhandledError,
-    );
-  }
-
-  *deploy(token: string | undefined): GeneratorFn<void> {
-    try {
-      assertTrue(
-        this.validForDeployment,
-        'Ingest definition is not valid for deployment',
-      );
-      this.deploymentState.inProgress();
-      const response = (yield guaranteeNonNullable(
-        this.ingestionManager,
-      ).deploy(
-        // remove parser prefix for now since api already expects it to be under lakehouse parser
-        guaranteeNonNullable(removePrefix(this.textContent, PARSER_SECTION)),
-        guaranteeNonNullable(this.ingest.appDirDeployment),
-        (val: string) =>
-          this.editorStore.applicationStore.alertService.setBlockingAlert({
-            message: val,
-            showLoading: true,
-          }),
-        token,
-      )) as unknown as ValidateAndDeploymentResponse;
-      this.editorStore.applicationStore.alertService.setBlockingAlert(
-        undefined,
-      );
-      if (response.deploymentResponse) {
-        LegendStudioTelemetryHelper.logEvent_LakehouseDeployIngest(
-          this.editorStore.applicationStore.telemetryService,
-          this.editorStore.editorMode.getSourceInfo(),
-          response.deploymentResponse.ingestDefinitionUrn,
-          this.ingest.path,
-        );
-      }
-      this.setValidateAndDeployResponse(response);
-    } catch (error) {
-      this.editorStore.applicationStore.alertService.setBlockingAlert(
-        undefined,
-      );
-      assertErrorThrown(error);
-      LegendStudioTelemetryHelper.logEvent_LakehouseDeployIngestFailure(
-        this.editorStore.applicationStore.telemetryService,
-        this.editorStore.editorMode.getSourceInfo(),
-        this.ingest.path,
-        error.message,
-      );
-      this.editorStore.applicationStore.notificationService.notifyError(
-        `Ingest definition failed to deploy: ${error.message}`,
-      );
-    } finally {
-      this.deploymentState.complete();
-    }
-  }
-
   getMatviewFuncNames(): string[] {
     return (
       this.ingest.TEMPORARY_MATVIEW_FUNCTION_DATA_SETS?.map(
@@ -358,27 +240,10 @@ export class IngestDefinitionEditorState extends ElementEditorState {
     return new IngestDefinitionEditorState(editorStore, newElement);
   }
 
-  get validForDeployment(): boolean {
-    return Boolean(
-      this.ingest.appDirDeployment && this.textContent && this.ingestionManager,
-    );
-  }
-
   get validForLineageViewer(): boolean {
     return Boolean(this.ingest.TEMPORARY_MATVIEW_FUNCTION_DATA_SETS?.length);
   }
 
-  get validationMessage(): string {
-    if (!this.ingest.appDirDeployment) {
-      return 'No app dir deployment found';
-    } else if (!this.textContent) {
-      return 'No ingest definition found';
-    } else if (!this.ingestionManager) {
-      return 'No ingestion manager found';
-    }
-    return 'Deploy';
-  }
-
   get ingest(): IngestDefinition {
     return guaranteeType(
       this.element,

package/src/stores/editor/editor-state/element-editor-state/service/testable/ServiceTestDataState.ts

@@ -426,6 +426,7 @@ export class ConnectionTestDataState {
       // move this out
       LegendStudioTelemetryHelper.logEvent_TestDataGenerationLaunched(
         this.testDataState.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
       );
       const report = reportGraphAnalytics(
         this.editorStore.graphManagerState.graph,
@@ -457,6 +458,7 @@ export class ConnectionTestDataState {
       LegendStudioTelemetryHelper.logEvent_TestDataGenerationSucceeded(
         this.editorStore.applicationStore.telemetryService,
         report,
+        this.editorStore.editorMode.getSourceInfo(),
       );
       service_setConnectionTestDataEmbeddedData(
         this.connectionData,
@@ -541,6 +543,7 @@ export class ConnectionTestDataState {
       // move this out
       LegendStudioTelemetryHelper.logEvent_TestDataGenerationLaunched(
         this.testDataState.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
       );
       const report = reportGraphAnalytics(
         this.editorStore.graphManagerState.graph,
@@ -593,6 +596,7 @@ export class ConnectionTestDataState {
       LegendStudioTelemetryHelper.logEvent_TestDataGenerationSucceeded(
         this.editorStore.applicationStore.telemetryService,
         report,
+        this.editorStore.editorMode.getSourceInfo(),
       );
       service_setConnectionTestDataEmbeddedData(
         this.connectionData,

package/src/stores/editor/sidebar-state/LocalChangesState.ts

@@ -57,6 +57,12 @@ import {
   EntityChangeType,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../__lib__/LegendStudioEvent.js';
+import {
+  GRAPH_EDITOR_MODE_LABEL,
+  LegendStudioTelemetryHelper,
+} from '../../../__lib__/LegendStudioTelemetryHelper.js';
+import { GraphEditGrammarModeState } from '../GraphEditGrammarModeState.js';
+import { GraphEditLazyGrammarModeState } from '../../lazy-text-editor/LazyTextEditorStore.js';
 import { WorkspaceSyncState } from './WorkspaceSyncState.js';
 import { ACTIVITY_MODE } from '../EditorConfig.js';
 import { EntityChangeConflictEditorState } from '../editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js';
@@ -318,6 +324,17 @@ export abstract class LocalChangesState {
 
   abstract computeLocalEntityChanges(): EntityChange[];
 
+  private getGraphEditorModeLabel(): GRAPH_EDITOR_MODE_LABEL {
+    const graphEditorMode = this.editorStore.graphEditorMode;
+    if (graphEditorMode instanceof GraphEditLazyGrammarModeState) {
+      return GRAPH_EDITOR_MODE_LABEL.STRICT_TEXT;
+    }
+    if (graphEditorMode instanceof GraphEditGrammarModeState) {
+      return GRAPH_EDITOR_MODE_LABEL.TEXT;
+    }
+    return GRAPH_EDITOR_MODE_LABEL.FORM;
+  }
+
   *pushLocalChanges(pushMessage?: string): GeneratorFn<void> {
     if (
       this.pushChangesState.isInProgress ||
@@ -331,10 +348,21 @@ export abstract class LocalChangesState {
     this.pushChangesState.inProgress();
     const startTime = Date.now();
     const localChanges = this.computeLocalEntityChanges();
+    const mode = this.getGraphEditorModeLabel();
     if (!localChanges.length) {
+      LegendStudioTelemetryHelper.logEvent_PushLocalChangesEmpty(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        { mode },
+      );
       this.pushChangesState.complete();
       return;
     }
+    LegendStudioTelemetryHelper.logEvent_PushLocalChangesLaunched(
+      this.editorStore.applicationStore.telemetryService,
+      this.editorStore.editorMode.getSourceInfo(),
+      { mode, changeCount: localChanges.length },
+    );
     yield flowResult(
       this.sdlcState.fetchRemoteWorkspaceRevision(
         this.sdlcState.activeProject.projectId,
@@ -423,6 +451,16 @@ export abstract class LocalChangesState {
         syncFinishedTime - startTime,
         'ms',
       );
+      LegendStudioTelemetryHelper.logEvent_PushLocalChangesSucceeded(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        {
+          mode,
+          changeCount: localChanges.length,
+          durationMs: syncFinishedTime - startTime,
+          revisionId: latestRevision.id,
+        },
+      );
 
       // ======= (RE)START CHANGE DETECTION =======
 
@@ -515,6 +553,15 @@ export abstract class LocalChangesState {
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
+      LegendStudioTelemetryHelper.logEvent_PushLocalChangesFailure(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        {
+          mode,
+          changeCount: localChanges.length,
+          errorMessage: error.message,
+        },
+      );
       if (
         error instanceof NetworkClientError &&
         error.response.status === HttpStatus.CONFLICT

package/src/stores/editor/sidebar-state/WorkspaceUpdaterState.ts

@@ -41,6 +41,7 @@ import {
   RevisionAlias,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../__lib__/LegendStudioEvent.js';
+import { LegendStudioTelemetryHelper } from '../../../__lib__/LegendStudioTelemetryHelper.js';
 
 export class WorkspaceUpdaterState {
   readonly editorStore: EditorStore;
@@ -273,6 +274,10 @@ export class WorkspaceUpdaterState {
         prompt: 'Please do not close the application',
         showLoading: true,
       });
+      LegendStudioTelemetryHelper.logEvent_WorkspaceUpdateLaunched(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+      );
       const workspaceUpdateReport =
         (yield this.editorStore.sdlcServerClient.updateWorkspace(
           this.sdlcState.activeProject.projectId,
@@ -283,6 +288,14 @@ export class WorkspaceUpdaterState {
         Date.now() - startTime,
         'ms',
       );
+      LegendStudioTelemetryHelper.logEvent_WorkspaceUpdateSucceeded(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        {
+          status: workspaceUpdateReport.status,
+          durationMs: Date.now() - startTime,
+        },
+      );
       this.sdlcState.isWorkspaceOutdated = false;
       switch (workspaceUpdateReport.status) {
         // TODO: we might want to handle the situation more gracefully rather than just reloading the page
@@ -302,6 +315,11 @@ export class WorkspaceUpdaterState {
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
+      LegendStudioTelemetryHelper.logEvent_WorkspaceUpdateFailure(
+        this.editorStore.applicationStore.telemetryService,
+        this.editorStore.editorMode.getSourceInfo(),
+        error.message,
+      );
       this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.editorStore.applicationStore.alertService.setBlockingAlert(

package/src/stores/editor/sidebar-state/dev-metadata/DevMetadataState.ts

@@ -156,12 +156,18 @@ export class DevMetadataState {
         'Project Name required to push to dev mode',
       );
       this.pushState.inProgress();
+      const graph = this.editorStore.graphManagerState.graph;
+      const lakehouseElementCounts = {
+        ingestCount: graph.ownIngests.length,
+        dataProductCount: graph.ownDataProducts.length,
+      };
       LegendStudioTelemetryHelper.logEvent_DevMetadataPushLaunched(
         this.editorStore.applicationStore.telemetryService,
         this.editorStore.editorMode.getSourceInfo(),
         currentProjectConfiguration.groupId,
         currentProjectConfiguration.artifactId,
         undefined,
+        lakehouseElementCounts,
       );
       const result =
         (yield this.editorStore.graphManagerState.graphManager.pushToDevMetadata(
@@ -179,6 +185,7 @@ export class DevMetadataState {
         currentProjectConfiguration.artifactId,
         undefined,
         result.finalStatus,
+        lakehouseElementCounts,
       );
       this.pushState.complete();
     } catch (error) {

package/src/stores/lazy-text-editor/LazyTextEditorStore.ts

@@ -64,6 +64,10 @@ export class GraphEditLazyGrammarModeState extends GraphEditGrammarModeState {
     return 'Strict Text Mode (BETA)';
   }
 
+  protected override get isStrictTextMode(): boolean {
+    return true;
+  }
+
   override *onLeave(): GeneratorFn<void> {
     this.editorStore.applicationStore.alertService.setBlockingAlert(undefined);
     this.editorStore.applicationStore.alertService.setActionAlertInfo({

package/src/stores/project-reviewer/ProjectReviewerStore.ts

@@ -222,7 +222,11 @@ export class ProjectReviewerStore {
             baseUrl: this.editorStore.applicationStore.config.engineServerUrl,
             queryBaseUrl:
               this.editorStore.applicationStore.config.engineQueryServerUrl,
+            queryClientName:
+              this.editorStore.applicationStore.config.engineQueryClientName,
             enableCompression: true,
+            useCookieAuthOnly:
+              this.editorStore.applicationStore.config.engineUseCookieAuthOnly,
           },
         },
         {

package/src/stores/project-view/ProjectViewerEditorMode.ts

@@ -32,7 +32,6 @@ import {
   LegendSourceType,
   type LegendGAVSourceInfo,
   type LegendProjectIdSourceInfo,
-  type LegendSourceInfo,
 } from '@finos/legend-storage';
 
 export class ProjectViewerEditorMode extends EditorMode {
@@ -100,20 +99,34 @@ export class ProjectViewerEditorMode extends EditorMode {
     return !this.viewerStore.projectGAVCoordinates;
   }
 
-  getSourceInfo(): LegendSourceInfo | undefined {
+  getSourceInfo(): LegendGAVSourceInfo | LegendProjectIdSourceInfo | undefined {
     if (this.viewerStore.editorStore.sdlcState.currentProject) {
+      // GAV coordinates are populated from the project configuration once the
+      // graph is initialized; forward them when available so project-id
+      // viewers can still be joined with GAV-viewer traffic.
+      const projectConfiguration =
+        this.viewerStore.editorStore.projectConfigurationEditorState
+          .projectConfiguration;
+      // Prefer the pinned version id when the viewer is on a specific
+      // version; fall back to the revision id when viewing a revision;
+      // otherwise the viewer is on HEAD and versionId is left undefined.
+      const versionId =
+        this.viewerStore.version?.id.id ?? this.viewerStore.revision?.id;
       return {
         sourceType: LegendSourceType.PROJECT_PROJECTID,
         projectId:
           this.viewerStore.editorStore.sdlcState.currentProject.projectId,
-      } as LegendProjectIdSourceInfo;
+        groupId: projectConfiguration?.groupId,
+        artifactId: projectConfiguration?.artifactId,
+        versionId,
+      };
     } else if (this.viewerStore.projectGAVCoordinates) {
       return {
         sourceType: LegendSourceType.PROJECT_GAV,
         groupId: this.viewerStore.projectGAVCoordinates.groupId,
         artifactId: this.viewerStore.projectGAVCoordinates.artifactId,
         versionId: this.viewerStore.projectGAVCoordinates.versionId,
-      } as LegendGAVSourceInfo;
+      };
     } else {
       return undefined;
     }