@finos/legend-extension-dsl-data-space 9.1.5 → 9.1.7

package/src/components/DataSpaceQuickStart.tsx

@@ -13,3 +13,369 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { observer } from 'mobx-react-lite';
+import {
+  AnchorLinkIcon,
+  CodeIcon,
+  CopyIcon,
+  MoreVerticalIcon,
+  QueryIcon,
+  QuestionCircleIcon,
+  clsx,
+} from '@finos/legend-art';
+import { type DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
+import { AgGridReact } from '@ag-grid-community/react';
+import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
+import {
+  EDITOR_LANGUAGE,
+  TextInputEditor,
+  useApplicationStore,
+} from '@finos/legend-application';
+import {
+  DataSpaceExecutableTDSResult,
+  type DataSpaceExecutableAnalysisResult,
+} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+import { DataSpaceMarkdownTextViewer } from './DataSpaceMarkdownTextViewer.js';
+import type { DSL_DataSpace_LegendApplicationPlugin_Extension } from '../stores/DSL_DataSpace_LegendApplicationPlugin_Extension.js';
+import { useState } from 'react';
+
+enum TDS_EXECUTABLE_ACTION_TAB {
+  COLUMN_SPECS = 'COLUMN_SPECS',
+  QUERY = 'QUERY',
+  QUERY_TEXT = 'QUERY_TEXT',
+}
+
+const DataSpaceExecutableTDSResultView = observer(
+  (props: {
+    dataSpaceViewerState: DataSpaceViewerState;
+    executableAnalysisResult: DataSpaceExecutableAnalysisResult;
+    tdsResult: DataSpaceExecutableTDSResult;
+  }) => {
+    const { dataSpaceViewerState, executableAnalysisResult, tdsResult } = props;
+    const applicationStore = useApplicationStore();
+    const [selectedTab, setSelectedTab] = useState<string>(
+      TDS_EXECUTABLE_ACTION_TAB.COLUMN_SPECS,
+    );
+    const queryText = executableAnalysisResult.info?.query;
+
+    const columnSpecifications = tdsResult.columns;
+    const extractTDSExecutableActionConfigurations =
+      applicationStore.pluginManager
+        .getApplicationPlugins()
+        .flatMap(
+          (plugin) =>
+            (
+              plugin as DSL_DataSpace_LegendApplicationPlugin_Extension
+            ).getExtraDataSpaceTDSExecutableActionConfigurations?.() ?? [],
+        );
+    const currentTabExtensionConfig =
+      extractTDSExecutableActionConfigurations.find(
+        (config) => config.key === selectedTab,
+      );
+
+    return (
+      <div className="data-space__viewer__quickstart__item">
+        <div className="data-space__viewer__quickstart__item__header">
+          <div className="data-space__viewer__quickstart__item__header__title">
+            {executableAnalysisResult.title}
+          </div>
+          <div className="data-space__viewer__quickstart__item__header__type data-space__viewer__quickstart__item__header__type--tds">
+            TDS
+          </div>
+          <div className="data-space__viewer__quickstart__item__header__anchor">
+            <AnchorLinkIcon />
+          </div>
+        </div>
+        {executableAnalysisResult.description !== undefined && (
+          <div className="data-space__viewer__quickstart__item__description">
+            <DataSpaceMarkdownTextViewer
+              value={executableAnalysisResult.description}
+            />
+          </div>
+        )}
+        <div className="data-space__viewer__quickstart__item__content">
+          <div className="data-space__viewer__quickstart__item__content__tab__header">
+            <div className="data-space__viewer__quickstart__item__content__tabs">
+              <button
+                className={clsx(
+                  'data-space__viewer__quickstart__item__content__tab',
+                  {
+                    'data-space__viewer__quickstart__item__content__tab--active':
+                      selectedTab === TDS_EXECUTABLE_ACTION_TAB.COLUMN_SPECS,
+                  },
+                )}
+                tabIndex={-1}
+                onClick={() =>
+                  setSelectedTab(TDS_EXECUTABLE_ACTION_TAB.COLUMN_SPECS)
+                }
+              >
+                <div className="data-space__viewer__quickstart__item__content__tab__label">
+                  Column Specifications
+                </div>
+              </button>
+              <button
+                className={clsx(
+                  'data-space__viewer__quickstart__item__content__tab',
+                  {
+                    'data-space__viewer__quickstart__item__content__tab--active':
+                      selectedTab === TDS_EXECUTABLE_ACTION_TAB.QUERY,
+                  },
+                )}
+                tabIndex={-1}
+                onClick={() => setSelectedTab(TDS_EXECUTABLE_ACTION_TAB.QUERY)}
+              >
+                <div className="data-space__viewer__quickstart__item__content__tab__icon">
+                  <QueryIcon className="data-space__viewer__quickstart__item__content__tab__icon--query" />
+                </div>
+                <div className="data-space__viewer__quickstart__item__content__tab__label">
+                  Query
+                </div>
+              </button>
+              {extractTDSExecutableActionConfigurations.map((config) => (
+                <button
+                  key={config.key}
+                  className={clsx(
+                    'data-space__viewer__quickstart__item__content__tab',
+                    {
+                      'data-space__viewer__quickstart__item__content__tab--active':
+                        selectedTab === config.key,
+                    },
+                  )}
+                  tabIndex={-1}
+                  onClick={() => setSelectedTab(config.key)}
+                >
+                  {config.icon !== undefined && (
+                    <div className="data-space__viewer__quickstart__item__content__tab__icon">
+                      {config.icon}
+                    </div>
+                  )}
+                  <div className="data-space__viewer__quickstart__item__content__tab__label">
+                    {config.title}
+                  </div>
+                </button>
+              ))}
+            </div>
+            {queryText !== undefined && (
+              <button
+                className={clsx(
+                  'data-space__viewer__quickstart__item__content__tab',
+                  {
+                    'data-space__viewer__quickstart__item__content__tab--active':
+                      selectedTab === TDS_EXECUTABLE_ACTION_TAB.QUERY_TEXT,
+                  },
+                )}
+                tabIndex={-1}
+                onClick={() =>
+                  setSelectedTab(TDS_EXECUTABLE_ACTION_TAB.QUERY_TEXT)
+                }
+              >
+                <div className="data-space__viewer__quickstart__item__content__tab__icon">
+                  <CodeIcon className="data-space__viewer__quickstart__item__content__tab__icon--query" />
+                </div>
+              </button>
+            )}
+          </div>
+          <div className="data-space__viewer__quickstart__item__content__tab__content">
+            {selectedTab === TDS_EXECUTABLE_ACTION_TAB.COLUMN_SPECS && (
+              <div className="data-space__viewer__quickstart__tds__column-specs data-space__viewer__grid ag-theme-balham-dark">
+                <AgGridReact
+                  rowData={columnSpecifications}
+                  gridOptions={{
+                    suppressScrollOnNewData: true,
+                    getRowId: (rowData) => rowData.data.uuid,
+                  }}
+                  modules={[ClientSideRowModelModule]}
+                  suppressFieldDotNotation={true}
+                  columnDefs={[
+                    {
+                      minWidth: 50,
+                      sortable: true,
+                      resizable: true,
+                      field: 'name',
+                      headerName: `Column (${columnSpecifications.length})`,
+                      flex: 1,
+                    },
+                    {
+                      minWidth: 50,
+                      sortable: false,
+                      resizable: true,
+                      field: 'documentation',
+                      headerName: 'Documentation',
+                      flex: 1,
+                      wrapText: true,
+                      autoHeight: true,
+                    },
+                    {
+                      minWidth: 50,
+                      sortable: false,
+                      resizable: true,
+                      field: 'sample_values',
+                      headerName: 'Sample Values',
+                      flex: 1,
+                    },
+                  ]}
+                />
+              </div>
+            )}
+            {selectedTab === TDS_EXECUTABLE_ACTION_TAB.QUERY && (
+              <div className="data-space__viewer__quickstart__tds__query">
+                <div className="data-space__viewer__quickstart__tds__query__actions">
+                  <button
+                    className="data-space__viewer__quickstart__tds__query__action btn--dark"
+                    tabIndex={-1}
+                    onClick={() => {
+                      // TODO: wire this so we can go to the query for the service
+                    }}
+                  >
+                    Open in Query
+                  </button>
+                  <button
+                    className="data-space__viewer__quickstart__tds__query__action btn--dark"
+                    tabIndex={-1}
+                    disabled={true}
+                  >
+                    Open in Query with Test Data
+                  </button>
+                </div>
+              </div>
+            )}
+            {selectedTab === TDS_EXECUTABLE_ACTION_TAB.QUERY_TEXT &&
+              queryText !== undefined && (
+                <div className="data-space__viewer__quickstart__tds__query-text">
+                  <div className="data-space__viewer__quickstart__tds__query-text__content">
+                    <TextInputEditor
+                      inputValue={queryText}
+                      isReadOnly={true}
+                      language={EDITOR_LANGUAGE.PURE}
+                      showMiniMap={false}
+                      hideGutter={true}
+                    />
+                  </div>
+                  <div className="data-space__viewer__quickstart__tds__query-text__actions">
+                    <button
+                      className="data-space__viewer__quickstart__tds__query-text__action"
+                      tabIndex={-1}
+                      title="Copy"
+                      onClick={() => {
+                        applicationStore.clipboardService
+                          .copyTextToClipboard(queryText)
+                          .catch(applicationStore.alertUnhandledError);
+                      }}
+                    >
+                      <CopyIcon />
+                    </button>
+                    <button
+                      className="data-space__viewer__quickstart__tds__query-text__action"
+                      tabIndex={-1}
+                    >
+                      <MoreVerticalIcon />
+                    </button>
+                  </div>
+                </div>
+              )}
+            {currentTabExtensionConfig?.renderer(
+              dataSpaceViewerState,
+              executableAnalysisResult,
+              tdsResult,
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+
+const DataSpaceExecutableAnalysisResultView = observer(
+  (props: {
+    dataSpaceViewerState: DataSpaceViewerState;
+    executableAnalysisResult: DataSpaceExecutableAnalysisResult;
+  }) => {
+    const { dataSpaceViewerState, executableAnalysisResult } = props;
+
+    if (
+      executableAnalysisResult.result instanceof DataSpaceExecutableTDSResult
+    ) {
+      return (
+        <DataSpaceExecutableTDSResultView
+          dataSpaceViewerState={dataSpaceViewerState}
+          executableAnalysisResult={executableAnalysisResult}
+          tdsResult={executableAnalysisResult.result}
+        />
+      );
+    }
+    return (
+      <div className="data-space__viewer__quickstart__item">
+        <div className="data-space__viewer__quickstart__item__header">
+          <div className="data-space__viewer__quickstart__item__header__title">
+            {executableAnalysisResult.title}
+          </div>
+          <div className="data-space__viewer__quickstart__item__header__type">
+            UNKNOWN
+          </div>
+          <div className="data-space__viewer__quickstart__item__header__anchor">
+            <AnchorLinkIcon />
+          </div>
+        </div>
+        {executableAnalysisResult.description !== undefined && (
+          <div className="data-space__viewer__quickstart__item__description">
+            <DataSpaceMarkdownTextViewer
+              value={executableAnalysisResult.description}
+            />
+          </div>
+        )}
+      </div>
+    );
+  },
+);
+
+export const DataSpaceQuickStart = observer(
+  (props: { dataSpaceViewerState: DataSpaceViewerState }) => {
+    const { dataSpaceViewerState } = props;
+    const applicationStore = useApplicationStore();
+    const analysisResult = dataSpaceViewerState.dataSpaceAnalysisResult;
+    const documentationUrl = analysisResult.supportInfo?.documentationUrl;
+
+    const seeDocumentation = (): void => {
+      if (documentationUrl) {
+        applicationStore.navigationService.navigator.visitAddress(
+          documentationUrl,
+        );
+      }
+    };
+
+    return (
+      <div className="data-space__viewer__wiki__section">
+        <div className="data-space__viewer__wiki__section__header">
+          <div className="data-space__viewer__wiki__section__header__label">
+            Quick Start
+            <div className="data-space__viewer__wiki__section__header__anchor">
+              <AnchorLinkIcon />
+            </div>
+          </div>
+          {Boolean(documentationUrl) && (
+            <button
+              className="data-space__viewer__wiki__section__header__documentation"
+              tabIndex={-1}
+              onClick={seeDocumentation}
+              title="See Documentation"
+            >
+              <QuestionCircleIcon />
+            </button>
+          )}
+        </div>
+        <div className="data-space__viewer__wiki__section__content">
+          <div className="data-space__viewer__quickstart">
+            {analysisResult.executables.map((executable) => (
+              <DataSpaceExecutableAnalysisResultView
+                key={executable.uuid}
+                dataSpaceViewerState={dataSpaceViewerState}
+                executableAnalysisResult={executable}
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);

package/src/components/DataSpaceSupportPanel.tsx

@@ -27,14 +27,14 @@ const DataSpaceSupportEmailViewer = observer(
     const { dataSpaceSupportEmail } = props;
 
     return (
-      <div className="data-space__viewer__support-email">
-        <div className="data-space__viewer__support-email__entry">
-          <div className="data-space__viewer__support-email__entry__icon">
+      <div className="data-space__viewer__support__email">
+        <div className="data-space__viewer__support__email__entry">
+          <div className="data-space__viewer__support__email__entry__icon">
             <EnvelopIcon />
           </div>
           <a
             href={`mailto:${dataSpaceSupportEmail.address}`}
-            className="data-space__viewer__support-email__entry__content"
+            className="data-space__viewer__support__email__entry__content"
           >
             {dataSpaceSupportEmail.address}
           </a>

package/src/components/DataSpaceViewer.tsx

@@ -15,7 +15,7 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { BlankPanelContent, clsx } from '@finos/legend-art';
+import { BlankPanelContent, VerifiedIcon, clsx } from '@finos/legend-art';
 import {
   type DataSpaceViewerState,
   DATA_SPACE_VIEWER_ACTIVITY_MODE,
@@ -25,38 +25,48 @@ import { DataSpaceInfoPanel } from './DataSpaceInfoPanel.js';
 import { DataSpaceSupportPanel } from './DataSpaceSupportPanel.js';
 import { DataSpaceWiki } from './DataSpaceWiki.js';
 import { DataSpaceViewerActivityBar } from './DataSpaceViewerActivityBar.js';
+import { useRef, useState } from 'react';
 
-const DataSpaceTitle = observer(
-  (props: { dataSpaceViewerState: DataSpaceViewerState }) =>
-    // const { dataSpaceViewerState } = props;
+const DataSpaceHeader = observer(
+  (props: {
+    dataSpaceViewerState: DataSpaceViewerState;
+    showFullHeader: boolean;
+  }) => {
+    const { dataSpaceViewerState, showFullHeader } = props;
+    const analysisResult = dataSpaceViewerState.dataSpaceAnalysisResult;
 
-    null,
-  /* <div className="data-space__viewer__header">
-            <div className="data-space__viewer__title">
-              <button
-                className="data-space__viewer__title__btn"
-                tabIndex={-1}
-                title={`View Project (${generateGAVCoordinates(
-                  dataSpaceViewerState.groupId,
-                  dataSpaceViewerState.artifactId,
-                  dataSpaceViewerState.versionId,
-                )})`}
-                onClick={viewProject}
-              >
-                <div
-                  className="data-space__viewer__title__label"
-                  title={`${analysisResult.title ?? analysisResult.name} - ${
-                    analysisResult.path
-                  }`}
-                >
-                  {analysisResult.title ?? analysisResult.name}
-                </div>
-                <div className="data-space__viewer__title__link">
-                  <ExternalLinkSquareIcon />
-                </div>
-              </button>
+    return (
+      <div
+        className={clsx('data-space__viewer__header', {
+          'data-space__viewer__header--floating': showFullHeader,
+        })}
+      >
+        <div
+          className={clsx('data-space__viewer__header__content', {
+            'data-space__viewer__header__content--expanded':
+              dataSpaceViewerState.isExpandedModeEnabled,
+          })}
+        >
+          <div
+            className="data-space__viewer__header__title"
+            title={`${analysisResult.title ?? analysisResult.name} - ${
+              analysisResult.path
+            }`}
+          >
+            <div className="data-space__viewer__header__title__label">
+              {analysisResult.title ?? analysisResult.name}
             </div>
-          </div> */
+            {dataSpaceViewerState.isVerified && (
+              <VerifiedIcon
+                className="data-space__viewer__header__title__verified-badge"
+                title="Verified Data Space"
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
 );
 
 const DataSpacePlaceholderPanel: React.FC<{ message: string }> = (props) => {
@@ -72,6 +82,13 @@ const DataSpacePlaceholderPanel: React.FC<{ message: string }> = (props) => {
 export const DataSpaceViewer = observer(
   (props: { dataSpaceViewerState: DataSpaceViewerState }) => {
     const { dataSpaceViewerState } = props;
+    const bodyElement = useRef<HTMLDivElement>(null);
+    const [showFullHeader, setShowFullHeader] = useState(false);
+
+    const onScroll: React.UIEventHandler<HTMLDivElement> = (event) => {
+      setShowFullHeader(event.currentTarget.scrollTop > 0);
+    };
+
     const isShowingWiki = [
       DATA_SPACE_VIEWER_ACTIVITY_MODE.DESCRIPTION,
       DATA_SPACE_VIEWER_ACTIVITY_MODE.DIAGRAM_VIEWER,
@@ -85,13 +102,22 @@ export const DataSpaceViewer = observer(
         <DataSpaceViewerActivityBar
           dataSpaceViewerState={dataSpaceViewerState}
         />
-        <div className="data-space__viewer__body">
+        <div
+          ref={bodyElement}
+          className="data-space__viewer__body"
+          onScroll={onScroll}
+        >
+          <DataSpaceHeader
+            dataSpaceViewerState={dataSpaceViewerState}
+            showFullHeader={showFullHeader}
+          />
           <div
             className={clsx('data-space__viewer__frame', {
               'data-space__viewer__frame--boundless': isShowingWiki,
+              'data-space__viewer__frame--expanded':
+                dataSpaceViewerState.isExpandedModeEnabled,
             })}
           >
-            <DataSpaceTitle dataSpaceViewerState={dataSpaceViewerState} />
             <div className="data-space__viewer__content">
               {isShowingWiki && (
                 <DataSpaceWiki dataSpaceViewerState={dataSpaceViewerState} />

package/src/components/DataSpaceWiki.tsx

@@ -14,50 +14,13 @@
  * limitations under the License.
  */
 
-import { MarkdownTextViewer } from '@finos/legend-art';
 import type { DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
 import { observer } from 'mobx-react-lite';
 import { DataSpaceDiagramViewer } from './DataSpaceDiagramViewer.js';
 import { DataSpaceModelsDocumentation } from './DataSpaceModelsDocumentation.js';
-
-const DataSpaceDescription = observer(
-  (props: { dataSpaceViewerState: DataSpaceViewerState }) => {
-    const { dataSpaceViewerState } = props;
-    const analysisResult = dataSpaceViewerState.dataSpaceAnalysisResult;
-
-    return (
-      <div className="data-space__viewer__wiki__section">
-        <div className="data-space__viewer__wiki__section__header">
-          Description
-        </div>
-        <div className="data-space__viewer__wiki__section__content">
-          <div className="data-space__viewer__description">
-            {analysisResult.description !== undefined && (
-              <div className="data-space__viewer__description__content">
-                <MarkdownTextViewer
-                  className="data-space__viewer__description__content__markdown-content"
-                  value={{
-                    value: analysisResult.description,
-                  }}
-                  components={{
-                    h1: 'h2',
-                    h2: 'h3',
-                    h3: 'h4',
-                  }}
-                />
-              </div>
-            )}
-            {analysisResult.description === undefined && (
-              <div className="data-space__viewer__description--empty">
-                No description
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  },
-);
+import { DataSpaceQuickStart } from './DataSpaceQuickStart.js';
+import { DataSpaceDataAccess } from './DataSpaceDataAccess.js';
+import { DataSpaceDescription } from './DataSpaceDescription.js';
 
 export const DataSpaceWiki = observer(
   (props: { dataSpaceViewerState: DataSpaceViewerState }) => {
@@ -70,6 +33,8 @@ export const DataSpaceWiki = observer(
         <DataSpaceModelsDocumentation
           dataSpaceViewerState={dataSpaceViewerState}
         />
+        <DataSpaceQuickStart dataSpaceViewerState={dataSpaceViewerState} />
+        <DataSpaceDataAccess dataSpaceViewerState={dataSpaceViewerState} />
       </div>
     );
   },

package/src/graphManager/DSL_DataSpace_PureGraphManagerPlugin.ts

@@ -29,12 +29,21 @@ import { DSL_DataSpace_buildGraphManagerExtension } from './protocol/pure/DSL_Da
 
 export const PURE_GRAMMAR_DATA_SPACE_PARSER_NAME = 'DataSpace';
 export const PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL = 'DataSpace';
+export const PURE_ENTERPRISE_PROFILE_PATH = 'meta::pure::profiles::enterprise';
+export const PURE_ENTERPRISE_PROFILE_TAXONOMY_NODE_STEREOTYPE = 'taxonomyNodes';
+export const PURE_DATA_SPACE_INFO_PROFILE_PATH =
+  'meta::pure::metamodel::dataSpace::profiles::DataSpaceInfo';
+export const PURE_DATA_SPACE_INFO_PROFILE_VERIFIED_STEREOTYPE = 'Verified';
 
 export class DSL_DataSpace_PureGraphManagerPlugin extends PureGraphManagerPlugin {
   constructor() {
     super(packageJson.extensions.pureGraphManagerPlugin, packageJson.version);
   }
 
+  override getExtraExposedSystemElementPath(): string[] {
+    return [PURE_ENTERPRISE_PROFILE_PATH, PURE_DATA_SPACE_INFO_PROFILE_PATH];
+  }
+
   override getExtraPureGraphManagerExtensionBuilders(): PureGraphManagerExtensionBuilder[] {
     return [DSL_DataSpace_buildGraphManagerExtension];
   }

package/src/graphManager/action/analytics/DataSpaceAnalysis.ts

@@ -83,10 +83,16 @@ export class DataSpaceServiceExecutableInfo extends DataSpaceExecutableInfo {
 export abstract class DataSpaceExecutableResult {}
 
 export class DataSpaceExecutableTDSResultColumn {
+  readonly uuid = uuid();
+
   name!: string;
   type?: string | undefined;
   relationalType?: string | undefined;
   documentation?: string | undefined;
+
+  // TODO: we need to think of how we want to support sample values, should we rely on the type here
+  // or should we rely on actual execution result on test data?
+  sampleValues = '';
 }
 
 export class DataSpaceExecutableTDSResult extends DataSpaceExecutableResult {
@@ -94,6 +100,8 @@ export class DataSpaceExecutableTDSResult extends DataSpaceExecutableResult {
 }
 
 export class DataSpaceExecutableAnalysisResult {
+  readonly uuid = uuid();
+
   title!: string;
   description?: string | undefined;
   executable!: string;

package/src/graphManager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts

@@ -41,8 +41,14 @@ import {
   uniq,
   type PlainObject,
 } from '@finos/legend-shared';
-import { DataSpaceSupportEmail } from '../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
-import { V1_DataSpaceSupportEmail } from '../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
+import {
+  DataSpaceSupportCombinedInfo,
+  DataSpaceSupportEmail,
+} from '../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
+import {
+  V1_DataSpaceSupportCombinedInfo,
+  V1_DataSpaceSupportEmail,
+} from '../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 import {
   DataSpaceAnalysisResult,
   DataSpaceDiagramAnalysisResult,
@@ -160,11 +166,24 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
     if (analysisResult.supportInfo) {
       if (analysisResult.supportInfo instanceof V1_DataSpaceSupportEmail) {
         const supportEmail = new DataSpaceSupportEmail();
+        supportEmail.documentationUrl =
+          analysisResult.supportInfo.documentationUrl;
         supportEmail.address = guaranteeNonEmptyString(
           analysisResult.supportInfo.address,
           `Data space support email 'address' field is missing or empty`,
         );
         result.supportInfo = supportEmail;
+      } else if (
+        analysisResult.supportInfo instanceof V1_DataSpaceSupportCombinedInfo
+      ) {
+        const combinedInfo = new DataSpaceSupportCombinedInfo();
+        combinedInfo.documentationUrl =
+          analysisResult.supportInfo.documentationUrl;
+        combinedInfo.website = analysisResult.supportInfo.website;
+        combinedInfo.faqUrl = analysisResult.supportInfo.faqUrl;
+        combinedInfo.supportUrl = analysisResult.supportInfo.supportUrl;
+        combinedInfo.emails = analysisResult.supportInfo.emails;
+        result.supportInfo = combinedInfo;
       }
       // NOTE: we will relax the check and not throw here for unknown support info type
     }

package/src/graphManager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts

@@ -294,7 +294,7 @@ export class V1_DataSpaceExecutableAnalysisResult {
       executable: primitive(),
       description: optional(primitive()),
       info: optionalCustom(() => SKIP, V1_deserializeDataSpaceExecutableInfo),
-      resultType: custom(() => SKIP, V1_deserializeDataSpaceExecutableResult),
+      result: custom(() => SKIP, V1_deserializeDataSpaceExecutableResult),
       title: primitive(),
     }),
   );