From eec360cd6b019d272945bfae9782ec613c17f72c Mon Sep 17 00:00:00 2001 From: kelly-thai <89568879+kelly-thai@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:20:08 -0600 Subject: [PATCH] Data Product rename (#3808) --- .changeset/purple-cars-occur.md | 10 ++++++++++ .../src/__lib__/LegendQueryUserDataSpaceHelper.ts | 2 +- .../components/Core_LegendQueryApplicationPlugin.tsx | 2 +- .../src/components/QueryEditor.tsx | 4 +++- .../__tests__/QueryEditor.dataspace.test.tsx | 6 +++--- .../src/stores/QueryEditorStore.ts | 2 +- .../data-space/DataSpaceTemplateQueryCreatorStore.ts | 2 +- .../DSL_NewDataQualityValidationElement.tsx | 2 +- .../__lib__/DSL_DataSpace_LegendStudioCodeSnippet.ts | 2 +- .../DataSpaceTemplateQueryPromoteReview.tsx | 6 +++--- .../DataSpaceTemplateQueryPromotionReviewerStore.ts | 12 ++++++------ .../__tests__/DSL_DataSpace_Roundtrip.test.ts | 2 +- .../v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts | 4 ++-- .../src/stores/shared/DataSpaceInfo.ts | 2 +- .../changeDetection/DSL_Mapping_ObserverHelper.ts | 2 +- .../DSL_DataSpaceTest.engine-roundtrip-test.tsx | 4 ++-- .../RoundtripGrammar.engine-roundtrip-test.ts | 2 +- .../v1/V1_QueryBuilder_PureGraphManagerExtension.ts | 4 ++-- 18 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 .changeset/purple-cars-occur.md diff --git a/.changeset/purple-cars-occur.md b/.changeset/purple-cars-occur.md new file mode 100644 index 0000000000..cd1a3a51a9 --- /dev/null +++ b/.changeset/purple-cars-occur.md @@ -0,0 +1,10 @@ +--- +'@finos/legend-extension-dsl-data-space-studio': patch +'@finos/legend-extension-dsl-data-quality': patch +'@finos/legend-extension-dsl-data-space': patch +'@finos/legend-application-query': patch +'@finos/legend-query-builder': patch +'@finos/legend-graph': patch +--- + +Updating dataspaces to dataproducts where necessary diff --git a/packages/legend-application-query/src/__lib__/LegendQueryUserDataSpaceHelper.ts b/packages/legend-application-query/src/__lib__/LegendQueryUserDataSpaceHelper.ts index 1b136d4b53..63d24e210c 100644 --- a/packages/legend-application-query/src/__lib__/LegendQueryUserDataSpaceHelper.ts +++ b/packages/legend-application-query/src/__lib__/LegendQueryUserDataSpaceHelper.ts @@ -33,7 +33,7 @@ export const createVisitedDataSpaceId = ( artifactId: string, dataSpace: string, ): string => - // we will consider unique dataSpace if it belongs to the same project. i.e we will not save 2 dataspaces visited for 2 different versionss + // we will consider unique data product if it belongs to the same project. i.e we will not save 2 dataspaces visited for 2 different versionss generateGAVCoordinates(groupId, artifactId, undefined) + GAV_DELIMITER + dataSpace; diff --git a/packages/legend-application-query/src/components/Core_LegendQueryApplicationPlugin.tsx b/packages/legend-application-query/src/components/Core_LegendQueryApplicationPlugin.tsx index 09f095a5c2..b33aeb85d2 100644 --- a/packages/legend-application-query/src/components/Core_LegendQueryApplicationPlugin.tsx +++ b/packages/legend-application-query/src/components/Core_LegendQueryApplicationPlugin.tsx @@ -843,7 +843,7 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu runtime.runtimeValue = new V1_EngineRuntime(); return graphManager.elementProtocolToEntity(runtime); }); - // The DataSpace entity is excluded from AnalyticsResult.Json to reduce the JSON size + // The Data Product entity is excluded from AnalyticsResult.Json to reduce the JSON size // because all its information can be found in V1_DataSpaceAnalysisResult. // Therefore, we are building a simple v1_DataSpace entity based on V1_DataSpaceAnalysisResult. const dataspaceProtocol = new V1_DataSpace(); diff --git a/packages/legend-application-query/src/components/QueryEditor.tsx b/packages/legend-application-query/src/components/QueryEditor.tsx index fd0b66bf01..2cb0966669 100644 --- a/packages/legend-application-query/src/components/QueryEditor.tsx +++ b/packages/legend-application-query/src/components/QueryEditor.tsx @@ -511,7 +511,9 @@ const QueryEditorExistingQueryInfoModal = observer( {executionContext instanceof QueryDataSpaceExecutionContext && ( <>
-
DataSpace
+
+ Data Product +
{executionContext.dataSpacePath}
diff --git a/packages/legend-application-query/src/components/__tests__/QueryEditor.dataspace.test.tsx b/packages/legend-application-query/src/components/__tests__/QueryEditor.dataspace.test.tsx index 680f70192e..b80f17e72f 100644 --- a/packages/legend-application-query/src/components/__tests__/QueryEditor.dataspace.test.tsx +++ b/packages/legend-application-query/src/components/__tests__/QueryEditor.dataspace.test.tsx @@ -32,7 +32,7 @@ import { fireEvent, getByText, waitFor } from '@testing-library/dom'; import { DSL_DataSpace_LegendApplicationPlugin } from '@finos/legend-extension-dsl-data-space/application'; test( - integrationTest('Load Existing DataSpace Query in Query Editor'), + integrationTest('Load Existing Data Product Query in Query Editor'), async () => { const mockedQueryEditorStore = TEST__provideMockedQueryEditorStore({ extraPlugins: [new DSL_DataSpace_LegendApplicationPlugin()], @@ -91,7 +91,7 @@ test( await waitFor(() => getByText(aboutDataSpaceModal, 'CovidDataMapping')); await waitFor(() => getByText(aboutDataSpaceModal, 'H2Runtime')); - // TODO: below is for testing dataspace quick start module + // TODO: below is for testing data product quick start module // const openDataSpaceButton = await waitFor(() => // renderResult.getByTitle('Open advanced search for data product...'), // ); @@ -109,7 +109,7 @@ test( test( integrationTest( - 'Load Existing DataSpace Query with minimal graph in Query Editor', + 'Load Existing Data Product Query with minimal graph in Query Editor', ), async () => { const mockedQueryEditorStore = TEST__provideMockedQueryEditorStore({ diff --git a/packages/legend-application-query/src/stores/QueryEditorStore.ts b/packages/legend-application-query/src/stores/QueryEditorStore.ts index 198803a8cd..4ea36c9e12 100644 --- a/packages/legend-application-query/src/stores/QueryEditorStore.ts +++ b/packages/legend-application-query/src/stores/QueryEditorStore.ts @@ -708,7 +708,7 @@ export abstract class QueryEditorStore { supportBuildMinimalGraph ) { try { - this.initState.setMessage('Fetching dataspace analysis result...'); + this.initState.setMessage('Fetching data product analysis result...'); const project = StoreProjectData.serialization.fromJson( await this.depotServerClient.getProject(groupId, artifactId), ); diff --git a/packages/legend-application-query/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts b/packages/legend-application-query/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts index 66cad5f46d..1ab70dfdf8 100644 --- a/packages/legend-application-query/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts +++ b/packages/legend-application-query/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts @@ -160,7 +160,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore { } if (!query) { throw new IllegalStateError( - `Can't fetch query from dataspace executable`, + `Can't fetch query from data product executable`, ); } if (!executionContext) { diff --git a/packages/legend-extension-dsl-data-quality/src/components/DSL_NewDataQualityValidationElement.tsx b/packages/legend-extension-dsl-data-quality/src/components/DSL_NewDataQualityValidationElement.tsx index b94ec8bd81..e71f6ff43d 100644 --- a/packages/legend-extension-dsl-data-quality/src/components/DSL_NewDataQualityValidationElement.tsx +++ b/packages/legend-extension-dsl-data-quality/src/components/DSL_NewDataQualityValidationElement.tsx @@ -152,7 +152,7 @@ export const NewDataQualityValidationElementEditor = observer(() => { CLASS_ELEMENT_CREATION_BASIS.DATASPACE_BASED ? (
- DataSpace + Data Product
{ />
- We will promote this query as a curated template query in - dataspace. This automated process will generate a code review - and workspace. Please get the generated code review reviewed and + We will promote this query as a curated template query in data + product. This automated process will generate a code review and + workspace. Please get the generated code review reviewed and approved.
diff --git a/packages/legend-extension-dsl-data-space-studio/src/stores/DataSpaceTemplateQueryPromotionReviewerStore.ts b/packages/legend-extension-dsl-data-space-studio/src/stores/DataSpaceTemplateQueryPromotionReviewerStore.ts index f0edd18541..f9f68ebec9 100644 --- a/packages/legend-extension-dsl-data-space-studio/src/stores/DataSpaceTemplateQueryPromotionReviewerStore.ts +++ b/packages/legend-extension-dsl-data-space-studio/src/stores/DataSpaceTemplateQueryPromotionReviewerStore.ts @@ -272,7 +272,7 @@ export class DataSpaceTemplateQueryPromotionReviewerStore { entity.path === dataSpacePath && entity.classifierPath === DATA_SPACE_ELEMENT_CLASSIFIER_PATH, )[0], - `Can't find dataSpace entity with path ${this.dataSpaceEntity}`, + `Can't find data product entity with path ${this.dataSpaceEntity}`, ); this.initState.pass(); } @@ -445,7 +445,7 @@ export class DataSpaceTemplateQueryPromotionReviewerStore { ), ); - // ii. update dataspace + // ii. update data product this.applicationStore.alertService.setBlockingAlert({ message: `Generating code commit...`, prompt: 'Please do not close the application', @@ -456,7 +456,7 @@ export class DataSpaceTemplateQueryPromotionReviewerStore { workspace, { message: - 'promote-as-template-query: promote query as a template query to dataspace', + 'promote-as-template-query: promote query as a template query to data product', entityChanges: [ { classifierPath: updatedDataSpaceEntity.classifierPath, @@ -492,7 +492,7 @@ export class DataSpaceTemplateQueryPromotionReviewerStore { !workspaceReviewState.canCreateReview || workspaceReviewState.sdlcState.isActiveProjectSandbox; workspaceReviewState.reviewTitle = - 'code review - promote query as a template query to dataspace'; + 'code review - promote query as a template query to data product'; if (!isCreateReviewDisabled) { await flowResult( workspaceReviewState.createWorkspaceReview( @@ -509,9 +509,9 @@ export class DataSpaceTemplateQueryPromotionReviewerStore { this.applicationStore.alertService.setBlockingAlert(undefined); this.promoteState.pass(); this.applicationStore.alertService.setActionAlertInfo({ - message: `Successfully promoted query into dataspace '${this.dataSpacePath}'. Now your template query can be found in workspace '${this.workspaceName}' of project '${project.name}' (${project.projectId})`, + message: `Successfully promoted query into data product '${this.dataSpacePath}'. Now your template query can be found in workspace '${this.workspaceName}' of project '${project.name}' (${project.projectId})`, prompt: compilationFailed - ? `The workspace might not compile at the moment, please make sure to fix the issue and submit a review to make the dataspace part of the project to complete template query promotion` + ? `The workspace might not compile at the moment, please make sure to fix the issue and submit a review to make the data product part of the project to complete template query promotion` : `Please make sure to get the generated code-review reviewed and approved`, type: ActionAlertType.STANDARD, actions: compilationFailed diff --git a/packages/legend-extension-dsl-data-space/src/graph-manager/__tests__/DSL_DataSpace_Roundtrip.test.ts b/packages/legend-extension-dsl-data-space/src/graph-manager/__tests__/DSL_DataSpace_Roundtrip.test.ts index 1613b4b3e1..501422a063 100644 --- a/packages/legend-extension-dsl-data-space/src/graph-manager/__tests__/DSL_DataSpace_Roundtrip.test.ts +++ b/packages/legend-extension-dsl-data-space/src/graph-manager/__tests__/DSL_DataSpace_Roundtrip.test.ts @@ -58,7 +58,7 @@ test( graphManagerState.graph.allElements.findLast( (e) => e instanceof DataSpace && e.path === 'domain::COVIDDatapace', ), - 'fail to find a dataspace', + 'fail to find a data product', ), DataSpace, ); diff --git a/packages/legend-extension-dsl-data-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts b/packages/legend-extension-dsl-data-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts index e8912bcd0f..40a15cf424 100644 --- a/packages/legend-extension-dsl-data-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts +++ b/packages/legend-extension-dsl-data-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts @@ -180,7 +180,7 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu ec.mapping.path === currentQuery.mapping && ec.defaultRuntime.path === currentQuery.runtime, )[0]?.name, - 'can`t find a corresponding executatin key based on query`s mapping and runtime in dataspace', + 'can`t find a corresponding executatin key based on query`s mapping and runtime in data product', ); } @@ -335,7 +335,7 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu analysisResult = result; } else { throw new GraphBuilderError( - 'Fail to get a valid dataspace analytics json from metadata, start building full graph', + 'Fail to get a valid data product analytics json from metadata, start building full graph', ); } const plugins = diff --git a/packages/legend-extension-dsl-data-space/src/stores/shared/DataSpaceInfo.ts b/packages/legend-extension-dsl-data-space/src/stores/shared/DataSpaceInfo.ts index 499d581ac5..2d1b023112 100644 --- a/packages/legend-extension-dsl-data-space/src/stores/shared/DataSpaceInfo.ts +++ b/packages/legend-extension-dsl-data-space/src/stores/shared/DataSpaceInfo.ts @@ -30,7 +30,7 @@ export interface DataSpaceInfo { path: string; /** * NOTE: technically, this should be always available, but we must not - * assume that no dataspace is marlformed, so we leave it as optional + * assume that no data product is marlformed, so we leave it as optional */ defaultExecutionContext: string | undefined; } diff --git a/packages/legend-graph/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts b/packages/legend-graph/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts index 8fbbcf509a..91ec40bcad 100644 --- a/packages/legend-graph/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts +++ b/packages/legend-graph/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts @@ -675,7 +675,7 @@ export const observe_SubstituteStore = skipObserved( export const observe_MappingInclude = skipObserved( (metamodel: MappingInclude): MappingInclude => { - // TODO: handle for mapping include dataspace + // TODO: handle for mapping include data product if (metamodel instanceof MappingIncludeMapping) { makeObservable(metamodel, { included: observable, diff --git a/packages/legend-manual-tests/src/__tests__/extensions/DSL_DataSpace/DSL_DataSpaceTest.engine-roundtrip-test.tsx b/packages/legend-manual-tests/src/__tests__/extensions/DSL_DataSpace/DSL_DataSpaceTest.engine-roundtrip-test.tsx index 58ec04ceaa..62f68cab07 100644 --- a/packages/legend-manual-tests/src/__tests__/extensions/DSL_DataSpace/DSL_DataSpaceTest.engine-roundtrip-test.tsx +++ b/packages/legend-manual-tests/src/__tests__/extensions/DSL_DataSpace/DSL_DataSpaceTest.engine-roundtrip-test.tsx @@ -218,7 +218,7 @@ type ModelCoverageTestCase = [ const MODEL_COVERAGE_CASES: ModelCoverageTestCase[] = [ [ - 'simple relational model with dataspace', + 'simple relational model with data product', { dataspacePath: 'showcase::northwind::dataspace::NorthwindDataSpaceWithExecutables', @@ -243,7 +243,7 @@ const MODEL_COVERAGE_CASES: ModelCoverageTestCase[] = [ ]; describe( - integrationTest('Build minimal graph from dataspace artifacts'), + integrationTest('Build minimal graph from data product artifacts'), () => { test.each(MODEL_COVERAGE_CASES)( '%s', diff --git a/packages/legend-manual-tests/src/__tests__/roundtrip-grammar/RoundtripGrammar.engine-roundtrip-test.ts b/packages/legend-manual-tests/src/__tests__/roundtrip-grammar/RoundtripGrammar.engine-roundtrip-test.ts index a483612568..b8d595b485 100644 --- a/packages/legend-manual-tests/src/__tests__/roundtrip-grammar/RoundtripGrammar.engine-roundtrip-test.ts +++ b/packages/legend-manual-tests/src/__tests__/roundtrip-grammar/RoundtripGrammar.engine-roundtrip-test.ts @@ -324,7 +324,7 @@ describe('Grammar roundtrip test', () => { describe('Grammar roundtrip test (without extensions)', () => { test.each(cases)('%s', async (testName, filePath, isSkipped) => { - // Mapping include dataspace does not play nicely without extensions as the dependent XStore Associations will fail + // Mapping include data product does not play nicely without extensions as the dependent XStore Associations will fail if (!isSkipped) { await checkGrammarRoundtrip(testName, filePath, { debug: false, diff --git a/packages/legend-query-builder/src/graph-manager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts b/packages/legend-query-builder/src/graph-manager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts index cb8c8ed409..5bb59a138f 100644 --- a/packages/legend-query-builder/src/graph-manager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts +++ b/packages/legend-query-builder/src/graph-manager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts @@ -96,7 +96,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure if (mapping) { mapping.includes = element.includedMappings .map((mappingInclude) => { - // TODO : handle for mapping include dataspace + // TODO : handle for mapping include data product if (mappingInclude instanceof V1_MappingIncludeMapping) { return new MappingIncludeMapping( mapping, @@ -202,7 +202,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure if (mapping) { mapping.includes = element.includedMappings .map((mappingInclude) => { - // TODO : handle for mapping include dataspace + // TODO : handle for mapping include data product if (mappingInclude instanceof V1_MappingIncludeMapping) { return new MappingIncludeMapping( mapping,