@finos/legend-graph 32.3.14 → 32.3.16

package/src/graph/metamodel/pure/dataProduct/DataProduct.ts

@@ -242,6 +242,7 @@ export class SupportInfo implements Hashable {
   faqUrl: DataProductLink | undefined;
   supportUrl: DataProductLink | undefined;
   emails: Email[] = [];
+  expertise: Expertise[] | undefined;
 
   get hashCode(): string {
     return hashArray([
@@ -251,6 +252,7 @@ export class SupportInfo implements Hashable {
       this.faqUrl ?? '',
       this.supportUrl ?? '',
       hashArray(this.emails),
+      hashArray(this.expertise ?? []),
     ]);
   }
 }
@@ -368,17 +370,28 @@ export class Expertise implements Hashable {
   }
 }
 
+export class DataProductOperationalMetadata implements Hashable {
+  coverageRegions: DataProduct_Region[] | undefined;
+  updateFrequency: DataProduct_DeliveryFrequency | undefined;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_OPERATIONAL_METADATA,
+      hashArray(this.coverageRegions ?? []),
+      this.updateFrequency ?? '',
+    ]);
+  }
+}
+
 export class DataProduct extends PackageableElement {
   title: string | undefined;
   description: string | undefined;
-  coverageRegions: DataProduct_Region[] | undefined;
-  deliveryFrequency: DataProduct_DeliveryFrequency | undefined;
   icon: DataProductIcon | undefined;
   accessPointGroups: AccessPointGroup[] = [];
   supportInfo: SupportInfo | undefined;
   type: DataProductType | undefined;
   sampleValues: EmbeddedData[] | undefined;
-  expertise: Expertise[] | undefined;
+  operational: DataProductOperationalMetadata | undefined;
 
   override accept_PackageableElementVisitor<T>(
     visitor: PackageableElementVisitor<T>,
@@ -391,8 +404,6 @@ export class DataProduct extends PackageableElement {
       CORE_HASH_STRUCTURE.DATA_PRODUCT,
       this.title ?? '',
       this.description ?? '',
-      hashArray(this.coverageRegions ?? []),
-      this.deliveryFrequency ?? '',
       this.icon ?? '',
       hashArray(this.accessPointGroups),
       this.supportInfo ?? '',
@@ -400,7 +411,7 @@ export class DataProduct extends PackageableElement {
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),
       hashArray(this.taggedValues),
       hashArray(this.sampleValues ?? []),
-      hashArray(this.expertise ?? []),
+      this.operational ?? '',
     ]);
   }
 }

package/src/graph-manager/action/changeDetection/DataProductObserveHelper.ts

@@ -78,6 +78,17 @@ export const observer_DataProductLink = skipObserved(
     return metamodel;
   },
 );
+
+export const observe_Expertise = skipObserved(
+  (metamodel: Expertise): Expertise => {
+    makeObservable(metamodel, {
+      description: observable,
+      expertIds: observable,
+    });
+    return metamodel;
+  },
+);
+
 export const observe_SupportInfo = skipObserved(
   (metamodel: SupportInfo): SupportInfo => {
     makeObservable(metamodel, {
@@ -86,8 +97,10 @@ export const observe_SupportInfo = skipObserved(
       faqUrl: observable,
       supportUrl: observable,
       emails: observable,
+      expertise: observable,
     });
     metamodel.emails.forEach(observe_Email);
+    metamodel.expertise?.forEach(observe_Expertise);
     if (metamodel.documentation) {
       observer_DataProductLink(metamodel.documentation);
     }
@@ -203,16 +216,6 @@ export const observe_DataProductIcon = skipObserved(
   },
 );
 
-export const observe_Expertise = skipObserved(
-  (metamodel: Expertise): Expertise => {
-    makeObservable(metamodel, {
-      description: observable,
-      expertIds: observable,
-    });
-    return metamodel;
-  },
-);
-
 export const observe_DataProduct = skipObserved(
   (metamodel: DataProduct): DataProduct => {
     observe_Abstract_PackageableElement(metamodel);
@@ -225,7 +228,6 @@ export const observe_DataProduct = skipObserved(
       supportInfo: observable,
       icon: observable,
       type: observable,
-      expertise: observable,
     });
 
     if (metamodel.supportInfo) {
@@ -234,7 +236,6 @@ export const observe_DataProduct = skipObserved(
     if (metamodel.icon) {
       observe_DataProductIcon(metamodel.icon);
     }
-    metamodel.expertise?.forEach(observe_Expertise);
     metamodel.accessPointGroups.forEach(observe_APG);
     return metamodel;
   },

package/src/graph-manager/protocol/pure/v1/lakehouse/entitlements/V1_EntitlementsDataProduct.ts

@@ -71,6 +71,7 @@ export class V1_EntitlementsDataProductDetails {
   origin?: V1_EntitlementsDataProductOrigin | null;
   lakehouseEnvironment?: V1_EntitlementsLakehouseEnvironment | null;
   dataProduct!: V1_EntitlementsDataProduct;
+  fullPath!: string;
 }
 
 export class V1_EntitlementsDataProductLite {

package/src/graph-manager/protocol/pure/v1/model/packageableElements/dataProduct/V1_DataProduct.ts

@@ -16,6 +16,7 @@
 
 import {
   hashArray,
+  uuid,
   type Hashable,
   type PlainObject,
 } from '@finos/legend-shared';
@@ -146,6 +147,7 @@ export class V1_SupportInfo implements Hashable {
   faqUrl: V1_DataProductLink | undefined;
   supportUrl: V1_DataProductLink | undefined;
   emails: V1_Email[] = [];
+  expertise: V1_Expertise[] | undefined;
 
   get hashCode(): string {
     return hashArray([
@@ -155,6 +157,7 @@ export class V1_SupportInfo implements Hashable {
       this.faqUrl ?? '',
       this.supportUrl ?? '',
       hashArray(this.emails),
+      hashArray(this.expertise ?? []),
     ]);
   }
 }
@@ -308,6 +311,7 @@ export class V1_ExternalDataProductType extends V1_DataProductType {
 }
 
 export class V1_Expertise implements Hashable {
+  readonly uuid = uuid();
   description: string | undefined;
   expertIds: string[] | undefined;
 
@@ -320,11 +324,22 @@ export class V1_Expertise implements Hashable {
   }
 }
 
+export class V1_DataProductOperationalMetadata implements Hashable {
+  coverageRegions: V1_DataProductRegion[] | undefined;
+  updateFrequency: V1_DeliveryFrequency | undefined;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_OPERATIONAL_METADATA,
+      hashArray(this.coverageRegions ?? []),
+      this.updateFrequency ?? '',
+    ]);
+  }
+}
+
 export class V1_DataProduct extends V1_PackageableElement implements Hashable {
   title: string | undefined;
   description: string | undefined;
-  coverageRegions: V1_DataProductRegion[] | undefined;
-  deliveryFrequency: V1_DeliveryFrequency | undefined;
   icon: V1_DataProductIcon | undefined;
   accessPointGroups: V1_AccessPointGroup[] = [];
   supportInfo: V1_SupportInfo | undefined;
@@ -332,15 +347,13 @@ export class V1_DataProduct extends V1_PackageableElement implements Hashable {
   stereotypes: V1_StereotypePtr[] = [];
   taggedValues: V1_TaggedValue[] = [];
   sampleValues: V1_EmbeddedData[] | undefined;
-  expertise: V1_Expertise[] | undefined;
+  operational: V1_DataProductOperationalMetadata | undefined;
 
   override get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.DATA_PRODUCT,
       this.title ?? '',
       this.description ?? '',
-      hashArray(this.coverageRegions ?? []),
-      this.deliveryFrequency ?? '',
       this.icon ?? '',
       hashArray(this.accessPointGroups),
       this.supportInfo ?? '',
@@ -348,7 +361,7 @@ export class V1_DataProduct extends V1_PackageableElement implements Hashable {
       hashArray(this.stereotypes),
       hashArray(this.taggedValues),
       hashArray(this.sampleValues ?? []),
-      hashArray(this.expertise ?? []),
+      this.operational ?? '',
     ]);
   }
 

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DataProductTransformer.ts

@@ -51,6 +51,7 @@ import {
   V1_ExternalDataProductType,
   V1_FunctionAccessPoint,
   type V1_Expertise,
+  V1_DataProductOperationalMetadata,
 } from '../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import { V1_initPackageableElement } from './V1_CoreTransformerHelper.js';
 import { V1_transformRawLambda } from './V1_RawValueSpecificationTransformer.js';
@@ -126,16 +127,9 @@ export const V1_transformDataProduct = (
   V1_initPackageableElement(product, element);
   product.description = element.description;
   product.title = element.title;
-  product.deliveryFrequency = element.deliveryFrequency as
-    | V1_DeliveryFrequency
-    | undefined;
-  product.coverageRegions = element.coverageRegions as
-    | V1_DataProductRegion[]
-    | undefined;
   product.sampleValues = element.sampleValues?.map((data) =>
     V1_transformEmbeddedData(data, context),
   );
-  product.expertise = element.expertise as V1_Expertise[] | undefined;
   if (element.type instanceof InternalDataProductType) {
     product.type = new V1_InternalDataProductType();
   } else if (element.type instanceof ExternalDataProductType) {
@@ -150,10 +144,26 @@ export const V1_transformDataProduct = (
     product.icon = transformDataProductIcon(element.icon);
   }
 
+  if (!element.operational) {
+    product.operational = undefined;
+  } else {
+    const operational = new V1_DataProductOperationalMetadata();
+    operational.updateFrequency = element.operational.updateFrequency as
+      | V1_DeliveryFrequency
+      | undefined;
+    operational.coverageRegions = element.operational.coverageRegions as
+      | V1_DataProductRegion[]
+      | undefined;
+    product.operational = operational;
+  }
+
   if (!element.supportInfo) {
     product.supportInfo = undefined;
   } else {
     const supportInfo = new V1_SupportInfo();
+    supportInfo.expertise = element.supportInfo.expertise as
+      | V1_Expertise[]
+      | undefined;
     supportInfo.documentation = element.supportInfo.documentation;
     supportInfo.website = element.supportInfo.website;
     supportInfo.faqUrl = element.supportInfo.faqUrl;

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementSecondPassBuilder.ts

@@ -131,8 +131,6 @@ import {
   type V1_DataProduct,
 } from '../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import {
-  type DataProduct_DeliveryFrequency,
-  type DataProduct_Region,
   Email,
   ExternalDataProductType,
   InternalDataProductType,
@@ -144,6 +142,7 @@ import {
   V1_buildDataProductExpertise,
   V1_buildDataProductIcon,
   V1_buildDataProductLink,
+  V1_buildDataProductOperationalMetadata,
 } from './helpers/V1_DataProductBuilder.js';
 import type { V1_IngestDefinition } from '../../../model/packageableElements/ingest/V1_IngestDefinition.js';
 import { IncludeStore } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/IncludeStore.js';
@@ -767,6 +766,10 @@ export class V1_ElementSecondPassBuilder
       supportInfo.supportUrl = protocolSupportInfo.supportUrl
         ? V1_buildDataProductLink(protocolSupportInfo.supportUrl)
         : undefined;
+      supportInfo.expertise =
+        protocolSupportInfo.expertise?.map((expertise) =>
+          V1_buildDataProductExpertise(expertise),
+        ) ?? [];
       supportInfo.emails = protocolSupportInfo.emails.map((elementEmail) => {
         const email = new Email(elementEmail.address, elementEmail.title);
         return email;
@@ -783,17 +786,11 @@ export class V1_ElementSecondPassBuilder
     dataProduct.sampleValues = element.sampleValues?.map((data) =>
       V1_buildEmbeddedData(data, this.context),
     );
-    if (element.expertise) {
-      dataProduct.expertise = element.expertise.map((expertise) =>
-        V1_buildDataProductExpertise(expertise),
+    if (element.operational) {
+      dataProduct.operational = V1_buildDataProductOperationalMetadata(
+        element.operational,
       );
     }
-    dataProduct.deliveryFrequency = element.deliveryFrequency as
-      | DataProduct_DeliveryFrequency
-      | undefined;
-    dataProduct.coverageRegions = element.coverageRegions as
-      | DataProduct_Region[]
-      | undefined;
     dataProduct.stereotypes = element.stereotypes
       .map((stereotype) => this.context.resolveStereotype(stereotype))
       .filter(isNonNullable);

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_DataProductBuilder.ts

@@ -24,10 +24,13 @@ import {
   type DataProductElement,
   type DataProductIcon,
   AccessPointGroup,
+  type DataProduct_DeliveryFrequency,
+  type DataProduct_Region,
   DataProductElementScope,
   DataProductEmbeddedImageIcon,
   DataProductLibraryIcon,
   DataProductLink,
+  DataProductOperationalMetadata,
   DataProductRuntimeInfo,
   Expertise,
   FunctionAccessPoint,
@@ -49,6 +52,7 @@ import {
   V1_ModelAccessPointGroup,
   V1_UnknownAccessPoint,
   V1_UnknownDataProductIcon,
+  type V1_DataProductOperationalMetadata,
 } from '../../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
 import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver.js';
@@ -134,6 +138,19 @@ export const V1_buildDataProductExpertise = (
   return expertise;
 };
 
+export const V1_buildDataProductOperationalMetadata = (
+  operationalMetadata: V1_DataProductOperationalMetadata,
+): DataProductOperationalMetadata => {
+  const metamodelOperationalMetadata = new DataProductOperationalMetadata();
+  metamodelOperationalMetadata.updateFrequency =
+    operationalMetadata.updateFrequency as
+      | DataProduct_DeliveryFrequency
+      | undefined;
+  metamodelOperationalMetadata.coverageRegions =
+    operationalMetadata.coverageRegions as DataProduct_Region[] | undefined;
+  return metamodelOperationalMetadata;
+};
+
 export const V1_buildAccessPointGroup = (
   elementGroup: V1_AccessPointGroup,
   context: V1_GraphBuilderContext,

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_DataProductSerializationHelper.ts

@@ -47,6 +47,7 @@ import {
   V1_DataProductTypeValue,
   V1_Expertise,
   V1_FunctionAccessPoint,
+  V1_DataProductOperationalMetadata,
 } from '../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import {
   UnsupportedOperationError,
@@ -296,14 +297,34 @@ const V1_DataProductLinkModelSchema = createModelSchema(V1_DataProductLink, {
   url: primitive(),
 });
 
+export const V1_ExpertiseModelSchema = createModelSchema(V1_Expertise, {
+  description: optional(primitive()),
+  expertIds: list(primitive()),
+});
+
 export const V1_SupportInfoModelSchema = createModelSchema(V1_SupportInfo, {
   documentation: optional(usingModelSchema(V1_DataProductLinkModelSchema)),
   emails: customListWithSchema(V1_EmailModelSchema),
   faqUrl: optional(usingModelSchema(V1_DataProductLinkModelSchema)),
   supportUrl: optional(usingModelSchema(V1_DataProductLinkModelSchema)),
+  expertise: optionalCustomListWithSchema(V1_ExpertiseModelSchema),
   website: optional(usingModelSchema(V1_DataProductLinkModelSchema)),
 });
 
+export const V1_DataProductOperationalMetadataModelSchema = createModelSchema(
+  V1_DataProductOperationalMetadata,
+  {
+    coverageRegions: optionalCustomList(
+      (json) => (json as string).toLowerCase(),
+      (json) => (json as unknown as string).toUpperCase(),
+    ),
+    updateFrequency: optionalCustom(
+      (json) => (json as string).toLowerCase(),
+      (json) => (json as string).toUpperCase(),
+    ),
+  },
+);
+
 export const V1_InternalDataProductTypeModelSchema = createModelSchema(
   V1_InternalDataProductType,
   {
@@ -319,11 +340,6 @@ export const V1_ExternalDataProductTypeModelSchema = createModelSchema(
   },
 );
 
-export const V1_ExpertiseModelSchema = createModelSchema(V1_Expertise, {
-  description: optional(primitive()),
-  expertIds: list(primitive()),
-});
-
 export const V1_deserializeDataProductType = (
   json: Record<string, unknown>,
 ): V1_DataProductType => {
@@ -357,26 +373,19 @@ export const V1_dataProductModelSchema = (
       V1_serializeAccessPointGroup,
       V1_deserializeAccessPointGroup,
     ),
-    coverageRegions: optionalCustomList(
-      (json) => (json as string).toLowerCase(),
-      (json) => (json as unknown as string).toUpperCase(),
-    ),
-
-    deliveryFrequency: optionalCustom(
-      (json) => (json as string).toLowerCase(),
-      (json) => (json as string).toUpperCase(),
-    ),
     description: optional(primitive()),
     sampleValues: optionalCustomList(
       (data: V1_EmbeddedData) => V1_serializeEmbeddedDataType(data, plugins),
       (data) => V1_deserializeEmbeddedDataType(data, plugins),
     ),
-    expertise: optionalCustomListWithSchema(V1_ExpertiseModelSchema),
     icon: optionalCustom(
       V1_serializeDataProductIcon,
       V1_deserializeDataProductIcon,
     ),
     name: primitive(),
+    operational: optionalCustomUsingModelSchema(
+      V1_DataProductOperationalMetadataModelSchema,
+    ),
     package: primitive(),
     type: optionalCustom(
       V1_serializeDataProductType,

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_EntitlementSerializationHelper.ts

@@ -605,6 +605,7 @@ export const V1_EntitlementsDataProductDetailsModelSchema = createModelSchema(
       V1_EntitlementsLakehouseEnvironmentModelSchema,
     ),
     dataProduct: usingModelSchema(V1_EntitlementsDataProductModelSchema),
+    fullPath: primitive(),
   },
 );