Merge pull request #535 from Digital-Engineering/development

1.5.0

.docker-env

@@ -66,6 +66,18 @@ SAML_ADFS_CALLBACK=
 SAML_ADFS_PRIVATE_CERT_PATH=
 # x509 certificate extracted from ADFS metadata file
 SAML_ADFS_PUBLIC_CERT_PATH=
+# Algorithm used for signing requests (default is sha256)
+SAML_ADFS_SIGNATURE_ALGORITHM=
+
+# SAML audience to validate with IDP (defaults to false, no validation)
+SAML_ADFS_AUDIENCE=
+
+# Additional SAML flags (default is true)
+SAML_ADFS_DISABLE_REQUESTED_AUTHN_CONTEXT=
+
+# Additional SAML flags (default is false)
+SAML_ADFS_WANT_AUTHN_RESPONSE_SIGNED=
+SAML_ADFS_WANT_ASSERTIONS_SIGNED=
 
 SAML_ADFS_CLAIMS_EMAIL=
 SAML_ADFS_CLAIMS_NAME=

.env-sample

@@ -138,6 +138,18 @@ SAML_ADFS_CALLBACK=
 SAML_ADFS_PRIVATE_CERT_PATH=
 # x509 certificate extracted from ADFS metadata file
 SAML_ADFS_PUBLIC_CERT_PATH=
+# Algorithm used for signing requests (default is sha256)
+SAML_ADFS_SIGNATURE_ALGORITHM=
+
+# SAML audience to validate with IDP (defaults to 'false' which causes no validation)
+SAML_ADFS_AUDIENCE=
+
+# Additional SAML flags (default is true)
+SAML_ADFS_DISABLE_REQUESTED_AUTHN_CONTEXT=
+
+# Additional SAML flags (default is false)
+SAML_ADFS_WANT_AUTHN_RESPONSE_SIGNED=
+SAML_ADFS_WANT_ASSERTIONS_SIGNED=
 
 SAML_ADFS_CLAIMS_EMAIL=
 SAML_ADFS_CLAIMS_NAME=

.github/workflows/build-deploy-acc.yml

@@ -167,8 +167,6 @@ jobs:
           CI_COMMIT_SHA: $GITHUB_SHA
           NODE_EXTRA_CA_CERTS: ${{ secrets.NODE_EXTRA_CA_CERTS }}
           RUN_JOBS: ${{ secrets.RUN_JOBS }}
-          JAZZ_HOST: ${{ secrets.JAZZ_HOST }}
-          JAZZ_IP: ${{ secrets.JAZZ_IP }}
           ELM_HOST: ${{ secrets.ELM_HOST }}
           ELM_IP: ${{ secrets.ELM_IP }}
           NETWORKING_HOST: ${{ secrets.NETWORKING_HOST }}

.github/workflows/build-deploy-dev.yml

@@ -165,8 +165,6 @@ jobs:
           CI_COMMIT_SHA: $GITHUB_SHA
           NODE_EXTRA_CA_CERTS: ${{ secrets.NODE_EXTRA_CA_CERTS }}
           RUN_JOBS: ${{ secrets.RUN_JOBS }}
-          JAZZ_HOST: ${{ secrets.JAZZ_HOST }}
-          JAZZ_IP: ${{ secrets.JAZZ_IP }}
           ELM_HOST: ${{ secrets.ELM_HOST }}
           ELM_IP: ${{ secrets.ELM_IP }}
           NETWORKING_HOST: ${{ secrets.NETWORKING_HOST }}

.github/workflows/deploy-production.yml

@@ -62,8 +62,6 @@ jobs:
           CI_COMMIT_SHA: $GITHUB_SHA
           NODE_EXTRA_CA_CERTS: ${{ secrets.NODE_EXTRA_CA_CERTS }}
           RUN_JOBS: ${{ secrets.RUN_JOBS }}
-          JAZZ_HOST: ${{ secrets.JAZZ_HOST }}
-          JAZZ_IP: ${{ secrets.JAZZ_IP }}
           ELM_HOST: ${{ secrets.ELM_HOST }}
           ELM_IP: ${{ secrets.ELM_IP }}
           NETWORKING_HOST: ${{ secrets.NETWORKING_HOST }}

.gitignore

@@ -29,3 +29,23 @@ profile-logs
 /AdminWebApp/src/**/*.js
 /AdminWebApp/src/**/*.js.map
 /NodeLibraries/dl-fast-load/build-output.txt
+/NodeLibraries/deeplynx-timeseries/
+/NodeLibraries/redis-graph-loader/
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

API Documentation/Core.swagger_collection.yaml

@@ -2361,7 +2361,7 @@ paths:
       tags:
         - Data Sources
       summary: Create Data Source
-      description: 'Create new datasource. Supported data source types are `http`, `standard` (or `manual`), `jazz`, `p6`, `aveva`, and `timeseries`.'
+      description: 'Create new datasource. Supported data source types are `http`, `standard` (or `manual`), `p6`, `aveva`, and `timeseries`.'
       operationId: CreateDataSource
       parameters:
         - name: container_id

AdminWebApp/src/api/client.ts

@@ -359,8 +359,8 @@ export class Client {
         return this.get<MetatypeRelationshipPairT[] | number>(`/containers/${containerID}/metatype_relationship_pairs`, query);
     }
 
-    createMetatype(containerID: string, name: string, description: string, ontologyVersion?: string): Promise<MetatypeT[]> {
-        return this.post<MetatypeT[]>(`/containers/${containerID}/metatypes`, {name, description, ontology_version: ontologyVersion});
+    createMetatype(containerID: string, name: string, description: string, ontologyVersion?: string, parentID?: string): Promise<MetatypeT[]> {
+        return this.post<MetatypeT[]>(`/containers/${containerID}/metatypes`, {name, description, ontology_version: ontologyVersion, parent_id: parentID});
     }
 
     retrieveMetatype(containerID: string, metatypeID: string): Promise<MetatypeT> {
@@ -1620,7 +1620,7 @@ export class Client {
         if (queryParams) {
             url = buildURL(this.config?.rootURL!, {path: uri, queryParams: queryParams!});
         } else {
-            url = buildURL(this.config?.rootURL!, {path: uri})
+            url = buildURL(this.config?.rootURL!, {path: uri});
         }
 
         const formData = new FormData();

AdminWebApp/src/api/types.ts

@@ -167,6 +167,7 @@ export type NodeT = {
     metatype?: MetatypeT;
     properties: PropertyT[] | object;
     metadata_properties?: object;
+    metadata?: MetadataT[];
     raw_properties?: string; // JSON string with the raw properties
     container_id: string;
     original_data_id?: string;
@@ -175,13 +176,29 @@ export type NodeT = {
     modified_at: string;
     incoming_edges?: EdgeT[];
     outgoing_edges?: EdgeT[];
+    import_data_id?: string;
+    type_mapping_transformation_id?: string;
+    data_staging_id?: string;
+};
+
+export type MetadataT = {
+    conversions?: ConversionT[];
+    failed_conversions?: ConversionT[];
+};
+
+export type ConversionT = {
+    original_value: any;
+    converted_value?: any;
+    errors?: string;
 };
 
 export type EdgeT = {
+    selected_edge?: boolean;
     id: string;
     container_id: string;
+    relationship_pair_id?: string;
     data_source_id: string;
-    relationship: MetatypeRelationshipT;
+    metatype_relationship: MetatypeRelationshipT;
     destination_node?: NodeT;
     origin_node?: NodeT;
     origin_id?: string;
@@ -190,8 +207,12 @@ export type EdgeT = {
     relationship_id?: string;
     properties: PropertyT[] | object;
     metadata_properties?: object;
+    metadata?: MetadataT[];
     created_at: string;
     modified_at: string;
+    data_staging_id: string;
+    import_data_id: string;
+    type_mapping_transformation_id: string;
 };
 
 export type PropertyT = {
@@ -211,7 +232,6 @@ export type DataSourceT = {
         | StandardDataSourceConfig
         | HttpDataSourceConfig
         | AvevaDataSourceConfig
-        | JazzDataSourceConfig
         | TimeseriesDataSourceConfig
         | P6DataSourceConfig
         | undefined;
@@ -279,22 +299,6 @@ export type HttpDataSourceConfig = {
     raw_retention_enabled?: boolean;
 };
 
-export type JazzDataSourceConfig = {
-    kind: 'jazz';
-    endpoint: string;
-    secure: boolean;
-    project_name: string;
-    artifact_types: string[]; // artifact types to retrieve, everything else is ignored
-    limit: number;
-    poll_interval: number; // in minutes
-    timeout: number; // milliseconds
-    token: string; // security token for http authentication
-    stop_nodes?: string[];
-    value_nodes?: string[];
-    data_retention_days?: number;
-    raw_retention_enabled?: boolean;
-};
-
 export type AvevaDataSourceConfig = {
     kind: 'aveva';
     ignore_dbs: string[];
@@ -747,24 +751,6 @@ export function DefaultAvevaDataSourceConfig(): AvevaDataSourceConfig {
     };
 }
 
-// Like the AvevaDefaultConfig we're including functions for all default configs for data source types, easier to
-// change when they're in one place.
-export function DefaultJazzDataSourceConfig(): JazzDataSourceConfig {
-    return {
-        kind: 'jazz',
-        endpoint: '',
-        secure: true,
-        project_name: '',
-        artifact_types: [],
-        poll_interval: 10,
-        token: '',
-        timeout: 30000,
-        limit: 10,
-        data_retention_days: 30,
-        raw_retention_enabled: false,
-    };
-}
-
 export function DefaultP6DataSourceConfig(): P6DataSourceConfig {
     return {
         kind: 'p6',