@finos/legend-extension-dsl-data-space 10.4.258 → 10.4.259

package/src/components/DataSpaceQuickStart.tsx

@@ -46,7 +46,7 @@ import {
   LakehouseDataProductExecutableAccessorInfo,
 } from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import { DataSpaceMarkdownTextViewer } from './DataSpaceMarkdownTextViewer.js';
-import { DataSpaceOpenDataProductButton } from './DataSpaceExecutionContextViewer.js';
+import { resolveOpenDataProductAction } from './DataSpaceExecutionContextViewer.js';
 import type { DSL_DataSpace_LegendApplicationPlugin_Extension } from '../stores/DSL_DataSpace_LegendApplicationPlugin_Extension.js';
 import { useEffect, useRef, useState } from 'react';
 import { DataSpaceWikiPlaceholder } from './DataSpacePlaceholder.js';
@@ -227,6 +227,10 @@ const DataSpaceDataProductAccessPanel = observer(
           const accessState = viewerState.getDataProductAccessState(
             group.dataProductPath,
           );
+          const onOpenDataProduct = resolveOpenDataProductAction(
+            viewerState,
+            group.dataProductPath,
+          );
           return (
             <div
               key={group.dataProductPath}
@@ -250,21 +254,28 @@ const DataSpaceDataProductAccessPanel = observer(
                   />
                 </button>
                 <div className="data-space__viewer__quickstart__tds__apg-access__group__header">
-                  <span
-                    className="data-space__viewer__quickstart__tds__apg-access__group__label"
-                    title={group.dataProductPath}
-                  >
-                    {extractElementNameFromPath(group.dataProductPath)}
-                  </span>
+                  {onOpenDataProduct ? (
+                    <button
+                      type="button"
+                      className="data-space__viewer__quickstart__tds__apg-access__group__label data-space__viewer__quickstart__tds__apg-access__group__label--clickable"
+                      title={`Open Data Product: ${group.dataProductPath}`}
+                      onClick={onOpenDataProduct}
+                    >
+                      {extractElementNameFromPath(group.dataProductPath)}
+                    </button>
+                  ) : (
+                    <span
+                      className="data-space__viewer__quickstart__tds__apg-access__group__label"
+                      title={group.dataProductPath}
+                    >
+                      {extractElementNameFromPath(group.dataProductPath)}
+                    </span>
+                  )}
                   <span className="data-space__viewer__quickstart__tds__apg-access__group__count">
                     {group.accessPointGroupIds.length}
                   </span>
                 </div>
                 <div className="data-space__viewer__quickstart__tds__apg-access__group__actions">
-                  <DataSpaceOpenDataProductButton
-                    dataSpaceViewerState={viewerState}
-                    dataProductPath={group.dataProductPath}
-                  />
                   {accessState && (
                     <IconButton
                       className="data-space__viewer__quickstart__tds__apg-access__group__refresh-btn"

package/src/components/DataSpaceViewer.tsx

@@ -20,7 +20,6 @@ import {
   CaretUpIcon,
   ControlledDropdownMenu,
   MenuContent,
-  MenuContentDivider,
   MenuContentItem,
   MoreVerticalIcon,
   PlayIcon,
@@ -36,15 +35,11 @@ import { DataSpaceWiki } from './DataSpaceWiki.js';
 import { DataSpaceViewerActivityBar } from './DataSpaceViewerActivityBar.js';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { DATA_SPACE_WIKI_PAGE_SECTIONS } from '../stores/DataSpaceLayoutState.js';
-import {
-  DATA_SPACE_VIEWER_ACTIVITY_MODE,
-  generateAnchorForActivity,
-} from '../stores/DataSpaceViewerNavigation.js';
+import { DATA_SPACE_VIEWER_ACTIVITY_MODE } from '../stores/DataSpaceViewerNavigation.js';
 import { DataSpacePlaceholderPanel } from './DataSpacePlaceholder.js';
 import { useApplicationStore } from '@finos/legend-application';
 import { DataSpaceLegendAIIntegration } from './DataSpaceLegendAIIntegration.js';
 import { DSL_DATASPACE_EVENT } from '../__lib__/DSL_DataSpace_Event.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { DataSpaceQualityEmote } from './DataSpaceQualityEmote.js';
 
 const DataSpaceHeader = observer(
@@ -194,29 +189,6 @@ const DataSpaceHeader = observer(
                 title="More Actions..."
                 content={
                   <MenuContent>
-                    {dataSpaceViewerState.currentExecutionContext && (
-                      <>
-                        <MenuContentItem
-                          onClick={() =>
-                            dataSpaceViewerState.queryDataSpace(
-                              guaranteeNonNullable(
-                                dataSpaceViewerState.currentExecutionContext,
-                              ).name,
-                            )
-                          }
-                        >
-                          Query Data Space
-                        </MenuContentItem>
-                        <MenuContentDivider />
-                      </>
-                    )}
-                    <MenuContentItem
-                      onClick={() =>
-                        dataSpaceViewerState.viewProject(analysisResult.path)
-                      }
-                    >
-                      View Project
-                    </MenuContentItem>
                     <MenuContentItem
                       onClick={() => {
                         dataSpaceViewerState
@@ -224,32 +196,7 @@ const DataSpaceHeader = observer(
                           .catch(applicationStore.alertUnhandledError);
                       }}
                     >
-                      View SDLC Project
-                    </MenuContentItem>
-                    <MenuContentDivider />
-                    <MenuContentItem
-                      onClick={() => {
-                        const documentationUrl =
-                          analysisResult.supportInfo?.documentationUrl;
-                        if (documentationUrl) {
-                          applicationStore.navigationService.navigator.visitAddress(
-                            documentationUrl,
-                          );
-                        }
-                      }}
-                    >
-                      Read Documentation
-                    </MenuContentItem>
-                    <MenuContentItem
-                      onClick={() =>
-                        dataSpaceViewerState.changeZone(
-                          generateAnchorForActivity(
-                            DATA_SPACE_VIEWER_ACTIVITY_MODE.SUPPORT,
-                          ),
-                        )
-                      }
-                    >
-                      Get Help
+                      View Project
                     </MenuContentItem>
                   </MenuContent>
                 }

package/src/components/DataSpaceWiki.tsx

@@ -18,7 +18,11 @@ import type { DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
 import { observer } from 'mobx-react-lite';
 import { DataSpaceQuickStart } from './DataSpaceQuickStart.js';
 import { DataSpaceDataAccess } from './DataSpaceDataAccess.js';
-import { DataSpaceDescription } from './DataSpaceDescription.js';
+import {
+  DataSpaceDescription,
+  DataSpaceWikiBadges,
+} from './DataSpaceDescription.js';
+import { DataSpaceLakehouseAccess } from './DataSpaceLakehouseAccess.js';
 import { useEffect } from 'react';
 import { ModelsDocumentation } from '@finos/legend-lego/model-documentation';
 import { DiagramViewer } from '@finos/legend-extension-dsl-diagram';
@@ -57,7 +61,9 @@ export const DataSpaceWiki = observer(
 
     return (
       <div className="data-space__viewer__wiki">
+        <DataSpaceWikiBadges dataSpaceViewerState={dataSpaceViewerState} />
         <DataSpaceDescription dataSpaceViewerState={dataSpaceViewerState} />
+        <DataSpaceLakehouseAccess dataSpaceViewerState={dataSpaceViewerState} />
         <DiagramViewer
           diagramViewerState={dataSpaceViewerState.diagramViewerState}
           actions={{

package/src/stores/DataSpaceLayoutState.ts

@@ -28,16 +28,13 @@ import { BaseLayoutState } from '@finos/legend-extension-dsl-data-product';
 
 export const DATA_SPACE_WIKI_PAGE_SECTIONS = [
   DATA_SPACE_VIEWER_ACTIVITY_MODE.DESCRIPTION,
+  DATA_SPACE_VIEWER_ACTIVITY_MODE.DATASPACE_LAKEHOUSE_ACCESS,
   DATA_SPACE_VIEWER_ACTIVITY_MODE.DIAGRAM_VIEWER,
   DATA_SPACE_VIEWER_ACTIVITY_MODE.MODELS_DOCUMENTATION,
   DATA_SPACE_VIEWER_ACTIVITY_MODE.QUICK_START,
   DATA_SPACE_VIEWER_ACTIVITY_MODE.DATA_ACCESS,
 ];
 
-const DATA_SPACE_WIKI_PAGE_ANCHORS = DATA_SPACE_WIKI_PAGE_SECTIONS.map(
-  (activity) => generateAnchorForActivity(activity),
-);
-
 export class DataSpaceLayoutState extends BaseLayoutState {
   private dataSpaceViewerState!: DataSpaceViewerState;
 
@@ -53,7 +50,9 @@ export class DataSpaceLayoutState extends BaseLayoutState {
   }
 
   protected getValidAnchors(): string[] {
-    return DATA_SPACE_WIKI_PAGE_ANCHORS;
+    return this.dataSpaceViewerState.wikiPageSectionsToRender.map((activity) =>
+      generateAnchorForActivity(activity),
+    );
   }
 
   protected get expectedGridCount(): number {
@@ -63,7 +62,7 @@ export class DataSpaceLayoutState extends BaseLayoutState {
   override get isWikiPageFullyRendered(): boolean {
     return (
       super.isWikiPageFullyRendered &&
-      DATA_SPACE_WIKI_PAGE_SECTIONS.includes(
+      this.dataSpaceViewerState.wikiPageSectionsToRender.includes(
         this.dataSpaceViewerState.currentActivity,
       )
     );

package/src/stores/DataSpaceViewerNavigation.ts

@@ -20,6 +20,7 @@ import type { DiagramAnalysisResult } from '@finos/legend-extension-dsl-diagram'
 
 export enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
   DESCRIPTION = 'description',
+  DATASPACE_LAKEHOUSE_ACCESS = 'dataspace-lakehouse-access',
   DIAGRAM_VIEWER = 'diagram-viewer',
   MODELS_DOCUMENTATION = 'models-documentation',
   QUICK_START = 'quick-start',

package/src/stores/DataSpaceViewerState.ts

@@ -164,6 +164,7 @@ export class DataSpaceViewerState extends BaseViewerState<
       legendAIConfig: observable,
       isVerified: computed,
       isDataAccessAvailable: computed,
+      referencedDataProductPaths: computed,
       setCurrentActivity: action,
       setCurrentExecutionContext: action,
       setCurrentRuntime: action,
@@ -217,6 +218,7 @@ export class DataSpaceViewerState extends BaseViewerState<
     this.legendAIConfig = DEFAULT_LEGEND_AI_CONFIG;
     this.initMappingProviderAccessState();
     this.initExecutableAccessStates();
+    this.initReferencedDataProductAccessStates();
   }
 
   get dataSpaceAnalysisResult(): DataSpaceAnalysisResult {
@@ -224,11 +226,21 @@ export class DataSpaceViewerState extends BaseViewerState<
   }
 
   protected getValidSections(): string[] {
-    return DATA_SPACE_WIKI_PAGE_SECTIONS.map((activity) =>
+    return this.wikiPageSectionsToRender.map((activity) =>
       generateAnchorForActivity(activity),
     );
   }
 
+  get wikiPageSectionsToRender(): DATA_SPACE_VIEWER_ACTIVITY_MODE[] {
+    if (this.referencedDataProductPaths.length > 0) {
+      return DATA_SPACE_WIKI_PAGE_SECTIONS;
+    }
+    return DATA_SPACE_WIKI_PAGE_SECTIONS.filter(
+      (section) =>
+        section !== DATA_SPACE_VIEWER_ACTIVITY_MODE.DATASPACE_LAKEHOUSE_ACCESS,
+    );
+  }
+
   get isVerified(): boolean {
     return Boolean(
       this.dataSpaceAnalysisResult.stereotypes.find(
@@ -356,6 +368,28 @@ export class DataSpaceViewerState extends BaseViewerState<
     }
   }
 
+  private initReferencedDataProductAccessStates(): void {
+    for (const path of this.referencedDataProductPaths) {
+      this.buildDataProductAccessState(path);
+    }
+  }
+
+  get referencedDataProductPaths(): string[] {
+    const paths: string[] = [];
+    const seen = new Set<string>();
+    for (const metadata of this.dataSpaceAnalysisResult
+      .dataSpaceReferencesMetadataInfo) {
+      if (
+        metadata instanceof DataproductReferenceMetadata &&
+        !seen.has(metadata.dataproductPath)
+      ) {
+        seen.add(metadata.dataproductPath);
+        paths.push(metadata.dataproductPath);
+      }
+    }
+    return paths;
+  }
+
   /**
    * Looks up the initialized access state for a Data Product path (may still
    * be initializing). Used by executable renderers to grab the state for a
@@ -436,7 +470,7 @@ export class DataSpaceViewerState extends BaseViewerState<
         (activity) => generateAnchorForActivity(activity) === activityChunk,
       );
       if (activityChunk && matchingActivity) {
-        if (DATA_SPACE_WIKI_PAGE_SECTIONS.includes(matchingActivity)) {
+        if (this.wikiPageSectionsToRender.includes(matchingActivity)) {
           this.layoutState.setWikiPageAnchorToNavigate({
             anchor: zone,
           });

package/tsconfig.json

@@ -103,6 +103,7 @@
     "./src/components/DataSpaceDescription.tsx",
     "./src/components/DataSpaceExecutionContextViewer.tsx",
     "./src/components/DataSpaceInfoPanel.tsx",
+    "./src/components/DataSpaceLakehouseAccess.tsx",
     "./src/components/DataSpaceLegendAIIntegration.tsx",
     "./src/components/DataSpaceMarkdownTextViewer.tsx",
     "./src/components/DataSpacePlaceholder.tsx",