Merge pull request #619 from Digital-Engineering/development

Development

.gitignore

@@ -19,6 +19,7 @@ profile-logs
 /tools/ontology_extractor/diamond.owl
 /private-key.pem
 /private-key.key
+/public-key.pem
 /src/tests/test-data.json
 /src/tests/test-data.csv
 /src/tests/private-key.pem

AdminWebApp/src/components/data/TimeseriesViewerDialog.vue

@@ -163,6 +163,16 @@
                             fixed-header
                             dense
                         >
+                            <template v-slot:top v-if="(['line', 'markers', 'line and markers', 'bar'].includes(chartType))">
+                                <v-toolbar flat color="white">
+                                    <v-spacer></v-spacer>
+                                    <v-btn color="primary" @click="toggleSelectY">
+                                        <span v-if="ySelected === true">{{$t("timeseries.deselectAllYvals")}}</span>
+                                        <span v-if="ySelected === false">{{$t("timeseries.selectAllYvals")}}</span>
+                                    </v-btn>   
+                                </v-toolbar>
+                            </template>
+
                             <template v-slot:item.x="{item}">
                                 <v-simple-checkbox v-if="chartType === 'scatter 3D'" v-model="item.x" />
                                 <v-radio-group v-else v-model="selectedXColumn" @change="columnXChange(item.uniqueName)">
@@ -301,6 +311,7 @@
     indexesLoading: boolean
     chartLoading: boolean
     pageLoaded: boolean
+    ySelected: boolean
   }
 
   export default Vue.extend ({
@@ -360,7 +371,8 @@
       dataSourceLoading: false,
       indexesLoading: false,
       chartLoading: false,
-      pageLoaded: false
+      pageLoaded: false,
+      ySelected: true
     }),
 
     watch: {
@@ -495,6 +507,16 @@
               }
           }
       },
+      toggleSelectY() {
+        this.ySelected = !this.ySelected
+        this.selectedColumns.forEach(col => {
+            if(!col.x) {
+                col.y = this.ySelected
+            } else {
+                col.y = false
+            }
+        });
+      },
       load() {
         this.dataSourceLoading = true;
           this.$client
@@ -805,6 +827,7 @@
                   }
               }
           }
+          this.ySelected = true;
           this.columnsLoading = false;
       },
       async determineDataSourceShape() {

AdminWebApp/src/components/ontology/metatypes/EditMetatypeDialog.vue

@@ -197,6 +197,15 @@
                 sort-by="name"
                 style="margin-top: 30px"
             >
+              <template v-slot:[`item.copy`]="{ item }">
+                <v-tooltip top>
+                  <template v-slot:activator="{on, attrs}">
+                    <v-icon v-bind="attrs" v-on="on" @click="copyID(item.id)">{{copy}}</v-icon>
+                  </template>
+                  <span>{{$t('general.copyID')}}</span>
+                  <span>{{item.id}}</span>
+                </v-tooltip>
+              </template>
 
               <template v-slot:top>
                 <v-toolbar flat color="white">
@@ -277,6 +286,8 @@
 
 <script lang="ts">
   import Vue, { PropType } from 'vue'
+  import {mdiFileDocumentMultiple} from "@mdi/js";
+
 
   import {MetatypeKeyT, MetatypeRelationshipPairT, MetatypeT} from "../../../api/types";
   import EditMetatypeKeyDialog from "@/components/ontology/metatypes/EditMetatypeKeyDialog.vue";
@@ -295,6 +306,7 @@
     dialog: boolean
     selectedMetatype: MetatypeT | null
     valid: boolean
+    copy: string
   }
 
   export default Vue.extend ({
@@ -326,7 +338,8 @@
       keysLoading: false,
       dialog: false,
       selectedMetatype: null,
-      valid: false
+      valid: false,
+      copy: mdiFileDocumentMultiple
     }),
 
     watch: {
@@ -361,8 +374,14 @@
         ]
       },
 
+      copyID(id: string) {
+      navigator.clipboard.writeText(id);
+    },
+
       relationshipHeaders(): { text: string; value: string; sortable: boolean }[] {
         return  [
+          { text: '', value: 'copy', sortable: false },
+          { text: this.$t('general.id'), value: 'id', sortable: false },
           { text: this.$t('general.name'), value: 'name', sortable: false },
           { text: this.$t('edges.origin'), value: 'origin_metatype_name', sortable: true},
           { text: this.$t('general.type'), value: 'relationship_name', sortable: true},

AdminWebApp/src/components/ontology/metatypes/MetatypeParentSelect.vue

@@ -68,7 +68,7 @@
         this.metatypesLoading = true
         this.$client.listMetatypes(this.containerID, {
           name: (this.metatypeSearch !== "") ? this.metatypeSearch : undefined,
-          loadKeys: true,
+          loadKeys: false,
           ontologyVersion: this.$store.getters.activeOntologyVersionID
         })
             .then((metatypes) => {

AdminWebApp/src/translations.ts

@@ -690,6 +690,8 @@ export default {
             chunkInterval: 'Chunk Interval',
             indexType: 'Index Type',
             showTimestampColumns: 'Show Timestamp Columns',
+            deselectAllYvals: 'Deselect All Y Columns',
+            selectAllYvals: 'Select All Y Columns',
         },
         typeMappings: {
             mappingsMaybePlural: 'Mapping(s)',

AdminWebApp/src/views/ViewMetatypeRelationships.vue

@@ -260,7 +260,7 @@
                 this.$client.listMetatypeRelationships(this.containerID, {
                   ontologyVersion: this.$store.getters.currentOntologyVersionID,
                   nameIn,
-                  loadKeys: true
+                  loadKeys: false
                 })
                 .then((comparison) => {
                   this.loading = false

AdminWebApp/src/views/ViewMetatypes.vue

@@ -253,7 +253,7 @@
           sortDesc: sortDescParam,
           name: (this.name !== "") ? this.name : undefined,
           description: (this.description !== "") ? this.description : undefined,
-          loadKeys: true,
+          loadKeys: false,
           deleted: this.$store.getters.isEditMode
         })
             .then((results) => {
@@ -271,7 +271,7 @@
                 this.$client.listMetatypes(this.containerID, {
                   ontologyVersion: this.$store.getters.currentOntologyVersionID,
                   nameIn,
-                  loadKeys: true,
+                  loadKeys: false,
                 })
                 .then((comparison) => {
                   this.metatypesLoading = false

NodeLibraries/deeplynx/Cargo.toml

@@ -33,6 +33,8 @@ csv = "1.2.1"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 proc-macro2 = "1.0.60"
+sha2 = "0.9"
+base64 = "0.13"
 
 [build-dependencies]
 napi-build = "2.0.1"

NodeLibraries/deeplynx/index.d.ts

@@ -11,6 +11,11 @@ export interface LegacyTimeseriesColumn {
   date_conversion_format_string?: string
 }
 export function inferLegacySchema(csv: Buffer): Array<LegacyTimeseriesColumn>
+export interface Options {
+  stopNodes?: Array<string>
+  valueNodes?: Array<string>
+}
+export function hash(a: string, options: Options): string
 export interface Configuration {
   dbConnectionString?: string
   redisConnectionString?: string

NodeLibraries/deeplynx/index.js

@@ -252,8 +252,9 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { BucketRepository, inferLegacySchema, RedisGraphLoader } = nativeBinding
+const { BucketRepository, inferLegacySchema, RedisGraphLoader, hash } = nativeBinding
 
 module.exports.BucketRepository = BucketRepository
 module.exports.inferLegacySchema = inferLegacySchema
 module.exports.RedisGraphLoader = RedisGraphLoader
+module.exports.hash = hash

NodeLibraries/deeplynx/src/errors.rs

@@ -13,7 +13,7 @@ pub enum DeepLynxError {
     IO(#[from] io::Error),
     #[error("serde json error {0}")]
     Json(#[from] serde_json::Error),
-    #[error("serde yame error {0}")]
+    #[error("serde yaml error {0}")]
     Yaml(#[from] serde_yaml::Error),
     #[error("redis loader error {0}")]
     RedisLoader(#[from] RedisLoaderError),

NodeLibraries/deeplynx/src/lib.rs

@@ -11,6 +11,7 @@ extern crate napi_derive;
 /// so that we can share the underlying connections and memory spaces.
 pub mod timeseries;
 pub mod redis_graph;
+pub mod shape_hasher;
 pub mod errors;
 mod config;