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

package/src/components/query-builder/DataSpaceQueryBuilder.tsx

@@ -38,8 +38,6 @@ import {
   resolveUsableDataSpaceClasses,
 } from '../../stores/query-builder/DataSpaceQueryBuilderState.js';
 import {
-  buildRuntimeValueOption,
-  getRuntimeOptionFormatter,
   QueryBuilderClassSelector,
   type EntityWithOriginOption,
 } from '@finos/legend-query-builder';
@@ -99,7 +97,9 @@ const resolveExecutionContextRuntimes = (
     const executionContext = Array.from(
       queryBuilderState.dataSpaceAnalysisResult.executionContextsIndex.values(),
     ).find((e) => e.mapping.path === currentMapping.path);
-    return guaranteeNonNullable(executionContext).compatibleRuntimes;
+    if (executionContext) {
+      return executionContext.compatibleRuntimes;
+    }
   }
   return getMappingCompatibleRuntimes(
     currentMapping,
@@ -212,19 +212,27 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
     };
 
     // runtime
+    const buildRuntimePointerOption = (
+      runtime: PackageableRuntime,
+    ): { label: string; value: Runtime } => ({
+      label: runtime.name,
+      value: new RuntimePointer(
+        PackageableElementExplicitReference.create(runtime),
+      ),
+    });
     const runtimeOptions = resolveExecutionContextRuntimes(queryBuilderState)
-      .map(
-        (rt) =>
-          new RuntimePointer(PackageableElementExplicitReference.create(rt)),
-      )
-      .map(buildRuntimeValueOption)
+      .map(buildRuntimePointerOption)
       .sort(compareLabelFn);
-    const selectedRuntimeOption = queryBuilderState.executionContextState
-      .runtimeValue
-      ? buildRuntimeValueOption(
-          queryBuilderState.executionContextState.runtimeValue,
-        )
-      : null;
+    const selectedRuntimeOption =
+      queryBuilderState.executionContextState.runtimeValue instanceof
+      RuntimePointer
+        ? {
+            label:
+              queryBuilderState.executionContextState.runtimeValue
+                .packageableRuntime.value.name,
+            value: queryBuilderState.executionContextState.runtimeValue,
+          }
+        : null;
     const changeRuntime = (option: { value: Runtime }): void => {
       if (
         option.value === queryBuilderState.executionContextState.runtimeValue
@@ -282,22 +290,24 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
               title="Show Settings..."
               content={
                 <MenuContent>
-                  <MenuContentItem
-                    onClick={(): void =>
-                      queryBuilderState.setShowRuntimeSelector(
-                        !queryBuilderState.showRuntimeSelector,
-                      )
-                    }
-                  >
-                    <MenuContentItemIcon>
-                      {queryBuilderState.showRuntimeSelector ? (
-                        <CheckIcon />
-                      ) : null}
-                    </MenuContentItemIcon>
-                    <MenuContentItemLabel>
-                      Show Runtime Selector
-                    </MenuContentItemLabel>
-                  </MenuContentItem>
+                  {!queryBuilderState.executionContext.defaultRuntime && (
+                    <MenuContentItem
+                      onClick={(): void =>
+                        queryBuilderState.setShowRuntimeSelector(
+                          !queryBuilderState.showRuntimeSelector,
+                        )
+                      }
+                    >
+                      <MenuContentItemIcon>
+                        {queryBuilderState.showRuntimeSelector ? (
+                          <CheckIcon />
+                        ) : null}
+                      </MenuContentItemIcon>
+                      <MenuContentItemLabel>
+                        Show Runtime Selector
+                      </MenuContentItemLabel>
+                    </MenuContentItem>
+                  )}
                 </MenuContent>
               }
               menuProps={{
@@ -310,48 +320,52 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
           </PanelHeaderActions>
         </PanelHeader>
         <div className="query-builder__setup__config-group__content">
-          <div className="query-builder__setup__config-group__item">
-            <label
-              className="btn--sm query-builder__setup__config-group__data-product"
-              title="data space"
-              htmlFor="query-builder__setup__data-space-selector"
-            >
-              Data Space
-            </label>
-            <CustomSelectorInput
-              inputId="query-builder__setup__data-space-selector"
-              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-              options={allOptions}
-              isLoading={queryBuilderState.loadEntitiesState.isInProgress}
-              onChange={onDataSpaceOptionChange}
-              value={selectedDataSpaceOption}
-              placeholder="Search for data space..."
-              escapeClearsValue={true}
-              darkMode={
-                !applicationStore.layoutService
-                  .TEMPORARY__isLightColorThemeEnabled
-              }
-              formatOptionLabel={formatDataSpaceOptionLabel}
-            />
-            {queryBuilderState.isAdvancedDataSpaceSearchEnabled && (
-              <>
-                <button
-                  tabIndex={-1}
-                  className="query-builder__setup__data-space-searcher__btn btn--dark"
-                  onClick={openDataSpaceAdvancedSearch}
-                  title="Open advanced search for data space..."
-                >
-                  <SearchIcon />
-                </button>
-                {queryBuilderState.advancedSearchState && (
-                  <DataSpaceAdvancedSearchModal
-                    searchState={queryBuilderState.advancedSearchState}
-                    onClose={() => queryBuilderState.hideAdvancedSearchPanel()}
-                  />
-                )}
-              </>
-            )}
-          </div>
+          {!queryBuilderState.restrictToCurrentDataSpace && (
+            <div className="query-builder__setup__config-group__item">
+              <label
+                className="btn--sm query-builder__setup__config-group__data-product"
+                title="data space"
+                htmlFor="query-builder__setup__data-space-selector"
+              >
+                Data Space
+              </label>
+              <CustomSelectorInput
+                inputId="query-builder__setup__data-space-selector"
+                className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+                options={allOptions}
+                isLoading={queryBuilderState.loadEntitiesState.isInProgress}
+                onChange={onDataSpaceOptionChange}
+                value={selectedDataSpaceOption}
+                placeholder="Search for data space..."
+                escapeClearsValue={true}
+                darkMode={
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
+                }
+                formatOptionLabel={formatDataSpaceOptionLabel}
+              />
+              {queryBuilderState.isAdvancedDataSpaceSearchEnabled && (
+                <>
+                  <button
+                    tabIndex={-1}
+                    className="query-builder__setup__data-space-searcher__btn btn--dark"
+                    onClick={openDataSpaceAdvancedSearch}
+                    title="Open advanced search for data space..."
+                  >
+                    <SearchIcon />
+                  </button>
+                  {queryBuilderState.advancedSearchState && (
+                    <DataSpaceAdvancedSearchModal
+                      searchState={queryBuilderState.advancedSearchState}
+                      onClose={() =>
+                        queryBuilderState.hideAdvancedSearchPanel()
+                      }
+                    />
+                  )}
+                </>
+              )}
+            </div>
+          )}
           {Boolean(showExecutionContextOptions) && (
             <div className="query-builder__setup__config-group__item">
               <label
@@ -381,36 +395,38 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
               />
             </div>
           )}
-          {queryBuilderState.showRuntimeSelector && (
-            <div className="query-builder__setup__config-group__item">
-              <label
-                className="btn--sm query-builder__setup__config-group__item__label"
-                title="runtime"
-                htmlFor="query-builder__setup__runtime-selector"
-              >
-                Runtime
-              </label>
-              <CustomSelectorInput
-                inputId="query-builder__setup__runtime-selector"
-                className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                placeholder="Choose a runtime..."
-                noMatchMessage="No compatible runtime found for specified execution context"
-                options={runtimeOptions}
-                onChange={changeRuntime}
-                value={selectedRuntimeOption}
-                darkMode={
-                  !applicationStore.layoutService
-                    .TEMPORARY__isLightColorThemeEnabled
-                }
-                filterOption={runtimeFilterOption}
-                formatOptionLabel={getRuntimeOptionFormatter({
-                  darkMode:
+          {queryBuilderState.showRuntimeSelector &&
+            !queryBuilderState.executionContext.defaultRuntime && (
+              <div className="query-builder__setup__config-group__item">
+                <label
+                  className="btn--sm query-builder__setup__config-group__item__label"
+                  title="runtime"
+                  htmlFor="query-builder__setup__runtime-selector"
+                >
+                  Runtime
+                </label>
+                <CustomSelectorInput
+                  inputId="query-builder__setup__runtime-selector"
+                  className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+                  placeholder={
+                    runtimeOptions.length === 0
+                      ? 'No compatible runtimes available'
+                      : 'Choose a runtime...'
+                  }
+                  noMatchMessage="No compatible runtime found for specified execution context"
+                  options={runtimeOptions}
+                  disabled={runtimeOptions.length < 1}
+                  onChange={changeRuntime}
+                  value={selectedRuntimeOption}
+                  hasError={runtimeOptions.length === 0}
+                  darkMode={
                     !applicationStore.layoutService
-                      .TEMPORARY__isLightColorThemeEnabled,
-                })}
-              />
-            </div>
-          )}
+                      .TEMPORARY__isLightColorThemeEnabled
+                  }
+                  filterOption={runtimeFilterOption}
+                />
+              </div>
+            )}
           <div className="query-builder__setup__config-group__item">
             <QueryBuilderClassSelector
               queryBuilderState={queryBuilderState}

package/src/graph-manager/action/analytics/DataSpaceAnalysis.ts

@@ -126,6 +126,14 @@ export class DataSpaceExecutableTDSResult extends DataSpaceExecutableResult {
   columns: DataSpaceExecutableTDSResultColumn[] = [];
 }
 
+export abstract class DataSpaceExecutableAccessorInfo {}
+
+export class LakehouseDataProductExecutableAccessorInfo extends DataSpaceExecutableAccessorInfo {
+  dataProductPath!: string;
+  accessPointGroupId!: string;
+  accessPointId!: string;
+}
+
 export class DataSpaceExecutableAnalysisResult {
   readonly uuid = uuid();
   title!: string;
@@ -134,6 +142,15 @@ export class DataSpaceExecutableAnalysisResult {
   info?: DataSpaceExecutableInfo | undefined;
   result?: DataSpaceExecutableResult | undefined;
   executableReturnType?: GenericType | undefined;
+  executableAccessorInfo: DataSpaceExecutableAccessorInfo[] = [];
+}
+
+export abstract class DataSpaceReferencesMetadata {}
+
+export class DataproductReferenceMetadata extends DataSpaceReferencesMetadata {
+  dataproductPath!: string;
+  production?: string | undefined;
+  prodParallel?: string | undefined;
 }
 
 export class DataSpaceAnalysisResult {
@@ -171,6 +188,8 @@ export class DataSpaceAnalysisResult {
   functionInfos?: Map<string, FunctionAnalysisInfo>;
   dependencyFunctionInfos?: Map<string, FunctionAnalysisInfo>;
 
+  dataSpaceReferencesMetadataInfo: DataSpaceReferencesMetadata[] = [];
+
   __INTERNAL__useRelationTDS = false;
 
   get displayName(): string {

package/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts

@@ -103,6 +103,8 @@ import {
   DataSpaceFunctionPointerExecutableInfo,
   DataSpaceExecutionContextRuntimeMetadata,
   DataSpaceMappingProviderAnalysisResult,
+  DataproductReferenceMetadata,
+  LakehouseDataProductExecutableAccessorInfo,
 } from '../../../action/analytics/DataSpaceAnalysis.js';
 import { DiagramAnalysisResult } from '@finos/legend-extension-dsl-diagram';
 import { DSL_DataSpace_PureGraphManagerExtension } from '../DSL_DataSpace_PureGraphManagerExtension.js';
@@ -117,6 +119,8 @@ import {
   V1_DataSpaceMultiExecutionServiceExecutableInfo,
   V1_DataSpaceTemplateExecutableInfo,
   V1_DataSpaceFunctionPointerExecutableInfo,
+  V1_DataproductReferenceMetadata,
+  V1_LakehouseDataProductExecutableAccessorInfo,
 } from './engine/analytics/V1_DataSpaceAnalysis.js';
 import { getDiagram } from '@finos/legend-extension-dsl-diagram/graph';
 import { resolveVersion } from '@finos/legend-server-depot';
@@ -1249,10 +1253,43 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
             );
           }
         }
+        executable.executableAccessorInfo =
+          executableProtocol.executableAccessorInfo
+            .map((accessorInfoProtocol) => {
+              if (
+                accessorInfoProtocol instanceof
+                V1_LakehouseDataProductExecutableAccessorInfo
+              ) {
+                const accessorInfo =
+                  new LakehouseDataProductExecutableAccessorInfo();
+                accessorInfo.dataProductPath =
+                  accessorInfoProtocol.dataProductPath;
+                accessorInfo.accessPointGroupId =
+                  accessorInfoProtocol.accessPointGroupId;
+                accessorInfo.accessPointId = accessorInfoProtocol.accessPointId;
+                return accessorInfo;
+              }
+              return undefined;
+            })
+            .filter(isNonNullable);
         return executable;
       },
     );
 
+    result.dataSpaceReferencesMetadataInfo =
+      analysisResult.dataSpaceReferencesMetadataInfo
+        .map((metadataProtocol) => {
+          if (metadataProtocol instanceof V1_DataproductReferenceMetadata) {
+            const metadata = new DataproductReferenceMetadata();
+            metadata.dataproductPath = metadataProtocol.dataproductPath;
+            metadata.production = metadataProtocol.production;
+            metadata.prodParallel = metadataProtocol.prodParallel;
+            return metadata;
+          }
+          return undefined;
+        })
+        .filter(isNonNullable);
+
     result.mappingToMappingCoverageResult = mappingToMappingCoverageResult;
 
     return result;

package/src/graph-manager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts

@@ -510,6 +510,44 @@ const V1_deserializeDataSpaceExecutableResult = (
   }
 };
 
+export abstract class V1_DataSpaceExecutableAccessorInfo {}
+
+const V1_DATA_SPACE_LAKEHOUSE_DATA_PRODUCT_EXECUTABLE_ACCESSOR_INFO_TYPE =
+  'lakehouseDataProductExecutableAccessorInfo';
+
+export class V1_LakehouseDataProductExecutableAccessorInfo extends V1_DataSpaceExecutableAccessorInfo {
+  dataProductPath!: string;
+  accessPointGroupId!: string;
+  accessPointId!: string;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_LakehouseDataProductExecutableAccessorInfo, {
+      _type: usingConstantValueSchema(
+        V1_DATA_SPACE_LAKEHOUSE_DATA_PRODUCT_EXECUTABLE_ACCESSOR_INFO_TYPE,
+      ),
+      accessPointGroupId: primitive(),
+      accessPointId: primitive(),
+      dataProductPath: primitive(),
+    }),
+  );
+}
+
+const V1_deserializeDataSpaceExecutableAccessorInfo = (
+  json: PlainObject<V1_DataSpaceExecutableAccessorInfo>,
+): V1_DataSpaceExecutableAccessorInfo => {
+  switch (json._type) {
+    case V1_DATA_SPACE_LAKEHOUSE_DATA_PRODUCT_EXECUTABLE_ACCESSOR_INFO_TYPE:
+      return deserialize(
+        V1_LakehouseDataProductExecutableAccessorInfo.serialization.schema,
+        json,
+      );
+    default:
+      throw new UnsupportedOperationError(
+        `Can't deserialize data space executable accessor info of type '${json._type}'`,
+      );
+  }
+};
+
 export class V1_DataSpaceExecutableAnalysisResult {
   title!: string;
   description?: string | undefined;
@@ -517,6 +555,7 @@ export class V1_DataSpaceExecutableAnalysisResult {
   info?: V1_DataSpaceExecutableInfo | undefined;
   result?: V1_DataSpaceExecutableResult | undefined;
   executableReturnType?: V1_GenericType | undefined;
+  executableAccessorInfo: V1_DataSpaceExecutableAccessorInfo[] = [];
 }
 
 const V1_dataSpaceExecutableAnalysisResultModelSchema = (
@@ -525,6 +564,9 @@ const V1_dataSpaceExecutableAnalysisResultModelSchema = (
   createModelSchema(V1_DataSpaceExecutableAnalysisResult, {
     executable: optional(primitive()),
     description: optional(primitive()),
+    executableAccessorInfo: list(
+      custom(() => SKIP, V1_deserializeDataSpaceExecutableAccessorInfo),
+    ),
     info: optionalCustom(
       () => SKIP,
       (val: PlainObject<V1_DataSpaceExecutableInfo>) =>
@@ -538,6 +580,44 @@ const V1_dataSpaceExecutableAnalysisResultModelSchema = (
     ),
   });
 
+export abstract class V1_DataSpaceReferencesMetadata {}
+
+const V1_DATA_SPACE_DATAPRODUCT_REFERENCE_METADATA_TYPE =
+  'dataproductReferenceMetadata';
+
+export class V1_DataproductReferenceMetadata extends V1_DataSpaceReferencesMetadata {
+  dataproductPath!: string;
+  production?: string | undefined;
+  prodParallel?: string | undefined;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_DataproductReferenceMetadata, {
+      _type: usingConstantValueSchema(
+        V1_DATA_SPACE_DATAPRODUCT_REFERENCE_METADATA_TYPE,
+      ),
+      dataproductPath: primitive(),
+      prodParallel: optional(primitive()),
+      production: optional(primitive()),
+    }),
+  );
+}
+
+const V1_deserializeDataSpaceReferencesMetadata = (
+  json: PlainObject<V1_DataSpaceReferencesMetadata>,
+): V1_DataSpaceReferencesMetadata => {
+  switch (json._type) {
+    case V1_DATA_SPACE_DATAPRODUCT_REFERENCE_METADATA_TYPE:
+      return deserialize(
+        V1_DataproductReferenceMetadata.serialization.schema,
+        json,
+      );
+    default:
+      throw new UnsupportedOperationError(
+        `Can't deserialize data space references metadata of type '${json._type}'`,
+      );
+  }
+};
+
 export class V1_DataSpaceAnalysisResult {
   name!: string;
   package!: string;
@@ -566,6 +646,8 @@ export class V1_DataSpaceAnalysisResult {
     string,
     V1_MappingModelCoverageAnalysisResult
   >;
+
+  dataSpaceReferencesMetadataInfo: V1_DataSpaceReferencesMetadata[] = [];
 }
 
 export const V1_dataSpaceAnalysisResultModelSchema = (
@@ -625,6 +707,9 @@ export const V1_dataSpaceAnalysisResultModelSchema = (
           ),
         ),
     ),
+    dataSpaceReferencesMetadataInfo: list(
+      custom(() => SKIP, V1_deserializeDataSpaceReferencesMetadata),
+    ),
   });
 
 export const V1_deserializeDataSpaceAnalysisResult = (

package/src/stores/{DataSpaceMappingProviderAccessState.ts → DataSpaceDataProductAccessState.ts}

@@ -39,7 +39,14 @@ import {
   guaranteeType,
   LogEvent,
 } from '@finos/legend-shared';
-import { action, flow, flowResult, makeObservable, observable } from 'mobx';
+import {
+  action,
+  computed,
+  flow,
+  flowResult,
+  makeObservable,
+  observable,
+} from 'mobx';
 import {
   type DataProductConfig,
   type DataProductDataAccess_LegendApplicationPlugin_Extension,
@@ -47,7 +54,7 @@ import {
   type DataProductAPGState,
   DataProductDataAccessState,
   DataProductViewerState,
-  resolveEntitlementsDataProductFromSDLC,
+  resolveEntitlementsDataProductByDID,
 } from '@finos/legend-extension-dsl-data-product';
 
 export type DataSpaceMappingProviderAccessConfig = {
@@ -65,18 +72,23 @@ export type DataSpaceMappingProviderAccessConfig = {
 };
 
 /**
- * Backing state for the DataSpace viewer's "Request Access" flow on
- * mappingProvider execution contexts. Lazily resolves the referenced Lakehouse
- * DataProduct from the depot artifact generation for the DataSpace's own GAV,
- * then materializes the same viewer + data-access state stack that the LH
- * DataProduct viewer uses so that the access-request button and its dialogs
- * can be rendered as-is.
+ * Backing state for the DataSpace viewer's "Request Access" flow against a
+ * single referenced Lakehouse Data Product. Serves both the mappingProvider
+ * execution context entry and the per-executable accessor panels.
+ *
+ * The Lakehouse deployment id is supplied by the caller (it comes from the
+ * DataSpace analytics' `dataSpaceReferencesMetadataInfo`), so this state
+ * resolves the Data Product straight from Lakehouse without a depot
+ * artifact-generation lookup. It then materializes the same viewer +
+ * data-access state stack that the Lakehouse DataProduct viewer uses, so the
+ * access-request button and its dialogs can be rendered as-is.
  */
-export class DataSpaceMappingProviderAccessState {
+export class DataSpaceDataProductAccessState {
   readonly applicationStore: GenericLegendApplicationStore;
   readonly graphManagerState: GraphManagerState;
   readonly gav: ProjectGAVCoordinates;
-  readonly mappingProviderPath: string;
+  readonly dataProductPath: string;
+  readonly deploymentId: number;
   readonly config: DataSpaceMappingProviderAccessConfig;
 
   readonly initializingState = ActionState.create();
@@ -90,7 +102,8 @@ export class DataSpaceMappingProviderAccessState {
     applicationStore: GenericLegendApplicationStore,
     graphManagerState: GraphManagerState,
     gav: ProjectGAVCoordinates,
-    mappingProviderPath: string,
+    dataProductPath: string,
+    deploymentId: number,
     config: DataSpaceMappingProviderAccessConfig,
   ) {
     makeObservable(this, {
@@ -102,15 +115,24 @@ export class DataSpaceMappingProviderAccessState {
       setDataAccessState: action,
       setModelAPGState: action,
       setErrorMessage: action,
+      isDataProductUnresolved: computed,
       initialize: flow,
     });
     this.applicationStore = applicationStore;
     this.graphManagerState = graphManagerState;
     this.gav = gav;
-    this.mappingProviderPath = mappingProviderPath;
+    this.dataProductPath = dataProductPath;
+    this.deploymentId = deploymentId;
     this.config = config;
   }
 
+  get isDataProductUnresolved(): boolean {
+    return (
+      this.errorMessage !== undefined &&
+      this.dataProductViewerState === undefined
+    );
+  }
+
   setDataProductViewerState(val: DataProductViewerState | undefined): void {
     this.dataProductViewerState = val;
   }
@@ -141,14 +163,14 @@ export class DataSpaceMappingProviderAccessState {
         V1_PureGraphManager,
         'GraphManager must be a V1_PureGraphManager',
       );
-      const resolved = (yield resolveEntitlementsDataProductFromSDLC(
-        this.gav,
-        this.mappingProviderPath,
+      const resolved = (yield resolveEntitlementsDataProductByDID(
+        this.dataProductPath,
+        this.deploymentId,
         this.config.depotServerClient,
         this.config.lakehouseContractServerClient,
         graphManager,
         this.config.tokenProvider,
-      )) as Awaited<ReturnType<typeof resolveEntitlementsDataProductFromSDLC>>;
+      )) as Awaited<ReturnType<typeof resolveEntitlementsDataProductByDID>>;
       const dataProductViewerState = new DataProductViewerState(
         resolved.dataProduct,
         this.applicationStore,
@@ -177,7 +199,7 @@ export class DataSpaceMappingProviderAccessState {
       const modelAPG = dataProductViewerState.getModelAccessPointGroup();
       if (!modelAPG) {
         this.setErrorMessage(
-          `Data Product '${this.mappingProviderPath}' has no model access point group.`,
+          `Data Product '${this.dataProductPath}' has no model access point group.`,
         );
       } else {
         const modelAPGState = dataProductViewerState.apgStates.find(
@@ -190,7 +212,7 @@ export class DataSpaceMappingProviderAccessState {
       assertErrorThrown(error);
       this.applicationStore.logService.warn(
         LogEvent.create(APPLICATION_EVENT.GENERIC_FAILURE),
-        `Failed to initialize DataSpace mapping provider access for '${this.mappingProviderPath}' (${this.gav.groupId}:${this.gav.artifactId}:${this.gav.versionId}): ${error.message}`,
+        `Failed to initialize DataSpace Data Product access for '${this.dataProductPath}' (${this.gav.groupId}:${this.gav.artifactId}:${this.gav.versionId}): ${error.message}`,
       );
       this.setErrorMessage(error.message);
     } finally {