fix string -> genericType json tests (#3668)

finos · Nov 21, 2024 · 7d7a209 · 7d7a209
1 parent f973848
commit 7d7a209
Show file tree

Hide file tree

Showing 68 changed files with 6,288 additions and 799 deletions.
diff --git a/.changeset/long-news-bake.md b/.changeset/long-news-bake.md
@@ -0,0 +1,11 @@
+---
+'@finos/legend-extension-store-service-store': patch
+'@finos/legend-server-showcase-deployment': patch
+'@finos/legend-extension-dsl-persistence': patch
+'@finos/legend-extension-dsl-data-space': patch
+'@finos/legend-extension-dsl-diagram': patch
+'@finos/legend-application-studio': patch
+'@finos/legend-application-query': patch
+'@finos/legend-query-builder': patch
+'@finos/legend-graph': patch
+---
diff --git a/.../legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json b/.../legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json
@@ -79,7 +79,14 @@
             "upperBound": 1
           },
           "name": "lastReportedFlag",
-          "type": "Boolean"
+          "genericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "Boolean"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          }
         },
         {
           "multiplicity": {
@@ -181,7 +188,14 @@
         "lowerBound": 1,
         "upperBound": 1
       },
-      "returnType": "meta::pure::tds::TabularDataSet"
+      "returnGenericType": {
+        "rawType": {
+          "_type": "packageableType",
+          "fullPath": "meta::pure::tds::TabularDataSet"
+        },
+        "typeArguments": [],
+        "typeVariableValues": []
+      }
     },
     "classifierPath": "meta::pure::metamodel::function::ConcreteFunctionDefinition"
   },

diff --git a/...end-application-query/src/components/__tests__/TEST_DATA__QueryBuilder_ResultStateTest.ts b/...end-application-query/src/components/__tests__/TEST_DATA__QueryBuilder_ResultStateTest.ts
@@ -20,15 +20,40 @@ export const TEST_DATA__result = {
     columns: [
       {
         name: 'Employees/First Name',
-        type: 'String',
+        genericType: {
+          rawType: {
+            _type: 'packageableType',
+            fullPath: 'String',
+          },
+          typeArguments: [],
+          typeVariableValues: [],
+        },
         relationalType: 'VARCHAR(200)',
       },
       {
         name: 'Employees/Last Name',
-        type: 'String',
+        genericType: {
+          rawType: {
+            _type: 'packageableType',
+            fullPath: 'String',
+          },
+          typeArguments: [],
+          typeVariableValues: [],
+        },
+        relationalType: 'VARCHAR(200)',
+      },
+      {
+        name: 'Legal Namer',
+        genericType: {
+          rawType: {
+            _type: 'packageableType',
+            fullPath: 'String',
+          },
+          typeArguments: [],
+          typeVariableValues: [],
+        },
         relationalType: 'VARCHAR(200)',
       },
-      { name: 'Legal Namer', type: 'String', relationalType: 'VARCHAR(200)' },
     ],
   },
   activities: [
@@ -339,14 +364,28 @@ export const TEST_DATA__ResultState_entities = [
             upperBound: 1,
           },
           name: 'legalName',
-          type: 'String',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
         {
           multiplicity: {
             lowerBound: 0,
           },
           name: 'employees',
-          type: 'model::Person',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'model::Person',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
       ],
       stereotypes: [
@@ -371,15 +410,29 @@ export const TEST_DATA__ResultState_entities = [
             upperBound: 1,
           },
           name: 'firstName',
-          type: 'String',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
         {
           multiplicity: {
             lowerBound: 1,
             upperBound: 1,
           },
           name: 'lastName',
-          type: 'String',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
       ],
       stereotypes: [

diff --git a/packages/legend-application-studio/src/components/__tests__/EmbeddedQueryBuilder.test.tsx b/packages/legend-application-studio/src/components/__tests__/EmbeddedQueryBuilder.test.tsx
@@ -41,7 +41,14 @@ const entities = [
             upperBound: 1,
           },
           name: 'name',
-          type: 'String',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
       ],
     },

diff --git a/...editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json b/...editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json
@@ -229,7 +229,14 @@
         "lowerBound": 1,
         "upperBound": 1
       },
-      "returnType": "meta::pure::tds::TabularDataSet"
+      "returnGenericType": {
+        "rawType": {
+          "_type": "packageableType",
+          "fullPath": "meta::pure::tds::TabularDataSet"
+        },
+        "typeArguments": [],
+        "typeVariableValues": []
+      }
     },
     "classifierPath": "meta::pure::metamodel::function::ConcreteFunctionDefinition"
   },

diff --git a/...components/editor/editor-group/mapping-editor/__tests__/TEST_DATA__ModelToModelMapping.ts b/...components/editor/editor-group/mapping-editor/__tests__/TEST_DATA__ModelToModelMapping.ts
@@ -103,7 +103,14 @@ export const TEST_DATA__ModelToModelMapping = [
             lowerBound: 1,
           },
           name: 'employees',
-          type: 'model::Person',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'model::Person',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
         {
           multiplicity: {
@@ -214,7 +221,14 @@ export const TEST_DATA__ModelToModelMapping = [
             lowerBound: 1,
             upperBound: 1,
           },
-          returnType: 'String',
+          returnGenericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
         },
       ],
     },

diff --git a/...ditor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json b/...ditor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json
@@ -316,7 +316,14 @@
           "parameters": [
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1
@@ -325,7 +332,14 @@
             },
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1
@@ -633,7 +647,14 @@
             },
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1