Merge pull request #584 from Digital-Engineering/development

Development

Author: John Darrington

.env-sample

@@ -48,6 +48,10 @@ TIMESCALEDB_ENABLED=false
 # this must be an absolute path to a RSA private key - if one is not provided it will be generated and saved for you at
 # the project root
 ENCRYPTION_KEY_PATH=
+# this must be an absolute path to a RSA public key - if one is not provided it will be generated and saved for you at
+# the project root in most cases. If you have an already existing private key, generate a public key from it
+ENCRYPTION_PUBLIC_KEY_PATH=
+
 # plaintext secret used to generate secure session markers
 SESSION_SECRET=
 

.gitignore

@@ -22,6 +22,8 @@ profile-logs
 /src/tests/test-data.json
 /src/tests/test-data.csv
 /src/tests/private-key.pem
+/src/tests/*_export.json
+/**/test-timeseries-datasource-graphql.json
 /NodeLibraries/dl-fast-load/target/
 /NodeLibraries/dl-fast-load/index.node
 /RedisLoader/target/
@@ -48,4 +50,6 @@ devenv.local.nix
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
-!.yarn/versions
+!.yarn/versions
+/public-key.pem
+/yarn-error.log

AdminWebApp/package-lock.json

@@ -39,6 +39,7 @@
     "is-svg": "^4.3.1",
     "json-2-csv": "^4.0.0",
     "jwt-decode": "^2.2.0",
+    "lodash.debounce": "^4.0.8",
     "node-forge": "^1.0.0",
     "p-wait-for": "^5.0.0",
     "plotly.js-dist-min": "^2.12.0",
@@ -74,13 +75,14 @@
     "@mdi/font": "^7.2.96",
     "@types/codemirror": "^5.60.6",
     "@types/json2csv": "^5.0.3",
+    "@types/lodash.debounce": "^4.0.8",
     "@types/plotly.js-dist-min": "^2.3.1",
     "@types/three": "^0.150.1",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "babel-loader": "^8.2.5",
     "material-design-icons-iconfont": "^6.7.0",
-    "typescript": "~4.5.5",
+    "typescript": "~4.7.2",
     "vue-template-babel-compiler": "^1.2.0",
     "webpack": "^5.0.0"
   }

AdminWebApp/package.json

@@ -302,7 +302,6 @@ export class Client {
         containerID: string,
         {
             name,
-            description,
             ontologyVersion,
             metatypeID,
             originID,
@@ -319,7 +318,6 @@ export class Client {
             destinationName,
         }: {
             name?: string;
-            description?: string;
             ontologyVersion?: string;
             metatypeID?: string;
             originID?: string;
@@ -339,7 +337,6 @@ export class Client {
         const query: {[key: string]: any} = {};
 
         if (name) query.name = name;
-        if (description) query.description = description;
         if (ontologyVersion) query.ontologyVersion = ontologyVersion;
         query.ontologyVersion = ontologyVersion;
         if (originID) query.originID = originID;
@@ -532,7 +529,7 @@ export class Client {
         const query: {[key: string]: any} = {};
 
         if (name) query.name = name;
-        if (description) query.description = name;
+        if (description) query.description = description;
         if (ontologyVersion) query.ontologyVersion = ontologyVersion;
         if (limit) query.limit = limit;
         if (offset) query.offset = offset;
@@ -558,6 +555,13 @@ export class Client {
         return this.get<MetatypeRelationshipPairT>(`/containers/${containerID}/metatype_relationship_pairs/${metatypeRelationshipPairID}`);
     }
 
+    listMetatypeRelationshipPairsForMetatype(containerID: string, metatypeID: string, deleted = false): Promise<MetatypeRelationshipPairT[]> {
+        const query: {[key: string]: any} = {};
+        query.deleted = deleted;
+
+        return this.get<MetatypeRelationshipPairT[]>(`/containers/${containerID}/metatypes/${metatypeID}/metatype_relationship_pairs`, query);
+    }
+
     updateMetatypeRelationship(containerID: string, metatypeRelationshipID: string, metatypeRelationship: any): Promise<boolean> {
         return this.put<boolean>(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}`, metatypeRelationship);
     }
@@ -988,9 +992,10 @@ export class Client {
         return this.delete(`/containers/${containerID}/import/imports/${importID}/data/${dataID}`);
     }
 
-    inviteUserToContainer(containerID: string, email: string): Promise<boolean> {
+    inviteUserToContainer(containerID: string, email: string, role_name: string): Promise<boolean> {
         return this.postNoData(`/containers/${containerID}/users/invite`, {
             email,
+            role_name,
         });
     }
 

AdminWebApp/src/api/client.ts

@@ -6,7 +6,7 @@ export type ContainerT = {
         data_versioning_enabled: boolean;
         ontology_versioning_enabled: boolean;
         enabled_data_sources: string[];
-        configured_data_sources?: {[key: string]: any}[];
+        p6_preset_configs?: P6DataSourceConfig[];
     };
     created_at: string;
     modified_at: string;
@@ -35,9 +35,11 @@ export type MetatypeT = {
     modified_by?: string;
     deleted_at?: string;
     parent_id?: string;
+    parent_name?: string;
     ontology_version?: string;
     old_id?: string;
     uuid?: string;
+    relationships?: MetatypeRelationshipPairT[];
 };
 
 export type MetatypeRelationshipT = {
@@ -76,11 +78,14 @@ export type MetatypeRelationshipPairT = {
     origin_metatype?: MetatypeT;
     destination_metatype?: MetatypeT;
     relationship?: MetatypeRelationshipT;
+    metatype_id?: string;
+    metatype_name?: string;
 };
 
 export type MetatypeKeyT = {
     id?: string;
     metatype_id?: string;
+    metatype_name?: string;
     container_id: string;
     name: string;
     property_name: string;
@@ -89,12 +94,12 @@ export type MetatypeKeyT = {
     data_type: 'number' | 'number64' | 'float' | 'float64' | 'date' | 'string' | 'boolean' | 'enumeration' | 'file';
     archived: boolean;
     validation:
-        | {
-              regex: string;
-              min: number;
-              max: number;
-          }
-        | undefined;
+    | {
+        regex: string;
+        min: number;
+        max: number;
+    }
+    | undefined;
     options: string[] | undefined;
     default_value: string | boolean | number | any[] | undefined;
     created_at?: string;
@@ -103,6 +108,7 @@ export type MetatypeKeyT = {
     modified_by?: string;
     deleted_at?: string;
     ontology_version?: string;
+    uuid?: string;
 };
 
 export type MetatypeRelationshipKeyT = {
@@ -127,6 +133,7 @@ export type MetatypeRelationshipKeyT = {
     created_by?: string;
     modified_by?: string;
     ontology_version?: string;
+    uuid?: string;
 };
 
 export type KeyPairT = {
@@ -179,6 +186,7 @@ export type NodeT = {
     import_data_id?: string;
     type_mapping_transformation_id?: string;
     data_staging_id?: string;
+    created_by?: string;
 };
 
 export type MetadataT = {
@@ -213,6 +221,7 @@ export type EdgeT = {
     data_staging_id: string;
     import_data_id: string;
     type_mapping_transformation_id: string;
+    created_by?: string;
 };
 
 export type PropertyT = {
@@ -228,13 +237,7 @@ export type DataSourceT = {
     adapter_type: string | undefined;
     active: boolean;
     archived?: boolean;
-    config:
-        | StandardDataSourceConfig
-        | HttpDataSourceConfig
-        | AvevaDataSourceConfig
-        | TimeseriesDataSourceConfig
-        | P6DataSourceConfig
-        | undefined;
+    config: StandardDataSourceConfig | HttpDataSourceConfig | AvevaDataSourceConfig | TimeseriesDataSourceConfig | P6DataSourceConfig | undefined;
     created_at?: string;
     modified_at?: string;
     created_by?: string;
@@ -328,10 +331,12 @@ export type AvevaDataSourceConfig = {
 
 export type P6DataSourceConfig = {
     kind: 'p6';
+    id?: string;
+    name?: string;
     endpoint: string;
     projectID: string;
-    username: string;
-    password: string;
+    username?: string;
+    password?: string;
     stop_nodes?: string[];
     value_nodes?: string[];
     data_retention_days?: number;
@@ -479,6 +484,7 @@ export type TypeMappingTransformationT = {
     };
     metatype_id?: string;
     metatype_relationship_pair_id?: string;
+    selected_relationship_pair_name?: string;
     origin_id_key?: string;
     origin_metatype_id?: string;
     origin_data_source_id?: string;
@@ -497,12 +503,14 @@ export type TypeMappingTransformationT = {
     destination_parameters?: EdgeConfigKeyT[];
     created_at_key?: string;
     created_at_format_string?: string;
+    tags?: TypeMappingTransformationTagT[];
 };
 
 export type TypeMappingTransformationPayloadT = {
     conditions?: TypeMappingTransformationCondition[];
     metatype_id?: string;
     metatype_relationship_pair_id?: string;
+    selected_relationship_pair_name?: string;
     origin_id_key?: string;
     origin_metatype_id?: string;
     origin_data_source_id?: string;
@@ -648,6 +656,11 @@ export type TagT = {
     metadata?: object;
 };
 
+export type TypeMappingTransformationTagT = {
+    id: string;
+    tag_name: string;
+};
+
 export type TimeseriesRange = {
     start: string;
     end: string;

AdminWebApp/src/api/types.ts

@@ -122,11 +122,11 @@ export async function LoginFromToken(token: string, state: string): Promise<bool
         return new Promise((resolve) => resolve(false));
     }
 
-    const decodedToken = jwt_decode(resp.data.value);
+    const decodedToken = jwt_decode(resp.data.access_token);
 
     // store as `user`
     localStorage.setItem('user', JSON.stringify(decodedToken));
-    localStorage.setItem('user.token', resp.data.value);
+    localStorage.setItem('user.token', resp.data.access_token);
     return new Promise((resolve) => resolve(true));
 }