From bbce4541709adf69b78bd7561ba8cfac0207bb0e Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Tue, 1 Feb 2022 11:49:01 -0700
Subject: [PATCH 01/31] create framework for edit feature

---
 .env-sample                                   |   3 +
 AdminWebApp/{.env-sample => .env-sample copy} |   0
 AdminWebApp/src/components/editNodeDialog.vue | 182 ++++++++++++++++
 .../src/components/editNodePropertyDialog.vue | 199 ++++++++++++++++++
 AdminWebApp/src/views/DataTestCreation.vue    |   9 +-
 5 files changed, 390 insertions(+), 3 deletions(-)
 rename AdminWebApp/{.env-sample => .env-sample copy} (100%)
 create mode 100644 AdminWebApp/src/components/editNodeDialog.vue
 create mode 100644 AdminWebApp/src/components/editNodePropertyDialog.vue

diff --git a/.env-sample b/.env-sample
index ec8ecbb3c..78739443d 100644
--- a/.env-sample
+++ b/.env-sample
@@ -122,3 +122,6 @@ RSA_CLIENT_ID=
 
 # Email for the authorized HPC user to access tasks
 HPC_EMAIL=
+
+# Jazz DNG adapter settings
+DNG_HOST=
diff --git a/AdminWebApp/.env-sample b/AdminWebApp/.env-sample copy
similarity index 100%
rename from AdminWebApp/.env-sample
rename to AdminWebApp/.env-sample copy
diff --git a/AdminWebApp/src/components/editNodeDialog.vue b/AdminWebApp/src/components/editNodeDialog.vue
new file mode 100644
index 000000000..4650a1460
--- /dev/null
+++ b/AdminWebApp/src/components/editNodeDialog.vue
@@ -0,0 +1,182 @@
+<template>
+  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+    <template v-slot:activator="{ on }">
+      <v-icon
+          v-if="icon"
+          small
+          class="mr-2"
+          v-on="on"
+      >mdi-pencil</v-icon>
+      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editMetatype.editMetatype")}}</v-btn>
+    </template>
+
+    <v-card v-if="selectedNode">
+      <v-card-text>
+        <v-container>
+          <error-banner :message="errorMessage"></error-banner>
+          <span class="headline">{{$t('editMetatype.edit')}} {{selectedNode.metatype.name}}</span>
+          <v-row>
+            <v-col :cols="12">
+
+              <v-form
+                  ref="form"
+                  v-model="valid"
+              >
+                <v-text-field
+                    v-model="selectedNode.metatype.name"
+                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+                <v-textarea
+                    v-model="selectedNode.metatype.description"
+                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
+                </v-textarea>
+              </v-form>
+              <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
+            </v-col>
+
+            <v-col :cols="12" v-if="keysLoading">
+              <v-progress-linear indeterminate></v-progress-linear>
+            </v-col>
+            <v-col :cols="12">
+              <v-data-table
+                  :headers="headers()"
+                  :items="selectedNode.properties"
+                  :items-per-page="100"
+                  :footer-props="{
+                     'items-per-page-options': [25, 50, 100]
+                  }"
+                  class="elevation-1"
+              >
+
+                <template v-slot:top>
+                  <v-toolbar flat color="white">
+                    <v-toolbar-title>{{$t("editMetatype.keys")}}</v-toolbar-title>
+                    <v-divider
+                        class="mx-4"
+                        inset
+                        vertical
+                    ></v-divider>
+                    <v-spacer></v-spacer>
+                    <!-- <create-metatype-key-dialog :metatype="metatype" @metatypeKeyCreated="loadKeys()"></create-metatype-key-dialog> -->
+                  </v-toolbar>
+                </template>
+                <template v-slot:[`item.actions`]="{ item }">
+                 <edit-node-property-dialog :propertyKey="item" :node="node" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-node-property-dialog>
+                  <v-icon
+                      small
+                      @click="deleteKey(item)"
+                  >
+                    mdi-delete
+                  </v-icon>
+                </template>
+              </v-data-table>
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editMetatype.cancel")}}</v-btn>
+        <v-btn color="blue darken-1" :disabled="!valid" text @click="editMetatype()">{{$t("editMetatype.save")}}</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
+import {MetatypeKeyT, NodeT} from "../api/types";
+import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
+import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
+
+@Component({components: {
+    EditMetatypeKeyDialog,
+    CreateMetatypeKeyDialog
+  }})
+export default class EditMetatypeDialog extends Vue {
+  @Prop({required: true})
+  node!: NodeT;
+
+  @Prop({required: false})
+  readonly icon!: boolean
+
+  errorMessage = ""
+  keysLoading = false
+  dialog = false
+  selectedNode: NodeT | null  = null
+  valid = false
+
+  // this way we only load the keys when the edit dialog is open, so we don't
+  // overload someone using this in a list
+  @Watch('dialog', {immediate: true})
+  isDialogOpen() {
+    if(this.dialog) {
+      this.loadKeys()
+    }
+  }
+
+  headers() {
+    return  [
+      { text: this.$t('editMetatype.keyName'), value: 'name' },
+      { text: this.$t('editMetatype.keyDescription'), value: 'description'},
+      { text: this.$t('editMetatype.keyType'), value: 'data_type'},
+      { text: this.$t('editMetatype.actions'), value: 'actions', sortable: false }
+    ]
+  }
+
+  mounted() {
+    // have to do this to avoid mutating properties
+    this.selectedNode = JSON.parse(JSON.stringify(this.node))
+  }
+
+  editMetatype() {
+    this.$client.updateMetatype(this.selectedNode?.container_id!, this.selectedNode?.id!,
+        {"name": this.selectedNode?.metatype.name, "description": this.selectedNode?.metatype.description})
+        .then(result => {
+          if(!result) {
+            this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+          } else {
+            this.dialog = false
+            this.$emit('metatypeEdited')
+          }
+        })
+        .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  }
+
+  loadKeys() {
+    if(this.selectedNode) {
+      this.keysLoading = true
+      this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
+          .then(keys => {
+            if(this.selectedNode) {
+              this.selectedNode.properties = keys
+              this.keysLoading = false
+              this.$forceUpdate()
+            }
+          })
+          .catch(e => {
+            this.errorMessage = e
+            this.keysLoading = false
+          })
+    }
+  }
+
+  deleteKey(key: MetatypeKeyT) {
+    this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
+    .then(result => {
+      if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+
+      this.loadKeys()
+    })
+    .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  }
+}
+
+</script>
diff --git a/AdminWebApp/src/components/editNodePropertyDialog.vue b/AdminWebApp/src/components/editNodePropertyDialog.vue
new file mode 100644
index 000000000..cf619260d
--- /dev/null
+++ b/AdminWebApp/src/components/editNodePropertyDialog.vue
@@ -0,0 +1,199 @@
+<template>
+  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+    <template v-slot:activator="{ on }">
+      <v-icon
+          v-if="icon"
+          small
+          class="mr-2"
+          v-on="on"
+      >mdi-pencil</v-icon>
+      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editPropertyKey.editPropertyKey")}}</v-btn>
+    </template>
+
+    <v-card v-if="selectedPropertyKey">
+      <v-card-text>
+        <v-container>
+          <error-banner :message="errorMessage"></error-banner>
+          <span class="headline">{{$t('editPropertyKey.edit')}} {{selectedPropertyKey.name}}</span>
+          <v-row>
+            <v-col :cols="12">
+
+              <v-form
+                  ref="form"
+                  v-model="formValid"
+              >
+                <v-text-field
+                    v-model="selectedPropertyKey.name"
+                    :rules="[v => !!v || $t('editPropertyKey.nameRequired')]"
+                >
+                  <template v-slot:label>{{$t('editPropertyKey.name')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+
+                <v-text-field
+                    v-model="selectedPropertyKey.property_name"
+                    :rules="[v => !!v || $t('editPropertyKey.propertyNameRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editPropertyKey.propertyName')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+                <v-select
+                    v-model="selectedPropertyKey.data_type"
+                    :items="dataTypes"
+                    @change="selectedPropertyKey.default_value = undefined"
+                    :rules="[v => !!v || $t('editPropertyKey.dataTypeRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editPropertyKey.dataType')}} <small style="color:red" >*</small></template>
+                </v-select>
+                <v-checkbox
+                    v-model="selectedPropertyKey.required"
+                >
+                  <template v-slot:label>{{$t('editPropertyKey.required')}} <small style="color:#ff0000" >*</small></template>
+                </v-checkbox>
+                <v-textarea
+                    v-model="selectedPropertyKey.description"
+                    :rows="2"
+                    :rules="[v => !!v || $t('editPropertyKey.descriptionRequired')]"
+                >
+                  <template v-slot:label>{{$t('editPropertyKey.description')}} <small style="color:#ff0000" >*</small></template>
+                </v-textarea>
+
+                <h3>{{$t('editPropertyKey.validation')}}</h3>
+                <v-text-field
+                    v-model="selectedPropertyKey.validation.regex"
+                    :label="$t('editPropertyKey.regex')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.regexHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="selectedPropertyKey.validation.max"
+                    :disabled="selectedPropertyKey.validation.regex === ''"
+                    type="number"
+                    :label="$t('editPropertyKey.max')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.maxHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="selectedPropertyKey.validation.min"
+                    :disabled="selectedPropertyKey.validation.regex === ''"
+                    type="number"
+                    :label="$t('editPropertyKey.min')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.minHelp')"></info-tooltip></template>
+                </v-text-field>
+
+
+
+                <!-- default value and options should be comboboxes when set to enumeration -->
+                <div v-if="selectedPropertyKey.data_type === 'enumeration'" >
+                  <v-combobox
+                      v-model="selectedPropertyKey.default_value"
+                      multiple
+                      chips
+                      clearable
+                      deletable-chips
+                  ></v-combobox>
+                </div>
+
+                <div v-if="selectedPropertyKey.data_type !== 'enumeration'" >
+                  <v-text-field
+                      v-if="selectedPropertyKey.data_type === 'number'"
+                      v-model="selectedPropertyKey.default_value"
+                      type="number"
+                      :label="$t('editPropertyKey.defaultValue')"
+                  ></v-text-field>
+                  <v-select
+                      v-else-if="selectedPropertyKey.data_type === 'boolean'"
+                      v-model="selectedPropertyKey.default_value"
+                      :label="$t('editPropertyKey.defaultValue')"
+                      :items="booleanOptions"
+                      required
+                  >
+                  </v-select>
+                  <v-text-field
+                      v-else
+                      v-model="selectedPropertyKey.default_value"
+                      :label="$t('editPropertyKey.defaultValue')"
+                  ></v-text-field>
+                </div>
+
+                <v-combobox
+                    v-model="selectedPropertyKey.options"
+                    :label="$t('editPropertyKey.options')"
+                    multiple
+                    clearable
+                    chips
+                    deletable-chips
+                ></v-combobox>
+              </v-form>
+              <p><span style="color:red">*</span> = {{$t('editPropertyKey.requiredField')}}</p>
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editPropertyKey.cancel")}}</v-btn>
+        <v-btn color="blue darken-1" :disabled="!formValid" text @click="editPropertyKey()">{{$t("editPropertyKey.save")}}</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
+import {PropertyT, MetatypeT} from "../api/types";
+
+@Component
+export default class EditPropertyKeyDialog extends Vue {
+  @Prop({required: true})
+  node!: MetatypeT;
+
+  @Prop({required: true})
+  metatypeKey!: PropertyT;
+
+  @Prop({required: false})
+  readonly icon!: boolean
+
+  errorMessage = ""
+  dialog = false
+  formValid = false
+  selectedPropertyKey: PropertyT | null  = null
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
+  booleanOptions = [true, false]
+
+  @Watch('dialog', {immediate: true})
+  onDialogChange() {
+    if(this.dialog) this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
+
+    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
+    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
+    // }
+  }
+
+  mounted() {
+    // have to do this to avoid mutating properties
+    this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
+
+    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
+    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
+    // }
+  }
+
+  editPropertyKey() {
+    if(this.selectedPropertyKey) {
+      this.$client.updatePropertyKey(this.node.container_id,this.node.id, this.selectedPropertyKey?.id!, this.selectedPropertyKey)
+          .then(result => {
+            if(!result) {
+              this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string
+            } else {
+              this.dialog = false
+              this.$emit('metatypeKeyEdited')
+            }
+          })
+          .catch(e => this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string + e)
+    }
+  }
+}
+</script>
diff --git a/AdminWebApp/src/views/DataTestCreation.vue b/AdminWebApp/src/views/DataTestCreation.vue
index ab914f48f..113372283 100644
--- a/AdminWebApp/src/views/DataTestCreation.vue
+++ b/AdminWebApp/src/views/DataTestCreation.vue
@@ -28,7 +28,7 @@
                 :dataSourceID="selectedDataSource.id" 
                 :containerID="containerID" 
                 :disabled="!selectedDataSource.active || selectedDataSource.archived"
-                @nodeCreated="listNodes"
+                @nodeCreated="listNodes() && listEdges()"
                 >
             </create-node-dialog>
           </v-col>
@@ -38,6 +38,7 @@
           </v-col>
         </template>
         <template v-slot:[`item.actions`]="{ item }">
+          <edit-node-dialog :node="item" :icon="true" @nodeEdited="listNodes() && listEdges()"></edit-node-dialog>
           <v-icon
               small
               @click="deleteNode(item)"
@@ -67,7 +68,7 @@
                 :dataSourceID="selectedDataSource.id" 
                 :containerID="containerID" 
                 :disabled="!selectedDataSource.active || selectedDataSource.archived"
-                @edgeCreated="listEdges"
+                @edgeCreated="listEdges()"
                 >
             </create-edge-dialog>
           </v-col>
@@ -95,6 +96,7 @@ import {DataSourceT, NodeT, EdgeT} from "@/api/types";
 import SelectDataSource from "@/components/selectDataSource.vue";
 import CreateNodeDialog from "@/components/createNodeDialog.vue";
 import CreateEdgeDialog from "@/components/createEdgeDialog.vue";
+import EditNodeDialog from "@/components/editNodeDialog.vue";
 
 
 @Component({filters: {
@@ -105,7 +107,8 @@ import CreateEdgeDialog from "@/components/createEdgeDialog.vue";
   components: {
     SelectDataSource,
     CreateNodeDialog,
-    CreateEdgeDialog
+    CreateEdgeDialog,
+    EditNodeDialog
   }
 })
 export default class DataTestCreation extends Vue {

From 304405b700014238272c725308ee8c0fdbac50d9 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Tue, 1 Feb 2022 14:09:06 -0700
Subject: [PATCH 02/31] getting started on nth node integration

---
 .../data_warehouse/data/node_mapper.ts        | 52 +++++++++++++++++++
 .../data_warehouse/data/node_repository.ts    | 23 ++++++++
 .../data_warehouse/data/graph_routes.ts       |  9 ++++
 3 files changed, 84 insertions(+)

diff --git a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
index b2948803e..88d387236 100644
--- a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
@@ -108,6 +108,14 @@ export default class NodeMapper extends Mapper {
         });
     }
 
+    // This should return a node and all connected nodes and connecting edges for n layers.
+    public async RetrieveNthNodes(id: string, depth: string, transaction?: PoolClient): Promise<Result<Node[]>> {
+        return super.rows(this.retrieveNthNodesStatement(id, depth), {
+            transaction,
+            resultClass,
+        });
+    }
+
     // Below are a set of query building functions. So far they're very simple
     // and the return value is something that the postgres-node driver can understand
     // My hope is that this method will allow us to be flexible and create more complicated
@@ -236,4 +244,48 @@ export default class NodeMapper extends Mapper {
             values: [nodeID, fileID],
         };
     }
+
+    // This should return a node and all connected nodes and connecting edges for n layers.
+    private retrieveNthNodesStatement(nodeID: string, depth: string): QueryConfig {
+        return {
+            text: `WITH RECURSIVE related (orig_id, orig_container_id, orig_metatype_id, orig_data_source_id, orig_import_data_id,
+                                            orig_data_staging_id, orig_type_mapping_transformation_id, orig_original_data_id, orig_properties,
+                                            orig_metadata, orig_created_at, orig_modified_at, orig_deleted_at, orig_created_by, orig_modified_by,
+                                            orig_metatype_name, edge_id, edge_container_id, edge_relationship_pair_id, edge_data_source_id,
+                                            edge_import_data_id, edge_data_staging_id, edge_type_mapping_transformation_id, edge_metadata,
+                                            edge_created_at, edge_modified_at, edge_deleted_at, edge_properties, edge_modified_by, edge_created_by,
+                                            dest_id, dest_container_id, dest_metatype_id, dest_data_source_id, dest_import_data_id, dest_data_staging_id,
+                                            dest_type_mapping_transformation_id, dest_original_data_id, dest_properties, dest_metadata, dest_created_at,
+                                            dest_modified_at, dest_deleted_at, dest_created_by, dest_modified_by, dest_metatype_name, lvl) AS (
+                    SELECT o.id, o.container_id, o.metatype_id, o.data_source_id, o.import_data_id, o.data_staging_id, o.type_mapping_transformation_id,
+                    o.original_data_id, o.properties, o.metadata, o.created_at, o.modified_at, o.deleted_at, o.created_by, o.modified_by, o.metatype_name,
+                    e.id, e.container_id, e.relationship_pair_id, e.data_source_id, e.import_data_id, e.data_staging_id, e.type_mapping_transformation_id,
+                    e.metadata, e.created_at, e.modified_at, e.deleted_at, e.properties, e.modified_by, e.created_by, d.id, d.container_id, d.metatype_id,
+                    d.data_source_id, d.import_data_id, d.data_staging_id, d.type_mapping_transformation_id, d.original_data_id, d.properties, d.metadata,
+                    d.created_at, d.modified_at, d.deleted_at, d.created_by, d.modified_by, d.metatype_name, 1
+                    FROM current_nodes o
+                        JOIN edges e
+                            ON o.id IN (e.origin_id, e.destination_id)
+                        JOIN current_nodes d
+                            ON d.id IN (e.origin_id, e.destination_id)
+                            AND d.id != o.id
+                    WHERE o.id = $1
+                    UNION ALL
+                    SELECT r.dest_id, r.dest_container_id, r.dest_metatype_id, r.dest_data_source_id, r.dest_import_data_id, r.dest_data_staging_id,
+                    r.dest_type_mapping_transformation_id, r.dest_original_data_id, r.dest_properties, r.dest_metadata, r.dest_created_at, r.dest_modified_at,
+                    r.dest_deleted_at, r.dest_created_by, r.dest_modified_by, r.dest_metatype_name, e.id, e.container_id, e.relationship_pair_id, e.data_source_id,
+                    e.import_data_id, e.data_staging_id, e.type_mapping_transformation_id, e.metadata, e.created_at, e.modified_at, e.deleted_at, e.properties,
+                    e.modified_by, e.created_by, d.id, d.container_id, d.metatype_id, d.data_source_id, d.import_data_id, d.data_staging_id,
+                    d.type_mapping_transformation_id, d.original_data_id, d.properties, d.metadata, d.created_at, d.modified_at, d.deleted_at, d.created_by,
+                    d.modified_by, d.metatype_name, r.lvl+1
+                    FROM related r
+                        JOIN edges e
+                            ON r.dest_id IN (e.origin_id, e.destination_id)
+                        JOIN current_nodes d
+                            ON d.id IN (e.origin_id, e.destination_id)
+                            AND d.id != r.orig_id AND d.id != r.dest_id
+                    ) SELECT * FROM related WHERE lvl <= $2;`,
+            values: [nodeID, depth],
+        };
+    }
 }
diff --git a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
index 8bf00de2a..dd9aa7226 100644
--- a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
@@ -56,6 +56,13 @@ export default class NodeRepository extends Repository implements RepositoryInte
         return Promise.resolve(node);
     }
 
+    // This should return a node and all connected nodes and connecting edges for n layers.
+    // TODO: should return list of nodes and edges (new result type??)
+    async findNthNodesByID(id: string, depth: string, transaction?: PoolClient): Promise<Result<Node[]>> {
+        // need help here
+        return Promise.resolve(x);
+    }
+
     async save(n: Node, user: User, transaction?: PoolClient): Promise<Result<boolean>> {
         let internalTransaction = false;
         const errors = await n.validationErrors();
@@ -309,6 +316,22 @@ export default class NodeRepository extends Repository implements RepositoryInte
         return this;
     }
 
+    // properties for n layer node query:
+    depth(operator: string, value: any) {
+        super.query('depth', operator, value);
+        return this;
+    }
+
+    relationshipID(operator: string, value: any) {
+        super.query('relationship_name', operator, value);
+        return this;
+    }
+    
+    relationshipName(operator: string, value: any) {
+        super.query('relationship_id', operator, value);
+        return this;
+    }
+
     async count(transaction?: PoolClient, queryOptions?: QueryOptions): Promise<Result<number>> {
         const results = await super.count(transaction, queryOptions);
 
diff --git a/src/http_server/routes/data_warehouse/data/graph_routes.ts b/src/http_server/routes/data_warehouse/data/graph_routes.ts
index fffd06dc7..5cd8e9a88 100644
--- a/src/http_server/routes/data_warehouse/data/graph_routes.ts
+++ b/src/http_server/routes/data_warehouse/data/graph_routes.ts
@@ -17,6 +17,10 @@ export default class GraphRoutes {
         app.get('/containers/:containerID/graphs/nodes/', ...middleware, authInContainer('read', 'data'), this.listNodes);
         app.get('/containers/:containerID/graphs/nodes/:nodeID', ...middleware, authInContainer('read', 'data'), this.retrieveNode);
 
+        // This should return a node and all connected nodes and connecting edges for n layers.
+        app.get('/containers/:containerID/graphs/nodes/:nodeID/graph?depth=10', ...middleware, authInContainer('read', 'data'), this.retrieveNthNodes);
+
+        
         app.get('/containers/:containerID/graphs/nodes/:nodeID/files', ...middleware, authInContainer('read', 'data'), this.listFilesForNode);
         app.put('/containers/:containerID/graphs/nodes/:nodeID/files/:fileID', ...middleware, authInContainer('write', 'data'), this.attachFileToNode);
         app.delete('/containers/:containerID/graphs/nodes/:nodeID/files/:fileID', ...middleware, authInContainer('write', 'data'), this.detachFileFromNode);
@@ -93,6 +97,11 @@ export default class GraphRoutes {
         }
     }
 
+    // This should return a node and all connected nodes and connecting edges for n layers.
+    private static retrieveNthNodes(req: Request, res: Response, next: NextFunction) {
+        // need help here
+    }
+
     private static retrieveEdge(req: Request, res: Response, next: NextFunction) {
         if (req.edge) {
             Result.Success(req.edge).asResponse(res);

From d0f0e43f4347911bc75832a6ed22d980ed00313d Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Tue, 1 Feb 2022 15:16:50 -0700
Subject: [PATCH 03/31] TODO: NodeLeaf obj

---
 src/domain_objects/data_warehouse/data/node.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/domain_objects/data_warehouse/data/node.ts b/src/domain_objects/data_warehouse/data/node.ts
index fa4cbebce..3bef79429 100644
--- a/src/domain_objects/data_warehouse/data/node.ts
+++ b/src/domain_objects/data_warehouse/data/node.ts
@@ -131,3 +131,5 @@ export function IsNodes(set: Node[] | Edge[]): set is Node[] {
 
     return set[0] instanceof Node;
 }
+
+// TODO: create NodeLeaf object
\ No newline at end of file

From d2e4bbbbfd6223d9eed76adab44653fdc9224397 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Wed, 2 Feb 2022 16:55:46 -0700
Subject: [PATCH 04/31] getting somewhere on node leaf object...

---
 .../data_warehouse/data/node.ts               | 286 +++++++++++++++++-
 1 file changed, 284 insertions(+), 2 deletions(-)

diff --git a/src/domain_objects/data_warehouse/data/node.ts b/src/domain_objects/data_warehouse/data/node.ts
index 3bef79429..77f065d01 100644
--- a/src/domain_objects/data_warehouse/data/node.ts
+++ b/src/domain_objects/data_warehouse/data/node.ts
@@ -1,10 +1,14 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsArray, IsObject, IsOptional, IsString, ValidateIf, ValidateNested} from 'class-validator';
+import {IsArray, IsObject, IsOptional, isString, IsString, ValidateIf, ValidateNested} from 'class-validator';
 import {Expose, plainToClass, Transform, Type} from 'class-transformer';
 import Metatype, {MetatypeID} from '../ontology/metatype';
 import Container from '../ontology/container';
 import Edge from './edge';
 import {Conversion} from '../etl/type_transformation';
+import MetatypeRelationshipPair, {MetatypeRelationshipPairID} from '../ontology/metatype_relationship_pair';
+import EdgeMapper from '../../../data_access_layer/mappers/data_warehouse/data/edge_mapper';
+import { string } from 'io-ts';
+import e from 'express';
 
 export class NodeMetadata {
     @IsOptional()
@@ -132,4 +136,282 @@ export function IsNodes(set: Node[] | Edge[]): set is Node[] {
     return set[0] instanceof Node;
 }
 
-// TODO: create NodeLeaf object
\ No newline at end of file
+// needed for edge component of NodeLeaf
+export class EdgeMetadata {
+    @IsOptional()
+    @IsArray()
+    @Type(() => Conversion)
+    conversions: Conversion[] = [];
+
+    @IsOptional()
+    @IsArray()
+    @Type(() => Conversion)
+    failed_conversions: Conversion[] = [];
+
+    constructor(input: {conversions?: Conversion[]; failed_conversions?: Conversion[]}) {
+        if (input) {
+            if (input.conversions) this.conversions = input.conversions;
+            if (input.failed_conversions) this.failed_conversions = input.failed_conversions;
+        }
+    }
+}
+
+/*
+    The NodeLeaf object represents a tree-like record object which consists of
+    information on a node, one connected nodes, and the edge that connect them.
+    Contains validations required for said object to be considered valid.
+*/
+export class NodeLeaf extends BaseDomainClass {
+    // origin (root node) properties
+    @IsOptional()
+    @IsString()
+    origin_id?: string;
+
+    @IsString()
+    origin_container_id?: string;
+
+    // use metatype id to retrieve information on the origin node's metatype.
+    // Retrieves the whole class, not just the id.
+    @MetatypeID({message: 'Metatype must have valid ID'})
+    @Expose({name: 'metatype_id', toClassOnly: true})
+    @Transform(
+        ({value}) => {
+            const metatype = plainToClass(Metatype, {});
+            metatype.id = value;
+            return metatype;
+        },
+        {toClassOnly: true},
+    )
+    origin_metatype: Metatype | undefined;
+
+    // get orig metatype id from Metatype class
+    @Expose({toPlainOnly: true})
+    get origin_metatype_id(): string {
+        return this.origin_metatype ? this.origin_metatype.id! : '';
+    }
+
+    @IsOptional()
+    origin_metatype_name?: string;
+
+    @IsObject()
+    origin_properties: object = {};
+
+    @IsString()
+    @IsOptional()
+    origin_original_data_id?: string;
+
+    @IsString()
+    @IsOptional()
+    origin_import_data_id?: string;
+
+    @IsString()
+    @IsOptional()
+    origin_data_staging_id?: string;
+
+    @ValidateIf((o) => typeof o.composite_original_id !== 'undefined' && o.composite_original_id == null)
+    @IsString()
+    origin_data_source_id?: string;
+
+    @IsString()
+    @IsOptional()
+    origin_type_mapping_transformation_id?: string;
+
+    @IsOptional()
+    @ValidateNested()
+    @Type(() => NodeMetadata)
+    origin_metadata?: NodeMetadata;
+
+    @IsOptional()
+    @IsString()
+    edge_id?: string;
+
+    @IsString()
+    edge_container_id?: string;
+
+    // use metatype relationship pair id to get info on the edge's
+    // relationship type. Gets the whole class, not just the id.
+    @MetatypeRelationshipPairID({
+        message: 'Metatype relationship pair must have valid ID',
+    })
+    @Expose({name: 'relationship_pair_id', toClassOnly: true})
+    @Transform(
+        ({value}) => {
+            const p = plainToClass(MetatypeRelationshipPair, {})
+            p.id = value;
+            return p;
+        },
+        {toClassOnly: true},
+    )
+    metatypeRelationshipPair: MetatypeRelationshipPair | undefined;
+
+    // get relationship pair id from Metatype Relationship Pair class
+    @Expose({toPlainOnly: true})
+    get relationship_pair_id(): string {
+        return this.metatypeRelationshipPair ? this.metatypeRelationshipPair.id! : '';
+    }
+
+    @IsString()
+    @IsOptional()
+    metatype_relationship_name?: string;
+
+    @IsObject()
+    edge_properties: object = {};
+
+    @IsString()
+    @IsOptional()
+    edge_import_data_id?: string;
+
+    @IsString()
+    @IsOptional()
+    edge_data_staging_id?: string;
+
+    @IsString()
+    @IsOptional()
+    edge_data_source_id?: string;
+
+    @IsString()
+    @IsOptional()
+    edge_type_mapping_transformation_id?: string;
+
+    @IsOptional()
+    @ValidateNested()
+    @Type(() => EdgeMetadata)
+    edge_metadata?: EdgeMetadata;
+
+    // destination (outer node) properties
+    @IsOptional()
+    @IsString()
+    destination_id?: string;
+
+    @IsString()
+    destination_container_id?: string;
+
+    // use metatype id to retrieve information on the origin node's metatype.
+    // Retrieves the whole class, not just the id.
+    @MetatypeID({message: 'Metatype must have valid ID'})
+    @Expose({name: 'metatype_id', toClassOnly: true})
+    @Transform(
+        ({value}) => {
+            const metatype = plainToClass(Metatype, {});
+            metatype.id = value;
+            return metatype;
+        },
+        {toClassOnly: true},
+    )
+    destination_metatype: Metatype | undefined;
+
+    // get orig metatype id from Metatype class
+    @Expose({toPlainOnly: true})
+    get destination_metatype_id(): string {
+        return this.destination_metatype ? this.destination_metatype.id! : '';
+    }
+
+    @IsOptional()
+    destination_metatype_name?: string;
+
+    @IsObject()
+    destination_properties: object = {};
+
+    @IsString()
+    @IsOptional()
+    destination_original_data_id?: string;
+
+    @IsString()
+    @IsOptional()
+    destination_import_data_id?: string;
+
+    @IsString()
+    @IsOptional()
+    destination_data_staging_id?: string;
+
+    @ValidateIf((o) => typeof o.composite_original_id !== 'undefined' && o.composite_original_id == null)
+    @IsString()
+    destination_data_source_id?: string;
+
+    @IsString()
+    @IsOptional()
+    destination_type_mapping_transformation_id?: string;
+
+    @IsOptional()
+    @ValidateNested()
+    @Type(() => NodeMetadata)
+    destination_metadata?: NodeMetadata;
+
+    // TODO: implement lvl
+
+    constructor(input: {
+        origin_container_id: Container | string;
+        edge_container_id: Container | string;
+        destination_container_id: Container | string;
+        origin_metatype: Metatype | string;
+        destination_metatype: Metatype | string;
+        origin_metatype_name?: string;
+        destination_metatype_name?: string;
+        metatype_relationship_pair: MetatypeRelationshipPair | string;
+        metatype_name?: string;
+        origin_properties: object;
+        edge_properties: object;
+        destination_properties: object;
+        origin_original_data_id?: string;
+        destination_original_data_id?: string;
+        origin_import_data_id?: string;
+        edge_import_data_id?: string;
+        destination_import_data_id?: string;
+        origin_data_staging_id?: string;
+        edge_data_staging_id?: string;
+        destination_data_staging_id?: string;
+        origin_data_source_id?: string;
+        edge_data_source_id?: string;
+        destination_data_source_id?: string;
+        origin_type_mapping_transformation_id?: string;
+        edge_type_mapping_transformation_id?: string;
+        destination_type_mapping_transformation_id?: string;
+        origin_metadata?: NodeMetadata;
+        edge_metadata?: EdgeMetadata;
+        destination_metadata?: NodeMetadata;
+        origin_created_at?: Date;
+        edge_created_at?: Date;
+        destination_created_at?: Date;
+    }) {
+        super();
+
+        if (input) {
+            input.origin_container_id instanceof Container? (this.origin_container_id = input.origin_container_id.id) : (this.origin_container_id = input.origin_container_id);
+            input.destination_container_id instanceof Container? (this.destination_container_id = input.destination_container_id.id) : (this.destination_container_id = input.destination_container_id);
+            input.edge_container_id instanceof Container? (this.edge_container_id = input.edge_container_id.id) : (this.edge_container_id = input.edge_container_id);
+            input.origin_metatype instanceof Metatype
+                ? (this.origin_metatype = input.origin_metatype)
+                : (this.origin_metatype = plainToClass(Metatype, {
+                    id: input.origin_metatype_name,
+                }));
+            input.destination_metatype instanceof Metatype
+                ? (this.destination_metatype = input.destination_metatype)
+                : (this.destination_metatype = plainToClass(Metatype, {
+                    id: input.destination_metatype_name,
+                }));
+            if (input.origin_metatype_name) this.origin_metatype_name = input.metatype_name;
+            if (input.destination_metatype_name) this.destination_metatype_name = input.metatype_name;
+            this.origin_properties = input.origin_properties;
+            this.edge_properties = input.edge_properties;
+            this.destination_properties = input.destination_properties;
+            if (input.origin_original_data_id) this.origin_original_data_id = input.origin_original_data_id;
+            if (input.destination_original_data_id) this.destination_original_data_id = input.destination_original_data_id;
+            if (input.origin_data_staging_id) this.origin_data_staging_id = input.origin_data_staging_id;
+            if (input.edge_data_staging_id) this.edge_data_staging_id = input.edge_data_staging_id;
+            if (input.destination_data_staging_id) this.destination_data_staging_id = input.destination_data_staging_id;
+            if (input.origin_data_source_id) this.origin_data_source_id = input.origin_data_source_id;
+            if (input.edge_data_source_id) this.edge_data_source_id = input.edge_data_source_id;
+            if (input.destination_data_source_id) this.destination_data_source_id = input.destination_data_source_id;
+            if (input.origin_type_mapping_transformation_id) this.origin_type_mapping_transformation_id = input.origin_type_mapping_transformation_id;
+            if (input.edge_type_mapping_transformation_id) this.edge_type_mapping_transformation_id = input.edge_type_mapping_transformation_id;
+            if (input.destination_type_mapping_transformation_id) this.destination_type_mapping_transformation_id = input.destination_type_mapping_transformation_id;
+            if (input.origin_metadata) this.origin_metadata = input.origin_metadata;
+            if (input.edge_metadata) this.edge_metadata = input.edge_metadata;
+            if (input.destination_metadata) this.destination_metadata = input.destination_metadata;
+            // not working (see below)
+            // if (input.origin_created_at) this.origin_created_at = input.origin_created_at;
+            // if (input.edge_created_at) this.edge_created_at = input.edge_created_at;
+            // if (input.destination_created_at) this.destination_created_at = input.destination_created_at;
+        }
+    }
+}
\ No newline at end of file

From 782e5465190536f6466469de838d1b7346a84bd6 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Wed, 2 Feb 2022 17:29:33 -0700
Subject: [PATCH 05/31] Create nodes with specified property values

---
 .../src/components/createNodeDialog.vue       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index 49ab10bca..e034bf98f 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -28,6 +28,7 @@
                     v-model="metatype"
                     :rules="[v => !!v || $t('createNode.metatypeRequired')]"
                     :single-line="false"
+                    :loading="metatypesLoading"
                     :items="originMetatypes"
                     :search-input.sync="originSearch"
                     item-text="name"
@@ -37,6 +38,31 @@
                 >
                   <template v-slot:label>{{$t('createNode.metatype')}} <small style="color:red" >*</small></template>
                 </v-autocomplete>
+                <v-col :cols="12" v-if="Object.keys(metatype).length !== 0">
+                  <v-checkbox 
+                    v-model="optional"
+                    :label="'Show Optional Fields'"
+                  ></v-checkbox>
+                  <v-col :cols="12">
+                    <v-data-table
+                        :items="metatype.keys"
+                        :items-per-page="50"
+                        v-if="optional === true"
+                    >
+                      <template v-slot:[`item`]="{ item }">
+                        <v-text-field v-model="item['default_value']"><template v-slot:label>{{item["name"]}}</template></v-text-field>
+                      </template>
+                    </v-data-table>
+                  </v-col>
+                </v-col>
+                
+                <!-- <v-text-field
+                    v-model="selectedMetatype.name"
+                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                </v-text-field> -->
               </v-form>
               <p><span style="color:red">*</span> = {{$t('createNode.requiredField')}}</p>
             </v-col>
@@ -68,11 +94,14 @@ export default class CreateNodeDialog extends Vue {
   readonly icon!: boolean
 
   errorMessage = ""
+  metatypesLoading = false
   dialog = false
   valid = false
+  optional = false
   originSearch = ""
   metatype: any = {}
   propertyValue = ""
+  propertiesTest = ["jeff", "anne", "buluga"]
   
   property = {}
   
@@ -86,9 +115,11 @@ export default class CreateNodeDialog extends Vue {
 
   @Watch('originSearch', {immediate: true})
   onOriginSearchChange(newVal: string) {
+    this.metatypesLoading = true
     this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'true'})
         .then((metatypes) => {
           this.originMetatypes = metatypes as MetatypeT[]
+          this.metatypesLoading = false
         })
         .catch((e: any) => this.errorMessage = e)
   }

From 3a24958b7108f410c249372dbd23b81ecf9d83b1 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Thu, 3 Feb 2022 10:00:24 -0700
Subject: [PATCH 06/31] NodeLeaf obj fixes

---
 .../data_warehouse/data/node.ts               | 278 +++++++-----------
 1 file changed, 109 insertions(+), 169 deletions(-)

diff --git a/src/domain_objects/data_warehouse/data/node.ts b/src/domain_objects/data_warehouse/data/node.ts
index 77f065d01..f17a7d215 100644
--- a/src/domain_objects/data_warehouse/data/node.ts
+++ b/src/domain_objects/data_warehouse/data/node.ts
@@ -9,6 +9,7 @@ import MetatypeRelationshipPair, {MetatypeRelationshipPairID} from '../ontology/
 import EdgeMapper from '../../../data_access_layer/mappers/data_warehouse/data/edge_mapper';
 import { string } from 'io-ts';
 import e from 'express';
+import { EdgeMetadata } from './edge';
 
 export class NodeMetadata {
     @IsOptional()
@@ -136,26 +137,6 @@ export function IsNodes(set: Node[] | Edge[]): set is Node[] {
     return set[0] instanceof Node;
 }
 
-// needed for edge component of NodeLeaf
-export class EdgeMetadata {
-    @IsOptional()
-    @IsArray()
-    @Type(() => Conversion)
-    conversions: Conversion[] = [];
-
-    @IsOptional()
-    @IsArray()
-    @Type(() => Conversion)
-    failed_conversions: Conversion[] = [];
-
-    constructor(input: {conversions?: Conversion[]; failed_conversions?: Conversion[]}) {
-        if (input) {
-            if (input.conversions) this.conversions = input.conversions;
-            if (input.failed_conversions) this.failed_conversions = input.failed_conversions;
-        }
-    }
-}
-
 /*
     The NodeLeaf object represents a tree-like record object which consists of
     information on a node, one connected nodes, and the edge that connect them.
@@ -163,181 +144,139 @@ export class EdgeMetadata {
 */
 export class NodeLeaf extends BaseDomainClass {
     // origin (root node) properties
-    @IsOptional()
-    @IsString()
-    origin_id?: string;
-
-    @IsString()
-    origin_container_id?: string;
-
-    // use metatype id to retrieve information on the origin node's metatype.
-    // Retrieves the whole class, not just the id.
-    @MetatypeID({message: 'Metatype must have valid ID'})
-    @Expose({name: 'metatype_id', toClassOnly: true})
-    @Transform(
-        ({value}) => {
-            const metatype = plainToClass(Metatype, {});
-            metatype.id = value;
-            return metatype;
-        },
-        {toClassOnly: true},
-    )
-    origin_metatype: Metatype | undefined;
-
-    // get orig metatype id from Metatype class
-    @Expose({toPlainOnly: true})
-    get origin_metatype_id(): string {
-        return this.origin_metatype ? this.origin_metatype.id! : '';
-    }
+        origin_id?: string;
+
+        origin_container_id?: string;
+
+        // use metatype id to retrieve information on the origin node's metatype.
+        // Retrieves the whole class, not just the id.
+        @MetatypeID({message: 'Metatype must have valid ID'})
+        @Expose({name: 'metatype_id', toClassOnly: true})
+        @Transform(
+            ({value}) => {
+                const metatype = plainToClass(Metatype, {});
+                metatype.id = value;
+                return metatype;
+            },
+            {toClassOnly: true},
+        )
+        origin_metatype: Metatype | undefined;
+
+        // get orig metatype id from Metatype class
+        @Expose({toPlainOnly: true})
+        get origin_metatype_id(): string {
+            return this.origin_metatype ? this.origin_metatype.id! : '';
+        }
 
-    @IsOptional()
-    origin_metatype_name?: string;
+        origin_metatype_name?: string;
 
-    @IsObject()
-    origin_properties: object = {};
+        origin_properties: object = {};
 
-    @IsString()
-    @IsOptional()
-    origin_original_data_id?: string;
+        origin_original_data_id?: string;
 
-    @IsString()
-    @IsOptional()
-    origin_import_data_id?: string;
+        origin_import_data_id?: string;
 
-    @IsString()
-    @IsOptional()
-    origin_data_staging_id?: string;
+        origin_data_staging_id?: string;
 
-    @ValidateIf((o) => typeof o.composite_original_id !== 'undefined' && o.composite_original_id == null)
-    @IsString()
-    origin_data_source_id?: string;
+        origin_data_source_id?: string;
 
-    @IsString()
-    @IsOptional()
-    origin_type_mapping_transformation_id?: string;
+        origin_type_mapping_transformation_id?: string;
 
-    @IsOptional()
-    @ValidateNested()
-    @Type(() => NodeMetadata)
-    origin_metadata?: NodeMetadata;
+        @Type(() => NodeMetadata)
+        origin_metadata?: NodeMetadata;
 
-    @IsOptional()
-    @IsString()
-    edge_id?: string;
+        origin_created_at?: Date;
 
-    @IsString()
-    edge_container_id?: string;
-
-    // use metatype relationship pair id to get info on the edge's
-    // relationship type. Gets the whole class, not just the id.
-    @MetatypeRelationshipPairID({
-        message: 'Metatype relationship pair must have valid ID',
-    })
-    @Expose({name: 'relationship_pair_id', toClassOnly: true})
-    @Transform(
-        ({value}) => {
-            const p = plainToClass(MetatypeRelationshipPair, {})
-            p.id = value;
-            return p;
-        },
-        {toClassOnly: true},
-    )
-    metatypeRelationshipPair: MetatypeRelationshipPair | undefined;
+    // edge properties
+        edge_id?: string;
+
+        edge_container_id?: string;
+
+        // use metatype relationship pair id to get info on the edge's
+        // relationship type. Gets the whole class, not just the id.
+        @MetatypeRelationshipPairID({
+            message: 'Metatype relationship pair must have valid ID',
+        })
+        @Expose({name: 'relationship_pair_id', toClassOnly: true})
+        @Transform(
+            ({value}) => {
+                const p = plainToClass(MetatypeRelationshipPair, {})
+                p.id = value;
+                return p;
+            },
+            {toClassOnly: true},
+        )
+        metatypeRelationshipPair: MetatypeRelationshipPair | undefined;
+
+        // get relationship pair id from Metatype Relationship Pair class
+        @Expose({toPlainOnly: true})
+        get relationship_pair_id(): string {
+            return this.metatypeRelationshipPair ? this.metatypeRelationshipPair.id! : '';
+        }
 
-    // get relationship pair id from Metatype Relationship Pair class
-    @Expose({toPlainOnly: true})
-    get relationship_pair_id(): string {
-        return this.metatypeRelationshipPair ? this.metatypeRelationshipPair.id! : '';
-    }
+        metatype_relationship_name?: string;
 
-    @IsString()
-    @IsOptional()
-    metatype_relationship_name?: string;
+        edge_properties: object = {};
 
-    @IsObject()
-    edge_properties: object = {};
+        edge_import_data_id?: string;
 
-    @IsString()
-    @IsOptional()
-    edge_import_data_id?: string;
+        edge_data_staging_id?: string;
 
-    @IsString()
-    @IsOptional()
-    edge_data_staging_id?: string;
+        edge_data_source_id?: string;
 
-    @IsString()
-    @IsOptional()
-    edge_data_source_id?: string;
+        edge_type_mapping_transformation_id?: string;
 
-    @IsString()
-    @IsOptional()
-    edge_type_mapping_transformation_id?: string;
+        @Type(() => EdgeMetadata)
+        edge_metadata?: EdgeMetadata;
 
-    @IsOptional()
-    @ValidateNested()
-    @Type(() => EdgeMetadata)
-    edge_metadata?: EdgeMetadata;
+        edge_created_at?: Date;
 
     // destination (outer node) properties
-    @IsOptional()
-    @IsString()
-    destination_id?: string;
-
-    @IsString()
-    destination_container_id?: string;
-
-    // use metatype id to retrieve information on the origin node's metatype.
-    // Retrieves the whole class, not just the id.
-    @MetatypeID({message: 'Metatype must have valid ID'})
-    @Expose({name: 'metatype_id', toClassOnly: true})
-    @Transform(
-        ({value}) => {
-            const metatype = plainToClass(Metatype, {});
-            metatype.id = value;
-            return metatype;
-        },
-        {toClassOnly: true},
-    )
-    destination_metatype: Metatype | undefined;
+        destination_id?: string;
+
+        destination_container_id?: string;
+
+        // use metatype id to retrieve information on the origin node's metatype.
+        // Retrieves the whole class, not just the id.
+        @MetatypeID({message: 'Metatype must have valid ID'})
+        @Expose({name: 'metatype_id', toClassOnly: true})
+        @Transform(
+            ({value}) => {
+                const metatype = plainToClass(Metatype, {});
+                metatype.id = value;
+                return metatype;
+            },
+            {toClassOnly: true},
+        )
+        destination_metatype: Metatype | undefined;
+
+        // get orig metatype id from Metatype class
+        @Expose({toPlainOnly: true})
+        get destination_metatype_id(): string {
+            return this.destination_metatype ? this.destination_metatype.id! : '';
+        }
 
-    // get orig metatype id from Metatype class
-    @Expose({toPlainOnly: true})
-    get destination_metatype_id(): string {
-        return this.destination_metatype ? this.destination_metatype.id! : '';
-    }
+        destination_metatype_name?: string;
 
-    @IsOptional()
-    destination_metatype_name?: string;
+        destination_properties: object = {};
 
-    @IsObject()
-    destination_properties: object = {};
+        destination_original_data_id?: string;
 
-    @IsString()
-    @IsOptional()
-    destination_original_data_id?: string;
+        destination_import_data_id?: string;
 
-    @IsString()
-    @IsOptional()
-    destination_import_data_id?: string;
+        destination_data_staging_id?: string;
 
-    @IsString()
-    @IsOptional()
-    destination_data_staging_id?: string;
+        destination_data_source_id?: string;
 
-    @ValidateIf((o) => typeof o.composite_original_id !== 'undefined' && o.composite_original_id == null)
-    @IsString()
-    destination_data_source_id?: string;
+        destination_type_mapping_transformation_id?: string;
 
-    @IsString()
-    @IsOptional()
-    destination_type_mapping_transformation_id?: string;
+        @Type(() => NodeMetadata)
+        destination_metadata?: NodeMetadata;
 
-    @IsOptional()
-    @ValidateNested()
-    @Type(() => NodeMetadata)
-    destination_metadata?: NodeMetadata;
+        destination_created_at?: Date;
 
-    // TODO: implement lvl
+    // level of depth
+    depth?: string;
 
     constructor(input: {
         origin_container_id: Container | string;
@@ -372,6 +311,7 @@ export class NodeLeaf extends BaseDomainClass {
         origin_created_at?: Date;
         edge_created_at?: Date;
         destination_created_at?: Date;
+        depth?: string;
     }) {
         super();
 
@@ -408,10 +348,10 @@ export class NodeLeaf extends BaseDomainClass {
             if (input.origin_metadata) this.origin_metadata = input.origin_metadata;
             if (input.edge_metadata) this.edge_metadata = input.edge_metadata;
             if (input.destination_metadata) this.destination_metadata = input.destination_metadata;
-            // not working (see below)
-            // if (input.origin_created_at) this.origin_created_at = input.origin_created_at;
-            // if (input.edge_created_at) this.edge_created_at = input.edge_created_at;
-            // if (input.destination_created_at) this.destination_created_at = input.destination_created_at;
+            if (input.origin_created_at) this.origin_created_at = input.origin_created_at;
+            if (input.edge_created_at) this.edge_created_at = input.edge_created_at;
+            if (input.destination_created_at) this.destination_created_at = input.destination_created_at;
+            if (input.depth) this.depth = input.depth;
         }
     }
 }
\ No newline at end of file

From 1df07374876bfb4d6bc3a98bd8496efbfcac1cf0 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Thu, 3 Feb 2022 14:17:01 -0700
Subject: [PATCH 07/31] Add view of nodes properties in edit dialogue

---
 .../src/components/createNodeDialog.vue       |  23 ++--
 AdminWebApp/src/components/editNodeDialog.vue | 110 ++++++++++--------
 2 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index e034bf98f..81becf20d 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -46,7 +46,7 @@
                   <v-col :cols="12">
                     <v-data-table
                         :items="metatype.keys"
-                        :items-per-page="50"
+                        :items-per-page="100"
                         v-if="optional === true"
                     >
                       <template v-slot:[`item`]="{ item }">
@@ -55,14 +55,6 @@
                     </v-data-table>
                   </v-col>
                 </v-col>
-                
-                <!-- <v-text-field
-                    v-model="selectedMetatype.name"
-                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
-                </v-text-field> -->
               </v-form>
               <p><span style="color:red">*</span> = {{$t('createNode.requiredField')}}</p>
             </v-col>
@@ -80,7 +72,7 @@
 
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {MetatypeT, PropertyT} from "@/api/types";
+import {MetatypeKeyT, MetatypeT, PropertyT} from "@/api/types";
 
 @Component
 export default class CreateNodeDialog extends Vue {
@@ -101,7 +93,6 @@ export default class CreateNodeDialog extends Vue {
   originSearch = ""
   metatype: any = {}
   propertyValue = ""
-  propertiesTest = ["jeff", "anne", "buluga"]
   
   property = {}
   
@@ -116,7 +107,7 @@ export default class CreateNodeDialog extends Vue {
   @Watch('originSearch', {immediate: true})
   onOriginSearchChange(newVal: string) {
     this.metatypesLoading = true
-    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'true'})
+    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'false'})
         .then((metatypes) => {
           this.originMetatypes = metatypes as MetatypeT[]
           this.metatypesLoading = false
@@ -124,6 +115,14 @@ export default class CreateNodeDialog extends Vue {
         .catch((e: any) => this.errorMessage = e)
   }
 
+  @Watch('metatype', {immediate: true})
+  onMetatypeSelect(){
+    this.$client.listMetatypeKeys(this.containerID, this.metatype.id)
+        .then((keys) => {
+          this.metatype.keys = keys
+        })
+  }
+
   newNode() {
     this.setProperties()
     this.$client.createNode(this.containerID,
diff --git a/AdminWebApp/src/components/editNodeDialog.vue b/AdminWebApp/src/components/editNodeDialog.vue
index 4650a1460..402420f89 100644
--- a/AdminWebApp/src/components/editNodeDialog.vue
+++ b/AdminWebApp/src/components/editNodeDialog.vue
@@ -46,7 +46,7 @@
             <v-col :cols="12">
               <v-data-table
                   :headers="headers()"
-                  :items="selectedNode.properties"
+                  :items="nodeProperties"
                   :items-per-page="100"
                   :footer-props="{
                      'items-per-page-options': [25, 50, 100]
@@ -66,7 +66,7 @@
                     <!-- <create-metatype-key-dialog :metatype="metatype" @metatypeKeyCreated="loadKeys()"></create-metatype-key-dialog> -->
                   </v-toolbar>
                 </template>
-                <template v-slot:[`item.actions`]="{ item }">
+                <!-- <template v-slot:[`item.actions`]="{ item }">
                  <edit-node-property-dialog :propertyKey="item" :node="node" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-node-property-dialog>
                   <v-icon
                       small
@@ -74,7 +74,7 @@
                   >
                     mdi-delete
                   </v-icon>
-                </template>
+                </template> -->
               </v-data-table>
             </v-col>
           </v-row>
@@ -92,7 +92,7 @@
 
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {MetatypeKeyT, NodeT} from "../api/types";
+import {MetatypeKeyT, NodeT, PropertyT} from "../api/types";
 import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
 import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
 
@@ -112,22 +112,24 @@ export default class EditMetatypeDialog extends Vue {
   dialog = false
   selectedNode: NodeT | null  = null
   valid = false
+  nodeProperties: PropertyT[] = []
 
   // this way we only load the keys when the edit dialog is open, so we don't
   // overload someone using this in a list
   @Watch('dialog', {immediate: true})
   isDialogOpen() {
     if(this.dialog) {
-      this.loadKeys()
+      // this.loadKeys()
+      this.propertiesToArray()
     }
   }
 
   headers() {
     return  [
-      { text: this.$t('editMetatype.keyName'), value: 'name' },
-      { text: this.$t('editMetatype.keyDescription'), value: 'description'},
-      { text: this.$t('editMetatype.keyType'), value: 'data_type'},
-      { text: this.$t('editMetatype.actions'), value: 'actions', sortable: false }
+      { text: this.$t('editMetatype.keyName'), value: 'key'},
+      // { text: this.$t('editMetatype.keyDescription')},
+      // { text: this.$t('editMetatype.keyType'), value: 'type'},
+      // { text: this.$t('editMetatype.actions'), value: 'actions', sortable: false }
     ]
   }
 
@@ -136,47 +138,61 @@ export default class EditMetatypeDialog extends Vue {
     this.selectedNode = JSON.parse(JSON.stringify(this.node))
   }
 
-  editMetatype() {
-    this.$client.updateMetatype(this.selectedNode?.container_id!, this.selectedNode?.id!,
-        {"name": this.selectedNode?.metatype.name, "description": this.selectedNode?.metatype.description})
-        .then(result => {
-          if(!result) {
-            this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-          } else {
-            this.dialog = false
-            this.$emit('metatypeEdited')
-          }
-        })
-        .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  }
-
-  loadKeys() {
-    if(this.selectedNode) {
-      this.keysLoading = true
-      this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
-          .then(keys => {
-            if(this.selectedNode) {
-              this.selectedNode.properties = keys
-              this.keysLoading = false
-              this.$forceUpdate()
-            }
-          })
-          .catch(e => {
-            this.errorMessage = e
-            this.keysLoading = false
-          })
+  propertiesToArray() {
+    if (this.selectedNode) {
+      //   Object.entries(this.selectedNode.properties).forEach(([key, text]) => {
+      //     const object = {key: key, value: key, type: key} as PropertyT
+      //     this.nodeProperties.push(object)  
+      // })
+       for ( const key in this.selectedNode.properties) {
+        const object = {key: key, value: key, type: key} as PropertyT
+        this.nodeProperties.push(object)
+      }
     }
+   
   }
 
-  deleteKey(key: MetatypeKeyT) {
-    this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
-    .then(result => {
-      if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-
-      this.loadKeys()
-    })
-    .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  }
+  // editMetatype() {
+  //   this.$client.updateMetatype(this.selectedNode?.container_id!, this.selectedNode?.id!,
+  //       {"name": this.selectedNode?.metatype.name, "description": this.selectedNode?.metatype.description})
+  //       .then(result => {
+  //         if(!result) {
+  //           this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+  //         } else {
+  //           this.dialog = false
+  //           this.$emit('metatypeEdited')
+  //         }
+  //       })
+  //       .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  // }
+
+  // loadKeys() {
+  //   if(this.selectedNode) {
+  //     this.keysLoading = true
+  //     this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
+  //         .then(keys => {
+  //           if(this.selectedNode) {
+  //             this.selectedNode.properties = keys
+  //             this.keysLoading = false
+  //             this.$forceUpdate()
+  //           }
+  //         })
+  //         .catch(e => {
+  //           this.errorMessage = e
+  //           this.keysLoading = false
+  //         })
+  //   }
+  // }
+
+  // deleteKey(key: MetatypeKeyT) {
+  //   this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
+  //   .then(result => {
+  //     if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+
+  //     this.loadKeys()
+  //   })
+  //   .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  // }
 }
 
 </script>

From 45ba083e737ecebfbb1b39fb8ae80da9b848bc5a Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Thu, 3 Feb 2022 14:17:01 -0700
Subject: [PATCH 08/31] Add view of nodes properties in edit dialogue

---
 .../src/components/createNodeDialog.vue       |  23 ++--
 AdminWebApp/src/components/editNodeDialog.vue | 110 ++++++++++--------
 AdminWebApp/src/views/DataTestCreation.vue    |   1 -
 3 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index e034bf98f..81becf20d 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -46,7 +46,7 @@
                   <v-col :cols="12">
                     <v-data-table
                         :items="metatype.keys"
-                        :items-per-page="50"
+                        :items-per-page="100"
                         v-if="optional === true"
                     >
                       <template v-slot:[`item`]="{ item }">
@@ -55,14 +55,6 @@
                     </v-data-table>
                   </v-col>
                 </v-col>
-                
-                <!-- <v-text-field
-                    v-model="selectedMetatype.name"
-                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
-                </v-text-field> -->
               </v-form>
               <p><span style="color:red">*</span> = {{$t('createNode.requiredField')}}</p>
             </v-col>
@@ -80,7 +72,7 @@
 
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {MetatypeT, PropertyT} from "@/api/types";
+import {MetatypeKeyT, MetatypeT, PropertyT} from "@/api/types";
 
 @Component
 export default class CreateNodeDialog extends Vue {
@@ -101,7 +93,6 @@ export default class CreateNodeDialog extends Vue {
   originSearch = ""
   metatype: any = {}
   propertyValue = ""
-  propertiesTest = ["jeff", "anne", "buluga"]
   
   property = {}
   
@@ -116,7 +107,7 @@ export default class CreateNodeDialog extends Vue {
   @Watch('originSearch', {immediate: true})
   onOriginSearchChange(newVal: string) {
     this.metatypesLoading = true
-    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'true'})
+    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'false'})
         .then((metatypes) => {
           this.originMetatypes = metatypes as MetatypeT[]
           this.metatypesLoading = false
@@ -124,6 +115,14 @@ export default class CreateNodeDialog extends Vue {
         .catch((e: any) => this.errorMessage = e)
   }
 
+  @Watch('metatype', {immediate: true})
+  onMetatypeSelect(){
+    this.$client.listMetatypeKeys(this.containerID, this.metatype.id)
+        .then((keys) => {
+          this.metatype.keys = keys
+        })
+  }
+
   newNode() {
     this.setProperties()
     this.$client.createNode(this.containerID,
diff --git a/AdminWebApp/src/components/editNodeDialog.vue b/AdminWebApp/src/components/editNodeDialog.vue
index 4650a1460..402420f89 100644
--- a/AdminWebApp/src/components/editNodeDialog.vue
+++ b/AdminWebApp/src/components/editNodeDialog.vue
@@ -46,7 +46,7 @@
             <v-col :cols="12">
               <v-data-table
                   :headers="headers()"
-                  :items="selectedNode.properties"
+                  :items="nodeProperties"
                   :items-per-page="100"
                   :footer-props="{
                      'items-per-page-options': [25, 50, 100]
@@ -66,7 +66,7 @@
                     <!-- <create-metatype-key-dialog :metatype="metatype" @metatypeKeyCreated="loadKeys()"></create-metatype-key-dialog> -->
                   </v-toolbar>
                 </template>
-                <template v-slot:[`item.actions`]="{ item }">
+                <!-- <template v-slot:[`item.actions`]="{ item }">
                  <edit-node-property-dialog :propertyKey="item" :node="node" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-node-property-dialog>
                   <v-icon
                       small
@@ -74,7 +74,7 @@
                   >
                     mdi-delete
                   </v-icon>
-                </template>
+                </template> -->
               </v-data-table>
             </v-col>
           </v-row>
@@ -92,7 +92,7 @@
 
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {MetatypeKeyT, NodeT} from "../api/types";
+import {MetatypeKeyT, NodeT, PropertyT} from "../api/types";
 import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
 import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
 
@@ -112,22 +112,24 @@ export default class EditMetatypeDialog extends Vue {
   dialog = false
   selectedNode: NodeT | null  = null
   valid = false
+  nodeProperties: PropertyT[] = []
 
   // this way we only load the keys when the edit dialog is open, so we don't
   // overload someone using this in a list
   @Watch('dialog', {immediate: true})
   isDialogOpen() {
     if(this.dialog) {
-      this.loadKeys()
+      // this.loadKeys()
+      this.propertiesToArray()
     }
   }
 
   headers() {
     return  [
-      { text: this.$t('editMetatype.keyName'), value: 'name' },
-      { text: this.$t('editMetatype.keyDescription'), value: 'description'},
-      { text: this.$t('editMetatype.keyType'), value: 'data_type'},
-      { text: this.$t('editMetatype.actions'), value: 'actions', sortable: false }
+      { text: this.$t('editMetatype.keyName'), value: 'key'},
+      // { text: this.$t('editMetatype.keyDescription')},
+      // { text: this.$t('editMetatype.keyType'), value: 'type'},
+      // { text: this.$t('editMetatype.actions'), value: 'actions', sortable: false }
     ]
   }
 
@@ -136,47 +138,61 @@ export default class EditMetatypeDialog extends Vue {
     this.selectedNode = JSON.parse(JSON.stringify(this.node))
   }
 
-  editMetatype() {
-    this.$client.updateMetatype(this.selectedNode?.container_id!, this.selectedNode?.id!,
-        {"name": this.selectedNode?.metatype.name, "description": this.selectedNode?.metatype.description})
-        .then(result => {
-          if(!result) {
-            this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-          } else {
-            this.dialog = false
-            this.$emit('metatypeEdited')
-          }
-        })
-        .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  }
-
-  loadKeys() {
-    if(this.selectedNode) {
-      this.keysLoading = true
-      this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
-          .then(keys => {
-            if(this.selectedNode) {
-              this.selectedNode.properties = keys
-              this.keysLoading = false
-              this.$forceUpdate()
-            }
-          })
-          .catch(e => {
-            this.errorMessage = e
-            this.keysLoading = false
-          })
+  propertiesToArray() {
+    if (this.selectedNode) {
+      //   Object.entries(this.selectedNode.properties).forEach(([key, text]) => {
+      //     const object = {key: key, value: key, type: key} as PropertyT
+      //     this.nodeProperties.push(object)  
+      // })
+       for ( const key in this.selectedNode.properties) {
+        const object = {key: key, value: key, type: key} as PropertyT
+        this.nodeProperties.push(object)
+      }
     }
+   
   }
 
-  deleteKey(key: MetatypeKeyT) {
-    this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
-    .then(result => {
-      if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-
-      this.loadKeys()
-    })
-    .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  }
+  // editMetatype() {
+  //   this.$client.updateMetatype(this.selectedNode?.container_id!, this.selectedNode?.id!,
+  //       {"name": this.selectedNode?.metatype.name, "description": this.selectedNode?.metatype.description})
+  //       .then(result => {
+  //         if(!result) {
+  //           this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+  //         } else {
+  //           this.dialog = false
+  //           this.$emit('metatypeEdited')
+  //         }
+  //       })
+  //       .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  // }
+
+  // loadKeys() {
+  //   if(this.selectedNode) {
+  //     this.keysLoading = true
+  //     this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
+  //         .then(keys => {
+  //           if(this.selectedNode) {
+  //             this.selectedNode.properties = keys
+  //             this.keysLoading = false
+  //             this.$forceUpdate()
+  //           }
+  //         })
+  //         .catch(e => {
+  //           this.errorMessage = e
+  //           this.keysLoading = false
+  //         })
+  //   }
+  // }
+
+  // deleteKey(key: MetatypeKeyT) {
+  //   this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
+  //   .then(result => {
+  //     if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+
+  //     this.loadKeys()
+  //   })
+  //   .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  // }
 }
 
 </script>
diff --git a/AdminWebApp/src/views/DataTestCreation.vue b/AdminWebApp/src/views/DataTestCreation.vue
index 113372283..c62c4645d 100644
--- a/AdminWebApp/src/views/DataTestCreation.vue
+++ b/AdminWebApp/src/views/DataTestCreation.vue
@@ -32,7 +32,6 @@
                 >
             </create-node-dialog>
           </v-col>
-
           <v-col>
             <h2>{{$t('dataTestCreation.nodeTableTitle')}}</h2>
           </v-col>

From a668a267a615808890f9b09d8e197e24e9e08f3c Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Mon, 7 Feb 2022 08:33:56 -0700
Subject: [PATCH 09/31] nth node mapper, repo

---
 .../mappers/data_warehouse/data/node_mapper.ts     |  6 +++---
 .../data_warehouse/data/node_repository.ts         | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
index d06e012c8..1f2417b5c 100644
--- a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
@@ -1,7 +1,7 @@
 import Result from '../../../../common_classes/result';
 import Mapper from '../../mapper';
 import {PoolClient, QueryConfig} from 'pg';
-import Node from '../../../../domain_objects/data_warehouse/data/node';
+import Node, {NodeLeaf} from '../../../../domain_objects/data_warehouse/data/node';
 import {NodeFile} from '../../../../domain_objects/data_warehouse/data/file';
 
 const format = require('pg-format');
@@ -109,10 +109,10 @@ export default class NodeMapper extends Mapper {
     }
 
     // This should return a node and all connected nodes and connecting edges for n layers.
-    public async RetrieveNthNodes(id: string, depth: string, transaction?: PoolClient): Promise<Result<Node[]>> {
+    public async RetrieveNthNodes(id: string, depth: string, transaction?: PoolClient): Promise<Result<NodeLeaf[]>> {
         return super.rows(this.retrieveNthNodesStatement(id, depth), {
             transaction,
-            resultClass,
+            resultClass: NodeLeaf,
         });
     }
 
diff --git a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
index dd9aa7226..5990e47aa 100644
--- a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
@@ -1,5 +1,5 @@
 import RepositoryInterface, {QueryOptions, Repository} from '../../repository';
-import Node from '../../../../domain_objects/data_warehouse/data/node';
+import Node, {NodeLeaf} from '../../../../domain_objects/data_warehouse/data/node';
 import Result from '../../../../common_classes/result';
 import NodeMapper from '../../../mappers/data_warehouse/data/node_mapper';
 import {PoolClient} from 'pg';
@@ -57,10 +57,12 @@ export default class NodeRepository extends Repository implements RepositoryInte
     }
 
     // This should return a node and all connected nodes and connecting edges for n layers.
-    // TODO: should return list of nodes and edges (new result type??)
-    async findNthNodesByID(id: string, depth: string, transaction?: PoolClient): Promise<Result<Node[]>> {
-        // need help here
-        return Promise.resolve(x);
+    findNthNodesByID(id: string, depth: string): Promise<Result<NodeLeaf[]>> {
+        if (!id) {
+            return Promise.resolve(Result.Failure('must supply root node id'));
+        }
+
+        return this.#mapper.RetrieveNthNodes(id, depth);
     }
 
     async save(n: Node, user: User, transaction?: PoolClient): Promise<Result<boolean>> {
@@ -316,7 +318,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         return this;
     }
 
-    // properties for n layer node query:
+    // properties for nth layer node query:
     depth(operator: string, value: any) {
         super.query('depth', operator, value);
         return this;

From 338f9a4c72f366d8ea868c9833763a2863680e87 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Wed, 9 Feb 2022 12:26:21 -0700
Subject: [PATCH 10/31] update graph routes for nth node query

---
 .../routes/data_warehouse/data/graph_routes.ts      | 13 ++++++++++++-
 src/typings/express/index.d.ts                      |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/http_server/routes/data_warehouse/data/graph_routes.ts b/src/http_server/routes/data_warehouse/data/graph_routes.ts
index 5cd8e9a88..7c977ed65 100644
--- a/src/http_server/routes/data_warehouse/data/graph_routes.ts
+++ b/src/http_server/routes/data_warehouse/data/graph_routes.ts
@@ -99,7 +99,18 @@ export default class GraphRoutes {
 
     // This should return a node and all connected nodes and connecting edges for n layers.
     private static retrieveNthNodes(req: Request, res: Response, next: NextFunction) {
-        // need help here
+        if (req.nodeLeaf) {
+            nodeRepo
+                .findNthNodesByID(req.nodeLeaf.origin_id!, req.nodeLeaf.depth!)
+                .then((result) => {
+                    result.asResponse(res);
+                })
+                .catch((err) => res.status(500).send(err))
+                .finally(() => next());
+        } else {
+            Result.Failure(`node not found`, 404).asResponse(res);
+            next();
+        }
     }
 
     private static retrieveEdge(req: Request, res: Response, next: NextFunction) {
diff --git a/src/typings/express/index.d.ts b/src/typings/express/index.d.ts
index 3c1d342fb..efa5073e2 100644
--- a/src/typings/express/index.d.ts
+++ b/src/typings/express/index.d.ts
@@ -7,7 +7,7 @@ import MetatypeKey from '../../domain_objects/data_warehouse/ontology/metatype_k
 import MetatypeRelationshipKey from '../../domain_objects/data_warehouse/ontology/metatype_relationship_key';
 import {User as DLUser} from '../../domain_objects/access_management/user';
 import {OAuthApplication} from '../../domain_objects/access_management/oauth/oauth';
-import Node from '../../domain_objects/data_warehouse/data/node';
+import Node, { NodeLeaf } from '../../domain_objects/data_warehouse/data/node';
 import Edge from '../../domain_objects/data_warehouse/data/edge';
 import TypeMapping from '../../domain_objects/data_warehouse/etl/type_mapping';
 import TypeTransformation from '../../domain_objects/data_warehouse/etl/type_transformation';
@@ -51,6 +51,8 @@ declare global {
             task?: TaskRecord;
             changelist?: Changelist;
             ontologyVersion?: OntologyVersion;
+            // needed for nth-node request
+            nodeLeaf?: NodeLeaf;
         }
     }
 }

From 71e6616d85a1df4d25871f13b45a71c1b192d095 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Thu, 17 Feb 2022 09:32:40 -0700
Subject: [PATCH 11/31] merge with current_nodes bugfix

---
 .../018_order_current_node_edge.sql           | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/data_access_layer/migrations/018_order_current_node_edge.sql

diff --git a/src/data_access_layer/migrations/018_order_current_node_edge.sql b/src/data_access_layer/migrations/018_order_current_node_edge.sql
new file mode 100644
index 000000000..e00e4beb3
--- /dev/null
+++ b/src/data_access_layer/migrations/018_order_current_node_edge.sql
@@ -0,0 +1,60 @@
+/*
+The views were selecting distinct without ordering by created_at, causing a "random"
+selection. Adding order by created_at
+ */
+DROP VIEW IF EXISTS current_nodes;
+DROP VIEW IF EXISTS current_edges;
+
+CREATE VIEW current_nodes AS (
+    SELECT DISTINCT ON (id) nodes.id,
+         nodes.container_id,
+         nodes.metatype_id,
+         nodes.data_source_id,
+         nodes.import_data_id,
+         nodes.data_staging_id,
+         nodes.type_mapping_transformation_id,
+         nodes.original_data_id,
+         nodes.properties,
+         nodes.metadata,
+         nodes.created_at,
+         nodes.modified_at,
+         nodes.deleted_at,
+         nodes.created_by,
+         nodes.modified_by,
+         metatypes.name AS metatype_name
+    FROM nodes
+        LEFT JOIN metatypes ON metatypes.id = nodes.metatype_id
+    WHERE nodes.deleted_at IS NULL
+    ORDER BY nodes.id, nodes.created_at DESC
+);
+
+CREATE VIEW current_edges AS (
+    SELECT DISTINCT ON (id) edges.id,
+        edges.container_id,
+        edges.relationship_pair_id,
+        edges.data_source_id,
+        edges.import_data_id,
+        edges.data_staging_id,
+        edges.type_mapping_transformation_id,
+        edges.origin_id,
+        edges.destination_id,
+        edges.origin_original_id,
+        edges.origin_data_source_id,
+        edges.origin_metatype_id,
+        edges.destination_original_id,
+        edges.destination_data_source_id,
+        edges.destination_metatype_id,
+        edges.properties,
+        edges.metadata,
+        edges.created_at,
+        edges.modified_at,
+        edges.deleted_at,
+        edges.created_by,
+        edges.modified_by,
+        metatype_relationships.name AS metatype_relationship_name
+    FROM edges
+     LEFT JOIN metatype_relationship_pairs ON edges.relationship_pair_id = metatype_relationship_pairs.id
+          LEFT JOIN metatype_relationships ON metatype_relationship_pairs.relationship_id = metatype_relationships.id
+    WHERE edges.deleted_at IS NULL
+    ORDER BY edges.id, edges.created_at DESC
+);
\ No newline at end of file

From c9056a8175fbf2798111efc2915ad4dd5ba2f27d Mon Sep 17 00:00:00 2001
From: Jeren Browning <jeren.browning@inl.gov>
Date: Fri, 18 Feb 2022 15:54:33 -0700
Subject: [PATCH 12/31] Move from bcrypt to bcryptjs, fix file upload specs in
 swagger

---
 .../Core.swagger_collection.yaml              |   9 +-
 package-lock.json                             | 456 ++----------------
 package.json                                  |   4 +-
 .../access_management/keypair_repository.ts   |   2 +-
 .../access_management/oauth_repository.ts     |   4 +-
 .../access_management/user_repository.ts      |   4 +-
 .../access_management/oauth/oauth.ts          |   2 +-
 src/domain_objects/access_management/user.ts  |   2 +-
 src/http_server/authentication/local.ts       |   2 +-
 9 files changed, 63 insertions(+), 422 deletions(-)

diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
index e3143c054..561e70f0d 100644
--- a/API Documentation/Core.swagger_collection.yaml	
+++ b/API Documentation/Core.swagger_collection.yaml	
@@ -1976,7 +1976,7 @@ paths:
       description: |-
         Uploads a file and it's metadata to Deep Lynx. All additional fields on the multipart form will be processed and added as metadata to the file upload itself. 
 
-        If you include a file field and call that "metadata" - you can include a normal metadata upload as either a json, csv, or xml file. This data will be processed like a normal import and the files attached to the processed data. Once Deep Lynx generates nodes and edges from that data, any files attached will automatically be attached to the resulting nodes/edges as well.
+        This should be a collection of files and normal fields. If you include a file field and call that "metadata" - you can include a normal metadata upload as either a json, csv, or xml file. This data will be processed like a normal import and the files attached to the processed data. Once Deep Lynx generates nodes and edges from that data, any files attached will automatically be attached to the resulting nodes/edges as well.
 
         NOTE: The metadata file you upload, if json, must be wrapped in an array. If you do not pass in an array of objects, even if it's a single object, then Deep Lynx will attempt to split up your metadata into its parts instead of treating it like a whole object.
       operationId: UploadFile
@@ -2012,6 +2012,10 @@ paths:
               properties:
                 file:
                   type: string
+                  format: binary
+                metadata:
+                  type: string
+                  format: binary
         description: |-
           This should be a collection of files and normal fields. If you include a file field and call that "metadata" - you can include a normal metadata upload as either a json, csv, or xml file. This data will be processed like a normal import and the files attached to the processed data. Once Deep Lynx generates nodes and edges from that data, any files attached will automatically be attached to the resulting nodes/edges as well.
 
@@ -2777,6 +2781,7 @@ paths:
               properties:
                 file:
                   type: string
+                  format: binary
   '/containers/{container_id}/import/datasources/{data_source_id}/mappings/{mapping_id}/transformations':
     get:
       tags:
@@ -3185,6 +3190,7 @@ paths:
               properties:
                 file:
                   type: string
+                  format: binary
   /events:
     post:
       tags:
@@ -5091,6 +5097,7 @@ components:
           minLength: 1
         file:
           type: string
+          format: binary
           minLength: 1
       required:
         - name
diff --git a/package-lock.json b/package-lock.json
index cb20373e4..7324912b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
                 "amqplib": "^0.8.0",
                 "axios": "^0.21.1",
                 "base64url": "^3.0.1",
-                "bcrypt": "^5.0.1",
+                "bcryptjs": "^2.4.3",
                 "body-parser": "^1.19.0",
                 "bree": "^7.1.2",
                 "buffer": "^6.0.3",
@@ -82,7 +82,7 @@
             },
             "devDependencies": {
                 "@azure/storage-blob": "12.1.2",
-                "@types/bcrypt": "^3.0.0",
+                "@types/bcryptjs": "^2.4.2",
                 "@types/busboy": "^0.2.3",
                 "@types/chai": "^4.2.22",
                 "@types/connect-pg-simple": "^4.2.2",
@@ -1147,25 +1147,6 @@
                 "node": ">=8.3"
             }
         },
-        "node_modules/@mapbox/node-pre-gyp": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
-            "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==",
-            "dependencies": {
-                "detect-libc": "^1.0.3",
-                "https-proxy-agent": "^5.0.0",
-                "make-dir": "^3.1.0",
-                "node-fetch": "^2.6.5",
-                "nopt": "^5.0.0",
-                "npmlog": "^5.0.1",
-                "rimraf": "^3.0.2",
-                "semver": "^7.3.5",
-                "tar": "^6.1.11"
-            },
-            "bin": {
-                "node-pre-gyp": "bin/node-pre-gyp"
-            }
-        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1265,10 +1246,10 @@
                 "@types/node": "*"
             }
         },
-        "node_modules/@types/bcrypt": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-3.0.1.tgz",
-            "integrity": "sha512-SwBrq5wb6jXP0o3O3jStdPWbKpimTImfdFD/OZE3uW+jhGpds/l5wMX9lfYOTDOa5Bod2QmOgo9ln+tMp2XP/w==",
+        "node_modules/@types/bcryptjs": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz",
+            "integrity": "sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==",
             "dev": true
         },
         "node_modules/@types/bluebird": {
@@ -1833,7 +1814,8 @@
         "node_modules/abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "dev": true
         },
         "node_modules/accepts": {
             "version": "1.3.8",
@@ -2032,50 +2014,12 @@
                 "node": ">=8"
             }
         },
-        "node_modules/aproba": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-        },
         "node_modules/archy": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
             "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
             "dev": true
         },
-        "node_modules/are-we-there-yet": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-            "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-            "dependencies": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^3.6.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/are-we-there-yet/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/are-we-there-yet/node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
         "node_modules/arg": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
@@ -2203,18 +2147,10 @@
                 "node": ">=6.0.0"
             }
         },
-        "node_modules/bcrypt": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-            "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "@mapbox/node-pre-gyp": "^1.0.0",
-                "node-addon-api": "^3.1.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            }
+        "node_modules/bcryptjs": {
+            "version": "2.4.3",
+            "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+            "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
         },
         "node_modules/binary-extensions": {
             "version": "2.2.0",
@@ -2679,14 +2615,6 @@
                 "fsevents": "~2.3.2"
             }
         },
-        "node_modules/chownr": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/ci-info": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@@ -2834,14 +2762,6 @@
                 "simple-swizzle": "^0.2.2"
             }
         },
-        "node_modules/color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-            "bin": {
-                "color-support": "bin.js"
-            }
-        },
         "node_modules/color/node_modules/color-convert": {
             "version": "1.9.3",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -2949,11 +2869,6 @@
                 "pg-types": "^2.2.0"
             }
         },
-        "node_modules/console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-        },
         "node_modules/content-disposition": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -3395,11 +3310,6 @@
                 "node": ">=0.4.0"
             }
         },
-        "node_modules/delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-        },
         "node_modules/denque": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
@@ -3421,17 +3331,6 @@
             "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
             "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
         },
-        "node_modules/detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-            "bin": {
-                "detect-libc": "bin/detect-libc.js"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
         "node_modules/dev-null": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
@@ -4818,17 +4717,6 @@
                 }
             ]
         },
-        "node_modules/fs-minipass": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-            "dependencies": {
-                "minipass": "^3.0.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
         "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -4859,25 +4747,6 @@
             "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
             "dev": true
         },
-        "node_modules/gauge": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-            "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-            "dependencies": {
-                "aproba": "^1.0.3 || ^2.0.0",
-                "color-support": "^1.1.2",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.1",
-                "object-assign": "^4.1.1",
-                "signal-exit": "^3.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1",
-                "wide-align": "^1.1.2"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -5193,11 +5062,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-        },
         "node_modules/has-yarn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
@@ -7005,6 +6869,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
             "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -7016,6 +6881,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
             "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
             "dependencies": {
                 "semver": "^6.0.0"
             },
@@ -7030,6 +6896,7 @@
             "version": "6.3.0",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
             "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -7180,29 +7047,6 @@
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
             "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         },
-        "node_modules/minipass": {
-            "version": "3.1.6",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
-            "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/minizlib": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-            "dependencies": {
-                "minipass": "^3.0.0",
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
         "node_modules/mixme": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.4.tgz",
@@ -7408,11 +7252,6 @@
                 "node": ">=4.0.0"
             }
         },
-        "node_modules/node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-        },
         "node_modules/node-cache": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
@@ -7623,20 +7462,6 @@
                 "string_decoder": "~0.10.x"
             }
         },
-        "node_modules/nopt": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-            "dependencies": {
-                "abbrev": "1"
-            },
-            "bin": {
-                "nopt": "bin/nopt.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -7676,17 +7501,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/npmlog": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-            "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-            "dependencies": {
-                "are-we-there-yet": "^2.0.0",
-                "console-control-strings": "^1.1.0",
-                "gauge": "^3.0.0",
-                "set-blocking": "^2.0.0"
-            }
-        },
         "node_modules/numbered": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/numbered/-/numbered-1.1.0.tgz",
@@ -9045,6 +8859,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -9159,6 +8974,7 @@
             "version": "7.3.5",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
             "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+            "dev": true,
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -9258,7 +9074,8 @@
         "node_modules/set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+            "dev": true
         },
         "node_modules/setprototypeof": {
             "version": "1.2.0",
@@ -9302,7 +9119,8 @@
         "node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
         },
         "node_modules/simple-swizzle": {
             "version": "0.2.2",
@@ -9646,22 +9464,6 @@
                 "url": "https://github.com/chalk/slice-ansi?sponsor=1"
             }
         },
-        "node_modules/tar": {
-            "version": "6.1.11",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-            "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-            "dependencies": {
-                "chownr": "^2.0.0",
-                "fs-minipass": "^2.0.0",
-                "minipass": "^3.0.0",
-                "minizlib": "^2.1.1",
-                "mkdirp": "^1.0.3",
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">= 10"
-            }
-        },
         "node_modules/tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -10349,14 +10151,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "dependencies": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
-            }
-        },
         "node_modules/widest-line": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -10632,7 +10426,8 @@
         "node_modules/yallist": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
         },
         "node_modules/yaml": {
             "version": "1.10.2",
@@ -11561,22 +11356,6 @@
                 "debug": "^4.3.3"
             }
         },
-        "@mapbox/node-pre-gyp": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
-            "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==",
-            "requires": {
-                "detect-libc": "^1.0.3",
-                "https-proxy-agent": "^5.0.0",
-                "make-dir": "^3.1.0",
-                "node-fetch": "^2.6.5",
-                "nopt": "^5.0.0",
-                "npmlog": "^5.0.1",
-                "rimraf": "^3.0.2",
-                "semver": "^7.3.5",
-                "tar": "^6.1.11"
-            }
-        },
         "@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -11649,10 +11428,10 @@
                 "@types/node": "*"
             }
         },
-        "@types/bcrypt": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-3.0.1.tgz",
-            "integrity": "sha512-SwBrq5wb6jXP0o3O3jStdPWbKpimTImfdFD/OZE3uW+jhGpds/l5wMX9lfYOTDOa5Bod2QmOgo9ln+tMp2XP/w==",
+        "@types/bcryptjs": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz",
+            "integrity": "sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==",
             "dev": true
         },
         "@types/bluebird": {
@@ -12138,7 +11917,8 @@
         "abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "dev": true
         },
         "accepts": {
             "version": "1.3.8",
@@ -12282,46 +12062,12 @@
                 "default-require-extensions": "^3.0.0"
             }
         },
-        "aproba": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-        },
         "archy": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
             "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
             "dev": true
         },
-        "are-we-there-yet": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-            "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-            "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^3.6.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                },
-                "string_decoder": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-                    "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-                    "requires": {
-                        "safe-buffer": "~5.2.0"
-                    }
-                }
-            }
-        },
         "arg": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
@@ -12417,14 +12163,10 @@
             "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
             "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
         },
-        "bcrypt": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-            "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
-            "requires": {
-                "@mapbox/node-pre-gyp": "^1.0.0",
-                "node-addon-api": "^3.1.0"
-            }
+        "bcryptjs": {
+            "version": "2.4.3",
+            "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+            "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
         },
         "binary-extensions": {
             "version": "2.2.0",
@@ -12785,11 +12527,6 @@
                 "readdirp": "~3.6.0"
             }
         },
-        "chownr": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-        },
         "ci-info": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@@ -12922,11 +12659,6 @@
                 "simple-swizzle": "^0.2.2"
             }
         },
-        "color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-        },
         "colorette": {
             "version": "2.0.16",
             "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
@@ -13011,11 +12743,6 @@
                 }
             }
         },
-        "console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-        },
         "content-disposition": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -13362,11 +13089,6 @@
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
         },
-        "delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-        },
         "denque": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
@@ -13382,11 +13104,6 @@
             "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
             "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
         },
-        "detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
-        },
         "dev-null": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
@@ -14437,14 +14154,6 @@
             "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
             "dev": true
         },
-        "fs-minipass": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-            "requires": {
-                "minipass": "^3.0.0"
-            }
-        },
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -14468,22 +14177,6 @@
             "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
             "dev": true
         },
-        "gauge": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-            "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-            "requires": {
-                "aproba": "^1.0.3 || ^2.0.0",
-                "color-support": "^1.1.2",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.1",
-                "object-assign": "^4.1.1",
-                "signal-exit": "^3.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1",
-                "wide-align": "^1.1.2"
-            }
-        },
         "gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -14701,11 +14394,6 @@
                 "has-symbols": "^1.0.2"
             }
         },
-        "has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-        },
         "has-yarn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
@@ -16021,6 +15709,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
             "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
             "requires": {
                 "yallist": "^4.0.0"
             }
@@ -16029,6 +15718,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
             "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
             "requires": {
                 "semver": "^6.0.0"
             },
@@ -16036,7 +15726,8 @@
                 "semver": {
                     "version": "6.3.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
                 }
             }
         },
@@ -16152,23 +15843,6 @@
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
             "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         },
-        "minipass": {
-            "version": "3.1.6",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
-            "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
-        "minizlib": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-            "requires": {
-                "minipass": "^3.0.0",
-                "yallist": "^4.0.0"
-            }
-        },
         "mixme": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.4.tgz",
@@ -16318,11 +15992,6 @@
             "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
             "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
         },
-        "node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-        },
         "node-cache": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
@@ -16489,14 +16158,6 @@
                 }
             }
         },
-        "nopt": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-            "requires": {
-                "abbrev": "1"
-            }
-        },
         "normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -16526,17 +16187,6 @@
                 }
             }
         },
-        "npmlog": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-            "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-            "requires": {
-                "are-we-there-yet": "^2.0.0",
-                "console-control-strings": "^1.1.0",
-                "gauge": "^3.0.0",
-                "set-blocking": "^2.0.0"
-            }
-        },
         "numbered": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/numbered/-/numbered-1.1.0.tgz",
@@ -17562,6 +17212,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
             "requires": {
                 "glob": "^7.1.3"
             }
@@ -17632,6 +17283,7 @@
             "version": "7.3.5",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
             "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+            "dev": true,
             "requires": {
                 "lru-cache": "^6.0.0"
             }
@@ -17719,7 +17371,8 @@
         "set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+            "dev": true
         },
         "setprototypeof": {
             "version": "1.2.0",
@@ -17754,7 +17407,8 @@
         "signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
         },
         "simple-swizzle": {
             "version": "0.2.2",
@@ -18021,19 +17675,6 @@
                 }
             }
         },
-        "tar": {
-            "version": "6.1.11",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-            "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-            "requires": {
-                "chownr": "^2.0.0",
-                "fs-minipass": "^2.0.0",
-                "minipass": "^3.0.0",
-                "minizlib": "^2.1.1",
-                "mkdirp": "^1.0.3",
-                "yallist": "^4.0.0"
-            }
-        },
         "tarn": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz",
@@ -18573,14 +18214,6 @@
                 "is-typed-array": "^1.1.7"
             }
         },
-        "wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "requires": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
-            }
-        },
         "widest-line": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -18802,7 +18435,8 @@
         "yallist": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
         },
         "yaml": {
             "version": "1.10.2",
diff --git a/package.json b/package.json
index aa6563763..669fdcf3c 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     },
     "devDependencies": {
         "@azure/storage-blob": "12.1.2",
-        "@types/bcrypt": "^3.0.0",
+        "@types/bcryptjs": "^2.4.2",
         "@types/busboy": "^0.2.3",
         "@types/chai": "^4.2.22",
         "@types/connect-pg-simple": "^4.2.2",
@@ -98,7 +98,7 @@
         "amqplib": "^0.8.0",
         "axios": "^0.21.1",
         "base64url": "^3.0.1",
-        "bcrypt": "^5.0.1",
+        "bcryptjs": "^2.4.3",
         "body-parser": "^1.19.0",
         "bree": "^7.1.2",
         "buffer": "^6.0.3",
diff --git a/src/data_access_layer/repositories/access_management/keypair_repository.ts b/src/data_access_layer/repositories/access_management/keypair_repository.ts
index 01b5725a4..0dfba48bb 100644
--- a/src/data_access_layer/repositories/access_management/keypair_repository.ts
+++ b/src/data_access_layer/repositories/access_management/keypair_repository.ts
@@ -1,5 +1,5 @@
 import KeyPairMapper from '../../mappers/access_management/keypair_mapper';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import RepositoryInterface from '../repository';
 import { KeyPair, User } from '../../../domain_objects/access_management/user';
 import Result from '../../../common_classes/result';
diff --git a/src/data_access_layer/repositories/access_management/oauth_repository.ts b/src/data_access_layer/repositories/access_management/oauth_repository.ts
index 712f8998e..040a11551 100644
--- a/src/data_access_layer/repositories/access_management/oauth_repository.ts
+++ b/src/data_access_layer/repositories/access_management/oauth_repository.ts
@@ -5,7 +5,7 @@ import Result from '../../../common_classes/result';
 import {v4 as uuidv4} from 'uuid';
 import Cache from '../../../services/cache/cache';
 import UserRepository from './user_repository';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import jwt from 'jsonwebtoken';
 import {classToPlain, plainToClass} from 'class-transformer';
 import Config from '../../../services/config';
@@ -173,7 +173,7 @@ export default class OAuthRepository extends Repository implements RepositoryInt
             const application = await OAuthMapper.Instance.Retrieve(exchangeReq.client_id!);
             if (application.isError) return new Promise((resolve) => resolve(Result.Pass(application)));
 
-            const valid = await bcrypt.compare(exchangeReq.client_secret, application.value.client_secret!);
+            const valid = await bcrypt.compare(exchangeReq.client_secret!, application.value.client_secret!);
 
             if (!valid) return new Promise((resolve) => resolve(Result.Failure('invalid client')));
         }
diff --git a/src/data_access_layer/repositories/access_management/user_repository.ts b/src/data_access_layer/repositories/access_management/user_repository.ts
index e18f7b565..7a3d08464 100644
--- a/src/data_access_layer/repositories/access_management/user_repository.ts
+++ b/src/data_access_layer/repositories/access_management/user_repository.ts
@@ -1,7 +1,7 @@
 import RepositoryInterface, {QueryOptions, Repository} from '../repository';
 import {AssignUserRolePayload, ContainerUserInvite, KeyPair, ResetUserPasswordPayload, User} from '../../../domain_objects/access_management/user';
 import Result, {ErrorUnauthorized} from '../../../common_classes/result';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import UserMapper from '../../mappers/access_management/user_mapper';
 import Logger from '../../../services/logger';
 import {Emailer} from '../../../services/email/email';
@@ -269,7 +269,7 @@ export default class UserRepository extends Repository implements RepositoryInte
         if (errors) return Promise.resolve(Result.Failure(`reset user password payload fails validation ${errors.join(',')}`));
 
         return new Promise((resolve) => {
-            void bcrypt.hash(payload.new_password, 14).then((hashed) => {
+            void bcrypt.hash(payload.new_password!, 14).then((hashed) => {
                 resolve(UserMapper.Instance.ResetPassword(payload.token!, payload.email!, hashed));
             });
         });
diff --git a/src/domain_objects/access_management/oauth/oauth.ts b/src/domain_objects/access_management/oauth/oauth.ts
index a2be22c9b..390c055ea 100644
--- a/src/domain_objects/access_management/oauth/oauth.ts
+++ b/src/domain_objects/access_management/oauth/oauth.ts
@@ -2,7 +2,7 @@ import {BaseDomainClass} from '../../../common_classes/base_domain_class';
 import {IsIn, IsOptional, IsString, IsUrl, IsUUID} from 'class-validator';
 import {v4 as uuidv4} from 'uuid';
 import Result from '../../../common_classes/result';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import {User} from '../user';
 import {Exclude} from 'class-transformer';
 
diff --git a/src/domain_objects/access_management/user.ts b/src/domain_objects/access_management/user.ts
index f67f2ed31..dd6343c8d 100644
--- a/src/domain_objects/access_management/user.ts
+++ b/src/domain_objects/access_management/user.ts
@@ -17,7 +17,7 @@ import Config from '../../services/config';
 import {v4 as uuidv4} from 'uuid';
 import {Exclude, Expose, plainToClass, Transform, Type} from 'class-transformer';
 import Container from '../data_warehouse/ontology/container';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import Result from '../../common_classes/result';
 const validator = require('validator');
 
diff --git a/src/http_server/authentication/local.ts b/src/http_server/authentication/local.ts
index c1876e430..e39a3be78 100644
--- a/src/http_server/authentication/local.ts
+++ b/src/http_server/authentication/local.ts
@@ -2,7 +2,7 @@ import express from 'express';
 import passport from 'passport';
 import {Strategy} from 'passport-local';
 import UserMapper from '../../data_access_layer/mappers/access_management/user_mapper';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import Logger from '../../services/logger';
 import {classToPlain} from 'class-transformer';
 import OAuthRepository from '../../data_access_layer/repositories/access_management/oauth_repository';

From 767646ce6102d96f8f1ce5e716869b35f9ad0886 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Mon, 21 Feb 2022 14:55:30 -0700
Subject: [PATCH 13/31] cleaned code and smashed errors

---
 .../src/components/createNodeDialog.vue       |  39 ++--
 AdminWebApp/src/components/editNodeDialog.vue | 107 ++--------
 .../src/components/editNodePropertyDialog.vue | 199 ------------------
 AdminWebApp/src/translations.ts               |  15 ++
 AdminWebApp/src/views/DataTestCreation.vue    |   8 +-
 5 files changed, 52 insertions(+), 316 deletions(-)
 delete mode 100644 AdminWebApp/src/components/editNodePropertyDialog.vue

diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index 3b30397df..5661338d9 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" max-width="60%">
+  <v-dialog v-model="dialog" min-width="60%" max-width="60%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
@@ -13,12 +13,10 @@
         <span class="headline">{{$t("createNode.formTitle")}}</span>
         <error-banner :message="errorMessage"></error-banner>
       </v-card-title>
-
       <v-card-text>
         <v-container>
           <v-row>
             <v-col :cols="12">
-
               <v-form
                   ref="form"
                   v-model="valid"
@@ -46,7 +44,8 @@
                   <v-col :cols="12">
                     <v-data-table
                         :items="metatype.keys"
-                        :items-per-page="100"
+                        :disable-pagination="true"
+                        :hide-default-footer="true"
                         v-if="optional === true"
                     >
                       <template v-slot:[`item`]="{ item }">
@@ -117,6 +116,7 @@ export default class CreateNodeDialog extends Vue {
 
   @Watch('metatype', {immediate: true})
   onMetatypeSelect(){
+    if (this.metatype.id !== undefined && this.metatype.id !== null)
       this.$client.listMetatypeKeys(this.containerID, this.metatype.id)
       .then((keys) => {
         this.metatype.keys = keys
@@ -124,21 +124,22 @@ export default class CreateNodeDialog extends Vue {
   }
 
   newNode() {
-    this.setProperties()
-    this.$client.createNode(this.containerID,
-      {
-        "container_id": this.containerID,
-        "data_source_id": this.dataSourceID,
-        "metatype_id": this.metatype.id,
-        "properties": this.property,
-        "original_data_id": "1" // set a default original_data_id value to enable future queries
-      }
-    )
-        .then(results => {
-          this.dialog = false
-          this.$emit('nodeCreated', results[0])
-        })
-        .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
+    if (this.metatype.id !== undefined && this.metatype.id !== null){
+      this.setProperties()
+      this.$client.createNode(this.containerID,
+        {
+          "container_id": this.containerID,
+          "data_source_id": this.dataSourceID,
+          "metatype_id": this.metatype.id,
+          "properties": this.property,
+        }
+      )
+          .then(results => {
+            this.dialog = false
+            this.$emit('nodeCreated', results[0])
+          })
+          .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
+    }
   }
 
   // Fill the property object with values from the metatype keys before sending the createNode query
diff --git a/AdminWebApp/src/components/editNodeDialog.vue b/AdminWebApp/src/components/editNodeDialog.vue
index d91bdf473..201534fbf 100644
--- a/AdminWebApp/src/components/editNodeDialog.vue
+++ b/AdminWebApp/src/components/editNodeDialog.vue
@@ -7,50 +7,42 @@
           class="mr-2"
           v-on="on"
       >mdi-pencil</v-icon>
-      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editMetatype.editMetatype")}}</v-btn>
+      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editNode.editNode")}}</v-btn>
     </template>
-
     <v-card v-if="selectedNode">
       <v-card-text>
         <v-container>
           <error-banner :message="errorMessage"></error-banner>
-          <span class="headline">{{$t('editMetatype.edit')}} {{selectedNode.metatype.name}}</span>
+          <span class="headline">{{$t('editNode.edit')}} {{selectedNode.metatype.name}}</span>
           <v-row>
             <v-col :cols="12">
-
               <v-form
                   ref="form"
                   v-model="valid"
               >
                 <v-text-field
                     v-model="selectedNode.metatype.name"
-                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    :rules="[v => !!v || $t('editNode.nameRequired')]"
                     required
                 >
-                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                  <template v-slot:label>{{$t("editNode.name")}} <small style="color:red" >*</small></template>
                 </v-text-field>
                 <v-textarea
                     v-model="selectedNode.metatype.description"
-                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
+                    :rules="[v => !!v || $t('editNode.descriptionRequired')]"
                     required
                 >
-                  <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
+                  <template v-slot:label>{{$t('editNode.description')}} <small style="color:red" >*</small></template>
                 </v-textarea>
               </v-form>
-              <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
-            </v-col>
-
-            <v-col :cols="12" v-if="keysLoading">
-              <v-progress-linear indeterminate></v-progress-linear>
+              <p><span style="color:red">*</span> = {{$t('editNode.requiredField')}}</p>
             </v-col>
             <v-col :cols="12">
               <v-data-table
                   :headers="headers()"
                   :items="nodeProperties"
-                  :items-per-page="100"
-                  :footer-props="{
-                     'items-per-page-options': [25, 50, 100]
-                  }"
+                  :disable-pagination="true"
+                  :hide-default-footer="true"
                   class="elevation-1"
               >
                 <template v-slot:top>
@@ -62,7 +54,6 @@
                         vertical
                     ></v-divider>
                     <v-spacer></v-spacer>
-                    <!-- <create-metatype-key-dialog :metatype="metatype" @metatypeKeyCreated="loadKeys()"></create-metatype-key-dialog> -->
                   </v-toolbar>
                 </template>
                 <template v-slot:[`item.value`]="value">
@@ -78,25 +69,15 @@
                     </template>
                   </v-edit-dialog>
                 </template>
-                <!-- <template v-slot:[`item.actions`]="{ item }">
-                 <edit-node-property-dialog :propertyKey="item" :node="node" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-node-property-dialog>
-                  <v-icon
-                      small
-                      @click="deleteKey(item)"
-                  >
-                    mdi-delete
-                  </v-icon>
-                </template> -->
               </v-data-table>
             </v-col>
           </v-row>
         </v-container>
       </v-card-text>
-
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editMetatype.cancel")}}</v-btn>
-        <v-btn color="blue darken-1" :disabled="!valid" text @click="updateNode()">{{$t("editMetatype.save")}}</v-btn>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editNode.cancel")}}</v-btn>
+        <v-btn color="blue darken-1" :disabled="!valid" text @click="updateNode()">{{$t("editNode.save")}}</v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
@@ -105,14 +86,9 @@
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
 import {NodeT, PropertyT} from "../api/types";
-import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
-import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
 
-@Component({components: {
-    EditMetatypeKeyDialog,
-    CreateMetatypeKeyDialog
-  }})
-export default class EditMetatypeDialog extends Vue {
+@Component({components: {}})
+export default class EditNodeDialog extends Vue {
   @Prop({required: true})
   node!: NodeT;
 
@@ -126,32 +102,24 @@ export default class EditMetatypeDialog extends Vue {
   readonly icon!: boolean
 
   errorMessage = ""
-  keysLoading = false
   dialog = false
   selectedNode: NodeT | null  = null
   valid = false
   nodeProperties: PropertyT[] = []
   property = {}
 
-  // this way we only load the keys when the edit dialog is open, so we don't
-  // overload someone using this in a list
+  // load properties to array when the node is selected so that we can edit fields.
   @Watch('dialog', {immediate: true})
   isDialogOpen() {
     if(this.dialog) {
-      // this.loadKeys()
       this.propertiesToArray()
     } 
-    // else {
-    //   close()
-    // }
   }
 
   headers() {
     return  [
       { text: this.$t('editNode.keyName'), value: 'key'},
       { text: this.$t('editNode.value'), value: 'value'},
-      // { text: this.$t('editNode.keyType'), value: 'type'},
-      // { text: this.$t('editNode.actions'), value: 'actions', sortable: false }
     ]
   }
 
@@ -171,19 +139,6 @@ export default class EditMetatypeDialog extends Vue {
    
   }
 
-  // editMetatype() {
-  //   this.$client.createNode(this.selectedNode?.container_id!, this.selectedNode?.id!,)
-  //       .then(result => {
-  //         if(!result) {
-  //           this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-  //         } else {
-  //           this.dialog = false
-  //           this.$emit('metatypeEdited')
-  //         }
-  //       })
-  //       .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  // }
-
   setProperties() {
     this.property = {}
     const entries: { [key: string]: any } = {}
@@ -215,42 +170,10 @@ export default class EditMetatypeDialog extends Vue {
     )
       .then(results => {
         this.dialog = false
-        this.$emit('nodeUpdated')
+        this.$emit('nodeUpdated', results[0])
       })
       .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
   }
-
-  // close() {
-
-  // }
-
-  // loadKeys() {
-  //   if(this.selectedNode) {
-  //     this.keysLoading = true
-  //     this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
-  //         .then(keys => {
-  //           if(this.selectedNode) {
-  //             this.selectedNode.properties = keys
-  //             this.keysLoading = false
-  //             this.$forceUpdate()
-  //           }
-  //         })
-  //         .catch(e => {
-  //           this.errorMessage = e
-  //           this.keysLoading = false
-  //         })
-  //   }
-  // }
-
-  // deleteKey(key: MetatypeKeyT) {
-  //   this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
-  //   .then(result => {
-  //     if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-
-  //     this.loadKeys()
-  //   })
-  //   .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  // }
 }
 
 </script>
diff --git a/AdminWebApp/src/components/editNodePropertyDialog.vue b/AdminWebApp/src/components/editNodePropertyDialog.vue
deleted file mode 100644
index cf619260d..000000000
--- a/AdminWebApp/src/components/editNodePropertyDialog.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
-    <template v-slot:activator="{ on }">
-      <v-icon
-          v-if="icon"
-          small
-          class="mr-2"
-          v-on="on"
-      >mdi-pencil</v-icon>
-      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editPropertyKey.editPropertyKey")}}</v-btn>
-    </template>
-
-    <v-card v-if="selectedPropertyKey">
-      <v-card-text>
-        <v-container>
-          <error-banner :message="errorMessage"></error-banner>
-          <span class="headline">{{$t('editPropertyKey.edit')}} {{selectedPropertyKey.name}}</span>
-          <v-row>
-            <v-col :cols="12">
-
-              <v-form
-                  ref="form"
-                  v-model="formValid"
-              >
-                <v-text-field
-                    v-model="selectedPropertyKey.name"
-                    :rules="[v => !!v || $t('editPropertyKey.nameRequired')]"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.name')}} <small style="color:red" >*</small></template>
-                </v-text-field>
-
-                <v-text-field
-                    v-model="selectedPropertyKey.property_name"
-                    :rules="[v => !!v || $t('editPropertyKey.propertyNameRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.propertyName')}} <small style="color:red" >*</small></template>
-                </v-text-field>
-                <v-select
-                    v-model="selectedPropertyKey.data_type"
-                    :items="dataTypes"
-                    @change="selectedPropertyKey.default_value = undefined"
-                    :rules="[v => !!v || $t('editPropertyKey.dataTypeRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.dataType')}} <small style="color:red" >*</small></template>
-                </v-select>
-                <v-checkbox
-                    v-model="selectedPropertyKey.required"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.required')}} <small style="color:#ff0000" >*</small></template>
-                </v-checkbox>
-                <v-textarea
-                    v-model="selectedPropertyKey.description"
-                    :rows="2"
-                    :rules="[v => !!v || $t('editPropertyKey.descriptionRequired')]"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.description')}} <small style="color:#ff0000" >*</small></template>
-                </v-textarea>
-
-                <h3>{{$t('editPropertyKey.validation')}}</h3>
-                <v-text-field
-                    v-model="selectedPropertyKey.validation.regex"
-                    :label="$t('editPropertyKey.regex')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.regexHelp')"></info-tooltip></template>
-                </v-text-field>
-                <v-text-field
-                    v-model.number="selectedPropertyKey.validation.max"
-                    :disabled="selectedPropertyKey.validation.regex === ''"
-                    type="number"
-                    :label="$t('editPropertyKey.max')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.maxHelp')"></info-tooltip></template>
-                </v-text-field>
-                <v-text-field
-                    v-model.number="selectedPropertyKey.validation.min"
-                    :disabled="selectedPropertyKey.validation.regex === ''"
-                    type="number"
-                    :label="$t('editPropertyKey.min')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.minHelp')"></info-tooltip></template>
-                </v-text-field>
-
-
-
-                <!-- default value and options should be comboboxes when set to enumeration -->
-                <div v-if="selectedPropertyKey.data_type === 'enumeration'" >
-                  <v-combobox
-                      v-model="selectedPropertyKey.default_value"
-                      multiple
-                      chips
-                      clearable
-                      deletable-chips
-                  ></v-combobox>
-                </div>
-
-                <div v-if="selectedPropertyKey.data_type !== 'enumeration'" >
-                  <v-text-field
-                      v-if="selectedPropertyKey.data_type === 'number'"
-                      v-model="selectedPropertyKey.default_value"
-                      type="number"
-                      :label="$t('editPropertyKey.defaultValue')"
-                  ></v-text-field>
-                  <v-select
-                      v-else-if="selectedPropertyKey.data_type === 'boolean'"
-                      v-model="selectedPropertyKey.default_value"
-                      :label="$t('editPropertyKey.defaultValue')"
-                      :items="booleanOptions"
-                      required
-                  >
-                  </v-select>
-                  <v-text-field
-                      v-else
-                      v-model="selectedPropertyKey.default_value"
-                      :label="$t('editPropertyKey.defaultValue')"
-                  ></v-text-field>
-                </div>
-
-                <v-combobox
-                    v-model="selectedPropertyKey.options"
-                    :label="$t('editPropertyKey.options')"
-                    multiple
-                    clearable
-                    chips
-                    deletable-chips
-                ></v-combobox>
-              </v-form>
-              <p><span style="color:red">*</span> = {{$t('editPropertyKey.requiredField')}}</p>
-            </v-col>
-          </v-row>
-        </v-container>
-      </v-card-text>
-
-      <v-card-actions>
-        <v-spacer></v-spacer>
-        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editPropertyKey.cancel")}}</v-btn>
-        <v-btn color="blue darken-1" :disabled="!formValid" text @click="editPropertyKey()">{{$t("editPropertyKey.save")}}</v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {PropertyT, MetatypeT} from "../api/types";
-
-@Component
-export default class EditPropertyKeyDialog extends Vue {
-  @Prop({required: true})
-  node!: MetatypeT;
-
-  @Prop({required: true})
-  metatypeKey!: PropertyT;
-
-  @Prop({required: false})
-  readonly icon!: boolean
-
-  errorMessage = ""
-  dialog = false
-  formValid = false
-  selectedPropertyKey: PropertyT | null  = null
-  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
-  booleanOptions = [true, false]
-
-  @Watch('dialog', {immediate: true})
-  onDialogChange() {
-    if(this.dialog) this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
-
-    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
-    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
-    // }
-  }
-
-  mounted() {
-    // have to do this to avoid mutating properties
-    this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
-
-    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
-    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
-    // }
-  }
-
-  editPropertyKey() {
-    if(this.selectedPropertyKey) {
-      this.$client.updatePropertyKey(this.node.container_id,this.node.id, this.selectedPropertyKey?.id!, this.selectedPropertyKey)
-          .then(result => {
-            if(!result) {
-              this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string
-            } else {
-              this.dialog = false
-              this.$emit('metatypeKeyEdited')
-            }
-          })
-          .catch(e => this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string + e)
-    }
-  }
-}
-</script>
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index b8a8fa5bd..aeed6b7cb 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -648,6 +648,21 @@ export default {
             keyName: 'Name',
             value: 'Value',
             type: 'Type',
+            editNode: 'Edit Node',
+            edit: 'Edit',
+            name: 'Name',
+            nameRequired: 'name required',
+            description: 'Description',
+            descriptionRequired: 'description required',
+            save: 'Save',
+            cancel: 'Cancel',
+            errorUpdatingAPI: 'Error communicating with Deep Lynx:',
+            keys: 'Properties',
+            actions: 'Actions',
+            keyDescription: 'Description',
+            keyType: 'Data Type',
+            keyActions: 'Actions',
+            requiredField: 'Required Field',
         },
         createEdge: {
             createEdge: 'Create Edge',
diff --git a/AdminWebApp/src/views/DataTestCreation.vue b/AdminWebApp/src/views/DataTestCreation.vue
index 3a12dbad5..e84b1e1cb 100644
--- a/AdminWebApp/src/views/DataTestCreation.vue
+++ b/AdminWebApp/src/views/DataTestCreation.vue
@@ -8,9 +8,7 @@
         :dataSourceID="selectedDataSource"
         @selected="setDataSource">
     </select-data-source>
-
     <v-card v-if="(selectedDataSource !== null)">
-
       <v-data-table
           :headers="headersNode()"
           :items="nodes"
@@ -42,7 +40,8 @@
               :icon="true"
               :dataSourceID="selectedDataSource.id" 
               :containerID="containerID"
-              @nodeUpdate="listNodes() && listEdges()" 
+              :disabled="!selectedDataSource.active || selectedDataSource.archived"
+              @nodeUpdated="listNodes() && listEdges()" 
               >
           </edit-node-dialog>
           <v-icon
@@ -54,9 +53,7 @@
         </template>
       </v-data-table>
     </v-card>
-
         <v-card v-if="(selectedDataSource !== null)">
-
       <v-data-table
           :headers="headersEdge()"
           :items="edges"
@@ -78,7 +75,6 @@
                 >
             </create-edge-dialog>
           </v-col>
-
           <v-col>
             <h2>{{$t('dataTestCreation.edgeTableTitle')}}</h2>
           </v-col>

From 622bf7161872cc2604696c68d946d9ce8f4b1c85 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Mon, 21 Feb 2022 14:55:30 -0700
Subject: [PATCH 14/31] cleaned code and smashed errors

---
 .../src/components/createNodeDialog.vue       |  39 ++--
 AdminWebApp/src/components/editNodeDialog.vue | 107 ++--------
 .../src/components/editNodePropertyDialog.vue | 199 ------------------
 AdminWebApp/src/translations.ts               |  15 ++
 AdminWebApp/src/views/DataTestCreation.vue    |   8 +-
 5 files changed, 52 insertions(+), 316 deletions(-)
 delete mode 100644 AdminWebApp/src/components/editNodePropertyDialog.vue

diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index 3b30397df..09b789b84 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" max-width="60%">
+  <v-dialog v-model="dialog" width="40%" max-width="60%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
@@ -13,12 +13,10 @@
         <span class="headline">{{$t("createNode.formTitle")}}</span>
         <error-banner :message="errorMessage"></error-banner>
       </v-card-title>
-
       <v-card-text>
         <v-container>
           <v-row>
             <v-col :cols="12">
-
               <v-form
                   ref="form"
                   v-model="valid"
@@ -46,7 +44,8 @@
                   <v-col :cols="12">
                     <v-data-table
                         :items="metatype.keys"
-                        :items-per-page="100"
+                        :disable-pagination="true"
+                        :hide-default-footer="true"
                         v-if="optional === true"
                     >
                       <template v-slot:[`item`]="{ item }">
@@ -117,6 +116,7 @@ export default class CreateNodeDialog extends Vue {
 
   @Watch('metatype', {immediate: true})
   onMetatypeSelect(){
+    if (this.metatype.id !== undefined && this.metatype.id !== null)
       this.$client.listMetatypeKeys(this.containerID, this.metatype.id)
       .then((keys) => {
         this.metatype.keys = keys
@@ -124,21 +124,22 @@ export default class CreateNodeDialog extends Vue {
   }
 
   newNode() {
-    this.setProperties()
-    this.$client.createNode(this.containerID,
-      {
-        "container_id": this.containerID,
-        "data_source_id": this.dataSourceID,
-        "metatype_id": this.metatype.id,
-        "properties": this.property,
-        "original_data_id": "1" // set a default original_data_id value to enable future queries
-      }
-    )
-        .then(results => {
-          this.dialog = false
-          this.$emit('nodeCreated', results[0])
-        })
-        .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
+    if (this.metatype.id !== undefined && this.metatype.id !== null){
+      this.setProperties()
+      this.$client.createNode(this.containerID,
+        {
+          "container_id": this.containerID,
+          "data_source_id": this.dataSourceID,
+          "metatype_id": this.metatype.id,
+          "properties": this.property,
+        }
+      )
+          .then(results => {
+            this.dialog = false
+            this.$emit('nodeCreated', results[0])
+          })
+          .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
+    }
   }
 
   // Fill the property object with values from the metatype keys before sending the createNode query
diff --git a/AdminWebApp/src/components/editNodeDialog.vue b/AdminWebApp/src/components/editNodeDialog.vue
index d91bdf473..201534fbf 100644
--- a/AdminWebApp/src/components/editNodeDialog.vue
+++ b/AdminWebApp/src/components/editNodeDialog.vue
@@ -7,50 +7,42 @@
           class="mr-2"
           v-on="on"
       >mdi-pencil</v-icon>
-      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editMetatype.editMetatype")}}</v-btn>
+      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editNode.editNode")}}</v-btn>
     </template>
-
     <v-card v-if="selectedNode">
       <v-card-text>
         <v-container>
           <error-banner :message="errorMessage"></error-banner>
-          <span class="headline">{{$t('editMetatype.edit')}} {{selectedNode.metatype.name}}</span>
+          <span class="headline">{{$t('editNode.edit')}} {{selectedNode.metatype.name}}</span>
           <v-row>
             <v-col :cols="12">
-
               <v-form
                   ref="form"
                   v-model="valid"
               >
                 <v-text-field
                     v-model="selectedNode.metatype.name"
-                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    :rules="[v => !!v || $t('editNode.nameRequired')]"
                     required
                 >
-                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                  <template v-slot:label>{{$t("editNode.name")}} <small style="color:red" >*</small></template>
                 </v-text-field>
                 <v-textarea
                     v-model="selectedNode.metatype.description"
-                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
+                    :rules="[v => !!v || $t('editNode.descriptionRequired')]"
                     required
                 >
-                  <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
+                  <template v-slot:label>{{$t('editNode.description')}} <small style="color:red" >*</small></template>
                 </v-textarea>
               </v-form>
-              <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
-            </v-col>
-
-            <v-col :cols="12" v-if="keysLoading">
-              <v-progress-linear indeterminate></v-progress-linear>
+              <p><span style="color:red">*</span> = {{$t('editNode.requiredField')}}</p>
             </v-col>
             <v-col :cols="12">
               <v-data-table
                   :headers="headers()"
                   :items="nodeProperties"
-                  :items-per-page="100"
-                  :footer-props="{
-                     'items-per-page-options': [25, 50, 100]
-                  }"
+                  :disable-pagination="true"
+                  :hide-default-footer="true"
                   class="elevation-1"
               >
                 <template v-slot:top>
@@ -62,7 +54,6 @@
                         vertical
                     ></v-divider>
                     <v-spacer></v-spacer>
-                    <!-- <create-metatype-key-dialog :metatype="metatype" @metatypeKeyCreated="loadKeys()"></create-metatype-key-dialog> -->
                   </v-toolbar>
                 </template>
                 <template v-slot:[`item.value`]="value">
@@ -78,25 +69,15 @@
                     </template>
                   </v-edit-dialog>
                 </template>
-                <!-- <template v-slot:[`item.actions`]="{ item }">
-                 <edit-node-property-dialog :propertyKey="item" :node="node" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-node-property-dialog>
-                  <v-icon
-                      small
-                      @click="deleteKey(item)"
-                  >
-                    mdi-delete
-                  </v-icon>
-                </template> -->
               </v-data-table>
             </v-col>
           </v-row>
         </v-container>
       </v-card-text>
-
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editMetatype.cancel")}}</v-btn>
-        <v-btn color="blue darken-1" :disabled="!valid" text @click="updateNode()">{{$t("editMetatype.save")}}</v-btn>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editNode.cancel")}}</v-btn>
+        <v-btn color="blue darken-1" :disabled="!valid" text @click="updateNode()">{{$t("editNode.save")}}</v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
@@ -105,14 +86,9 @@
 <script lang="ts">
 import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
 import {NodeT, PropertyT} from "../api/types";
-import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
-import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
 
-@Component({components: {
-    EditMetatypeKeyDialog,
-    CreateMetatypeKeyDialog
-  }})
-export default class EditMetatypeDialog extends Vue {
+@Component({components: {}})
+export default class EditNodeDialog extends Vue {
   @Prop({required: true})
   node!: NodeT;
 
@@ -126,32 +102,24 @@ export default class EditMetatypeDialog extends Vue {
   readonly icon!: boolean
 
   errorMessage = ""
-  keysLoading = false
   dialog = false
   selectedNode: NodeT | null  = null
   valid = false
   nodeProperties: PropertyT[] = []
   property = {}
 
-  // this way we only load the keys when the edit dialog is open, so we don't
-  // overload someone using this in a list
+  // load properties to array when the node is selected so that we can edit fields.
   @Watch('dialog', {immediate: true})
   isDialogOpen() {
     if(this.dialog) {
-      // this.loadKeys()
       this.propertiesToArray()
     } 
-    // else {
-    //   close()
-    // }
   }
 
   headers() {
     return  [
       { text: this.$t('editNode.keyName'), value: 'key'},
       { text: this.$t('editNode.value'), value: 'value'},
-      // { text: this.$t('editNode.keyType'), value: 'type'},
-      // { text: this.$t('editNode.actions'), value: 'actions', sortable: false }
     ]
   }
 
@@ -171,19 +139,6 @@ export default class EditMetatypeDialog extends Vue {
    
   }
 
-  // editMetatype() {
-  //   this.$client.createNode(this.selectedNode?.container_id!, this.selectedNode?.id!,)
-  //       .then(result => {
-  //         if(!result) {
-  //           this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-  //         } else {
-  //           this.dialog = false
-  //           this.$emit('metatypeEdited')
-  //         }
-  //       })
-  //       .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  // }
-
   setProperties() {
     this.property = {}
     const entries: { [key: string]: any } = {}
@@ -215,42 +170,10 @@ export default class EditMetatypeDialog extends Vue {
     )
       .then(results => {
         this.dialog = false
-        this.$emit('nodeUpdated')
+        this.$emit('nodeUpdated', results[0])
       })
       .catch(e => this.errorMessage = this.$t('createNode.errorCreatingAPI') as string + e)
   }
-
-  // close() {
-
-  // }
-
-  // loadKeys() {
-  //   if(this.selectedNode) {
-  //     this.keysLoading = true
-  //     this.$client.listMetatypeKeys(this.selectedNode.container_id, this.selectedNode.id)
-  //         .then(keys => {
-  //           if(this.selectedNode) {
-  //             this.selectedNode.properties = keys
-  //             this.keysLoading = false
-  //             this.$forceUpdate()
-  //           }
-  //         })
-  //         .catch(e => {
-  //           this.errorMessage = e
-  //           this.keysLoading = false
-  //         })
-  //   }
-  // }
-
-  // deleteKey(key: MetatypeKeyT) {
-  //   this.$client.deleteMetatypeKey(this.selectedNode?.container_id!, this.selectedNode?.id!, key.id)
-  //   .then(result => {
-  //     if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
-
-  //     this.loadKeys()
-  //   })
-  //   .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
-  // }
 }
 
 </script>
diff --git a/AdminWebApp/src/components/editNodePropertyDialog.vue b/AdminWebApp/src/components/editNodePropertyDialog.vue
deleted file mode 100644
index cf619260d..000000000
--- a/AdminWebApp/src/components/editNodePropertyDialog.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
-    <template v-slot:activator="{ on }">
-      <v-icon
-          v-if="icon"
-          small
-          class="mr-2"
-          v-on="on"
-      >mdi-pencil</v-icon>
-      <v-btn v-if="!icon" color="primary" dark class="mb-2" v-on="on">{{$t("editPropertyKey.editPropertyKey")}}</v-btn>
-    </template>
-
-    <v-card v-if="selectedPropertyKey">
-      <v-card-text>
-        <v-container>
-          <error-banner :message="errorMessage"></error-banner>
-          <span class="headline">{{$t('editPropertyKey.edit')}} {{selectedPropertyKey.name}}</span>
-          <v-row>
-            <v-col :cols="12">
-
-              <v-form
-                  ref="form"
-                  v-model="formValid"
-              >
-                <v-text-field
-                    v-model="selectedPropertyKey.name"
-                    :rules="[v => !!v || $t('editPropertyKey.nameRequired')]"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.name')}} <small style="color:red" >*</small></template>
-                </v-text-field>
-
-                <v-text-field
-                    v-model="selectedPropertyKey.property_name"
-                    :rules="[v => !!v || $t('editPropertyKey.propertyNameRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.propertyName')}} <small style="color:red" >*</small></template>
-                </v-text-field>
-                <v-select
-                    v-model="selectedPropertyKey.data_type"
-                    :items="dataTypes"
-                    @change="selectedPropertyKey.default_value = undefined"
-                    :rules="[v => !!v || $t('editPropertyKey.dataTypeRequired')]"
-                    required
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.dataType')}} <small style="color:red" >*</small></template>
-                </v-select>
-                <v-checkbox
-                    v-model="selectedPropertyKey.required"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.required')}} <small style="color:#ff0000" >*</small></template>
-                </v-checkbox>
-                <v-textarea
-                    v-model="selectedPropertyKey.description"
-                    :rows="2"
-                    :rules="[v => !!v || $t('editPropertyKey.descriptionRequired')]"
-                >
-                  <template v-slot:label>{{$t('editPropertyKey.description')}} <small style="color:#ff0000" >*</small></template>
-                </v-textarea>
-
-                <h3>{{$t('editPropertyKey.validation')}}</h3>
-                <v-text-field
-                    v-model="selectedPropertyKey.validation.regex"
-                    :label="$t('editPropertyKey.regex')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.regexHelp')"></info-tooltip></template>
-                </v-text-field>
-                <v-text-field
-                    v-model.number="selectedPropertyKey.validation.max"
-                    :disabled="selectedPropertyKey.validation.regex === ''"
-                    type="number"
-                    :label="$t('editPropertyKey.max')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.maxHelp')"></info-tooltip></template>
-                </v-text-field>
-                <v-text-field
-                    v-model.number="selectedPropertyKey.validation.min"
-                    :disabled="selectedPropertyKey.validation.regex === ''"
-                    type="number"
-                    :label="$t('editPropertyKey.min')"
-                >
-                  <template slot="append-outer"> <info-tooltip :message="$t('editPropertyKey.minHelp')"></info-tooltip></template>
-                </v-text-field>
-
-
-
-                <!-- default value and options should be comboboxes when set to enumeration -->
-                <div v-if="selectedPropertyKey.data_type === 'enumeration'" >
-                  <v-combobox
-                      v-model="selectedPropertyKey.default_value"
-                      multiple
-                      chips
-                      clearable
-                      deletable-chips
-                  ></v-combobox>
-                </div>
-
-                <div v-if="selectedPropertyKey.data_type !== 'enumeration'" >
-                  <v-text-field
-                      v-if="selectedPropertyKey.data_type === 'number'"
-                      v-model="selectedPropertyKey.default_value"
-                      type="number"
-                      :label="$t('editPropertyKey.defaultValue')"
-                  ></v-text-field>
-                  <v-select
-                      v-else-if="selectedPropertyKey.data_type === 'boolean'"
-                      v-model="selectedPropertyKey.default_value"
-                      :label="$t('editPropertyKey.defaultValue')"
-                      :items="booleanOptions"
-                      required
-                  >
-                  </v-select>
-                  <v-text-field
-                      v-else
-                      v-model="selectedPropertyKey.default_value"
-                      :label="$t('editPropertyKey.defaultValue')"
-                  ></v-text-field>
-                </div>
-
-                <v-combobox
-                    v-model="selectedPropertyKey.options"
-                    :label="$t('editPropertyKey.options')"
-                    multiple
-                    clearable
-                    chips
-                    deletable-chips
-                ></v-combobox>
-              </v-form>
-              <p><span style="color:red">*</span> = {{$t('editPropertyKey.requiredField')}}</p>
-            </v-col>
-          </v-row>
-        </v-container>
-      </v-card-text>
-
-      <v-card-actions>
-        <v-spacer></v-spacer>
-        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editPropertyKey.cancel")}}</v-btn>
-        <v-btn color="blue darken-1" :disabled="!formValid" text @click="editPropertyKey()">{{$t("editPropertyKey.save")}}</v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
-import {PropertyT, MetatypeT} from "../api/types";
-
-@Component
-export default class EditPropertyKeyDialog extends Vue {
-  @Prop({required: true})
-  node!: MetatypeT;
-
-  @Prop({required: true})
-  metatypeKey!: PropertyT;
-
-  @Prop({required: false})
-  readonly icon!: boolean
-
-  errorMessage = ""
-  dialog = false
-  formValid = false
-  selectedPropertyKey: PropertyT | null  = null
-  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
-  booleanOptions = [true, false]
-
-  @Watch('dialog', {immediate: true})
-  onDialogChange() {
-    if(this.dialog) this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
-
-    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
-    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
-    // }
-  }
-
-  mounted() {
-    // have to do this to avoid mutating properties
-    this.selectedPropertyKey = JSON.parse(JSON.stringify(this.metatypeKey))
-
-    // if(this.selectedPropertyKey && !this.selectedPropertyKey.validation) {
-    //   this.selectedPropertyKey.validation = {regex: "", min: 0, max: 0}
-    // }
-  }
-
-  editPropertyKey() {
-    if(this.selectedPropertyKey) {
-      this.$client.updatePropertyKey(this.node.container_id,this.node.id, this.selectedPropertyKey?.id!, this.selectedPropertyKey)
-          .then(result => {
-            if(!result) {
-              this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string
-            } else {
-              this.dialog = false
-              this.$emit('metatypeKeyEdited')
-            }
-          })
-          .catch(e => this.errorMessage = this.$t('editPropertyKey.errorUpdatingAPI') as string + e)
-    }
-  }
-}
-</script>
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index b8a8fa5bd..aeed6b7cb 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -648,6 +648,21 @@ export default {
             keyName: 'Name',
             value: 'Value',
             type: 'Type',
+            editNode: 'Edit Node',
+            edit: 'Edit',
+            name: 'Name',
+            nameRequired: 'name required',
+            description: 'Description',
+            descriptionRequired: 'description required',
+            save: 'Save',
+            cancel: 'Cancel',
+            errorUpdatingAPI: 'Error communicating with Deep Lynx:',
+            keys: 'Properties',
+            actions: 'Actions',
+            keyDescription: 'Description',
+            keyType: 'Data Type',
+            keyActions: 'Actions',
+            requiredField: 'Required Field',
         },
         createEdge: {
             createEdge: 'Create Edge',
diff --git a/AdminWebApp/src/views/DataTestCreation.vue b/AdminWebApp/src/views/DataTestCreation.vue
index 3a12dbad5..e84b1e1cb 100644
--- a/AdminWebApp/src/views/DataTestCreation.vue
+++ b/AdminWebApp/src/views/DataTestCreation.vue
@@ -8,9 +8,7 @@
         :dataSourceID="selectedDataSource"
         @selected="setDataSource">
     </select-data-source>
-
     <v-card v-if="(selectedDataSource !== null)">
-
       <v-data-table
           :headers="headersNode()"
           :items="nodes"
@@ -42,7 +40,8 @@
               :icon="true"
               :dataSourceID="selectedDataSource.id" 
               :containerID="containerID"
-              @nodeUpdate="listNodes() && listEdges()" 
+              :disabled="!selectedDataSource.active || selectedDataSource.archived"
+              @nodeUpdated="listNodes() && listEdges()" 
               >
           </edit-node-dialog>
           <v-icon
@@ -54,9 +53,7 @@
         </template>
       </v-data-table>
     </v-card>
-
         <v-card v-if="(selectedDataSource !== null)">
-
       <v-data-table
           :headers="headersEdge()"
           :items="edges"
@@ -78,7 +75,6 @@
                 >
             </create-edge-dialog>
           </v-col>
-
           <v-col>
             <h2>{{$t('dataTestCreation.edgeTableTitle')}}</h2>
           </v-col>

From 31c4f50aad580938cf8ec687dee89862dae16524 Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Tue, 22 Feb 2022 08:26:12 -0700
Subject: [PATCH 15/31] added basic edit screen and ontology comparison

---
 AdminWebApp/package-lock.json                 |  76 ++++---
 AdminWebApp/package.json                      |  46 ++--
 AdminWebApp/src/api/client.ts                 |  55 +++--
 AdminWebApp/src/api/types.ts                  |   8 +-
 .../src/components/createMetatypeDialog.vue   |   2 +-
 .../src/components/createNodeDialog.vue       |   2 +-
 .../src/components/editMetatypeDialog.vue     |   6 +-
 .../editMetatypeRelationshipDialog.vue        |   2 +-
 .../ontology/ontologyVersionToolbar.vue       |   3 +-
 .../src/components/viewMetatypeDialog.vue     | 131 +++++++++++
 .../src/components/viewMetatypeKeyDialog.vue  | 143 ++++++++++++
 AdminWebApp/src/store/index.ts                |  16 +-
 AdminWebApp/src/translations.ts               |  32 ++-
 .../src/views/MetatypeRelationshipPairs.vue   |   2 +-
 .../src/views/MetatypeRelationships.vue       |   2 +-
 AdminWebApp/src/views/Metatypes.vue           | 214 +++++++++++++++++-
 AdminWebApp/src/views/OntologyVersioning.vue  |   2 +-
 .../ontology/metatype_key_mapper.ts           |   2 +-
 .../ontology/metatype_mapper.ts               |   9 +-
 .../metatype_relationship_key_mapper.ts       |   2 +-
 .../ontology/metatype_relationship_mapper.ts  |   2 +-
 .../metatype_relationship_pair_mapper.ts      |   2 +-
 .../migrations/018_deleted_at.sql             | 184 +++++++++++++++
 .../ontology/metatype_repository.ts           |  15 ++
 .../repositories/repository.ts                |  47 +++-
 .../data_warehouse/ontology/metatype.ts       |  11 +-
 .../data_warehouse/ontology/metatype_key.ts   |   8 +-
 .../ontology/metatype_relationship.ts         |   7 +-
 .../ontology/metatype_relationship_key.ts     |   8 +-
 .../ontology/metatype_relationship_pair.ts    |   9 +-
 .../ontology/metatype_key_routes.ts           |  21 +-
 .../metatype_relationship_key_routes.ts       |  21 +-
 .../metatype_relationship_pair_routes.ts      |  21 +-
 .../ontology/metatype_relationship_routes.ts  |  21 +-
 .../ontology/metatype_routes.ts               |  39 +++-
 35 files changed, 1037 insertions(+), 134 deletions(-)
 create mode 100644 AdminWebApp/src/components/viewMetatypeDialog.vue
 create mode 100644 AdminWebApp/src/components/viewMetatypeKeyDialog.vue
 create mode 100644 src/data_access_layer/migrations/018_deleted_at.sql

diff --git a/AdminWebApp/package-lock.json b/AdminWebApp/package-lock.json
index 8dc74db37..60df0cbe3 100644
--- a/AdminWebApp/package-lock.json
+++ b/AdminWebApp/package-lock.json
@@ -23,6 +23,8 @@
         "build-url": "^6.0.1",
         "cross-env": "^7.0.3",
         "cytoscape-cola": "^2.5.0",
+        "deep-diff": "^1.0.2",
+        "diff": "^5.0.0",
         "element-ui": "^2.14.1",
         "eslint": "^6.7.2",
         "eslint-plugin-vue": "^6.1.2",
@@ -54,8 +56,7 @@
         "vuex": "^3.6.0",
         "web-ifc-three": "^0.0.67",
         "webcola": "^3.4.0"
-      },
-      "devDependencies": {}
+      }
     },
     "node_modules/@babel/code-frame": {
       "version": "7.16.0",
@@ -547,6 +548,14 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
+    "node_modules/@vue/cli-plugin-typescript/node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/@vue/cli-plugin-typescript/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -3368,6 +3377,11 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/deep-diff": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz",
+      "integrity": "sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg=="
+    },
     "node_modules/deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -3601,9 +3615,9 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
     "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -5229,9 +5243,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
       "funding": [
         {
           "type": "individual",
@@ -10633,9 +10647,9 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "node_modules/shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
       "dependencies": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
@@ -12196,9 +12210,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
+      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -14373,6 +14387,11 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
         },
+        "diff": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+        },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -16640,6 +16659,11 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "deep-diff": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz",
+      "integrity": "sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg=="
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -16819,9 +16843,9 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
     "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -18078,9 +18102,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -22306,9 +22330,9 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
       "requires": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
@@ -23578,9 +23602,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
+      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
diff --git a/AdminWebApp/package.json b/AdminWebApp/package.json
index 9a36dc196..e12ce541f 100644
--- a/AdminWebApp/package.json
+++ b/AdminWebApp/package.json
@@ -8,53 +8,53 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@mdi/js": "^5.8.55",
     "@types/jwt-decode": "^2.2.1",
     "@types/uuid": "^8.3.0",
+    "@typescript-eslint/eslint-plugin": "^2.18.0",
+    "@typescript-eslint/parser": "^2.18.0",
+    "@vue/cli-plugin-eslint": "~4.2.0",
+    "@vue/cli-plugin-router": "~4.2.0",
+    "@vue/cli-plugin-typescript": "^4.5.13",
+    "@vue/cli-plugin-vuex": "~4.2.0",
+    "@vue/cli-service": "~4.2.0",
+    "@vue/eslint-config-typescript": "^5.1.0",
     "axios": "^0.21.1",
     "build-url": "^6.0.1",
+    "cross-env": "^7.0.3",
     "cytoscape-cola": "^2.5.0",
+    "deep-diff": "^1.0.2",
+    "diff": "^5.0.0",
     "element-ui": "^2.14.1",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.1.2",
     "highlight.js": "^10.4.1",
     "is-svg": "^4.3.1",
     "jwt-decode": "^2.2.0",
     "node-forge": "^0.10.0",
+    "prismjs": "^1.23.0",
+    "sass": "~1.30.0",
+    "sass-loader": "^8.0.0",
     "ssri": "^8.0.1",
     "three": "^0.132.2",
     "three-mesh-bvh": "^0.4.3",
+    "tslib": "^2.0.3",
+    "typescript": "~3.7.5",
     "uuid": "^8.3.2",
     "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
+    "vue-cli-plugin-vuetify": "^2.0.8",
     "vue-cytoscape": "^1.0.8",
     "vue-i18n": "^8.25.0",
     "vue-json-component": "^0.4.1",
     "vue-prism-editor": "^1.2.2",
     "vue-property-decorator": "^8.5.1",
     "vue-router": "^3.4.9",
+    "vue-template-compiler": "^2.6.12",
     "vuetify": "^2.3.19",
+    "vuetify-loader": "^1.6.0",
     "vuex": "^3.6.0",
     "web-ifc-three": "^0.0.67",
-    "webcola": "^3.4.0",
-     "@mdi/js": "^5.8.55",
-    "@typescript-eslint/eslint-plugin": "^2.18.0",
-    "@typescript-eslint/parser": "^2.18.0",
-    "@vue/cli-plugin-eslint": "~4.2.0",
-    "@vue/cli-plugin-router": "~4.2.0",
-    "@vue/cli-plugin-typescript": "^4.5.13",
-    "@vue/cli-plugin-vuex": "~4.2.0",
-    "@vue/cli-service": "~4.2.0",
-    "@vue/eslint-config-typescript": "^5.1.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.1.2",
-    "prismjs": "^1.23.0",
-    "sass": "~1.30.0",
-    "sass-loader": "^8.0.0",
-    "tslib": "^2.0.3",
-    "typescript": "~3.7.5",
-    "vue-cli-plugin-vuetify": "^2.0.8",
-    "vue-template-compiler": "^2.6.12",
-    "vuetify-loader": "^1.6.0"
-  },
-  "devDependencies": {
+    "webcola": "^3.4.0"
   }
 }
diff --git a/AdminWebApp/src/api/client.ts b/AdminWebApp/src/api/client.ts
index 96705e8a3..83516c3d7 100644
--- a/AdminWebApp/src/api/client.ts
+++ b/AdminWebApp/src/api/client.ts
@@ -159,6 +159,7 @@ export class Client {
         containerID: string,
         {
             name,
+            nameIn,
             description,
             limit,
             offset,
@@ -167,8 +168,12 @@ export class Client {
             sortDesc,
             count,
             loadKeys,
+            createdAfter,
+            modifiedAfter,
+            deleted,
         }: {
             name?: string;
+            nameIn?: string;
             description?: string;
             limit?: number;
             offset?: number;
@@ -176,12 +181,16 @@ export class Client {
             sortBy?: string;
             sortDesc?: boolean;
             count?: boolean;
-            loadKeys?: string;
+            loadKeys?: boolean;
+            createdAfter?: string;
+            modifiedAfter?: string;
+            deleted?: string;
         },
     ): Promise<MetatypeT[] | number> {
         const query: {[key: string]: any} = {};
 
         if (name) query.name = name;
+        if (nameIn) query.nameIn = nameIn;
         if (description) query.description = description;
         if (ontologyVersion) query.ontologyVersion = ontologyVersion;
         if (limit) query.limit = limit;
@@ -189,7 +198,10 @@ export class Client {
         if (sortBy) query.sortBy = sortBy;
         if (sortDesc) query.sortDesc = sortDesc;
         if (count) query.count = 'true';
-        if (loadKeys) query.loadKeys = loadKeys;
+        if (loadKeys) query.loadKeys = 'true';
+        if (createdAfter) query.createdAfter = createdAfter;
+        if (modifiedAfter) query.modifiedAfter = modifiedAfter;
+        if (deleted) query.deleted = deleted;
 
         return this.get<MetatypeT[] | number>(`/containers/${containerID}/metatypes`, query);
     }
@@ -240,8 +252,8 @@ export class Client {
         return this.get<MetatypeRelationshipPairT[] | number>(`/containers/${containerID}/metatype_relationship_pairs`, query);
     }
 
-    createMetatype(containerID: string, name: string, description: string): Promise<MetatypeT[]> {
-        return this.post<MetatypeT[]>(`/containers/${containerID}/metatypes`, {name, description});
+    createMetatype(containerID: string, name: string, description: string, ontologyVersion?: string): Promise<MetatypeT[]> {
+        return this.post<MetatypeT[]>(`/containers/${containerID}/metatypes`, {name, description, ontology_version: ontologyVersion});
     }
 
     retrieveMetatype(containerID: string, metatypeID: string): Promise<MetatypeT> {
@@ -252,8 +264,11 @@ export class Client {
         return this.put<boolean>(`/containers/${containerID}/metatypes/${metatypeID}`, metatype);
     }
 
-    deleteMetatype(containerID: string, metatypeID: string): Promise<boolean> {
-        return this.delete(`/containers/${containerID}/metatypes/${metatypeID}`);
+    deleteMetatype(containerID: string, metatypeID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+        const query: {[key: string]: any} = {};
+        if (permanent) query.permanent = permanent;
+
+        return this.delete(`/containers/${containerID}/metatypes/${metatypeID}`, query);
     }
 
     listMetatypeKeys(containerID: string, metatypeID: string): Promise<MetatypeKeyT[]> {
@@ -264,8 +279,11 @@ export class Client {
         return this.post<MetatypeKeyT[]>(`/containers/${containerID}/metatypes/${metatypeID}/keys`, key);
     }
 
-    deleteMetatypeKey(containerID: string, metatypeID: string, keyID: string): Promise<boolean> {
-        return this.delete(`/containers/${containerID}/metatypes/${metatypeID}/keys/${keyID}`);
+    deleteMetatypeKey(containerID: string, metatypeID: string, keyID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+        const query: {[key: string]: any} = {};
+        if (permanent) query.permanent = permanent;
+
+        return this.delete(`/containers/${containerID}/metatypes/${metatypeID}/keys/${keyID}`, query);
     }
 
     updateMetatypeKey(containerID: string, metatypeID: string, keyID: string, key: MetatypeKeyT): Promise<boolean> {
@@ -336,8 +354,11 @@ export class Client {
         return this.put<boolean>(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}`, metatypeRelationship);
     }
 
-    deleteMetatypeRelationship(containerID: string, metatypeRelationshipID: string): Promise<boolean> {
-        return this.delete(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}`);
+    deleteMetatypeRelationship(containerID: string, metatypeRelationshipID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+        const query: {[key: string]: any} = {};
+        if (permanent) query.permanent = permanent;
+
+        return this.delete(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}`, query);
     }
 
     createMetatypeRelationshipPair(containerID: string, metatypeRelationshipPair: any): Promise<MetatypeRelationshipPairT[]> {
@@ -348,16 +369,22 @@ export class Client {
         return this.put<boolean>(`/containers/${containerID}/metatype_relationship_pairs/${metatypeRelationshipPairID}`, metatypeRelationshipPair);
     }
 
-    deleteMetatypeRelationshipPair(containerID: string, metatypeRelationshipPairID: string): Promise<boolean> {
-        return this.delete(`/containers/${containerID}/metatype_relationship_pairs/${metatypeRelationshipPairID}`);
+    deleteMetatypeRelationshipPair(containerID: string, metatypeRelationshipPairID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+        const query: {[key: string]: any} = {};
+        if (permanent) query.permanent = permanent;
+
+        return this.delete(`/containers/${containerID}/metatype_relationship_pairs/${metatypeRelationshipPairID}`, query);
     }
 
     listMetatypeRelationshipKeys(containerID: string, relationshipID: string): Promise<MetatypeRelationshipKeyT[]> {
         return this.get<MetatypeRelationshipKeyT[]>(`/containers/${containerID}/metatype_relationships/${relationshipID}/keys`);
     }
 
-    deleteMetatypeRelationshipKey(containerID: string, metatypeRelationshipID: string, keyID: string): Promise<boolean> {
-        return this.delete(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}/keys/${keyID}`);
+    deleteMetatypeRelationshipKey(containerID: string, metatypeRelationshipID: string, keyID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+        const query: {[key: string]: any} = {};
+        if (permanent) query.permanent = permanent;
+
+        return this.delete(`/containers/${containerID}/metatype_relationships/${metatypeRelationshipID}/keys/${keyID}`, query);
     }
 
     createMetatypeRelationshipKey(containerID: string, metatypeRelationshipID: string, key: MetatypeRelationshipKeyT): Promise<MetatypeRelationshipKeyT[]> {
diff --git a/AdminWebApp/src/api/types.ts b/AdminWebApp/src/api/types.ts
index 6c2ba325d..4191fbd72 100644
--- a/AdminWebApp/src/api/types.ts
+++ b/AdminWebApp/src/api/types.ts
@@ -17,11 +17,15 @@ export type MetatypeT = {
     container_id: string;
     name: string;
     description: string;
-    properties: MetatypeKeyT[];
+    keys: MetatypeKeyT[];
     created_at: string;
     modified_at: string;
     created_by: string;
     modified_by: string;
+    deleted_at?: string;
+    parent_id?: string;
+    ontology_version?: string;
+    old_id?: string;
 };
 
 export type MetatypeRelationshipT = {
@@ -75,6 +79,8 @@ export type MetatypeKeyT = {
     modified_at: string;
     created_by: string;
     modified_by: string;
+    deleted_at?: string;
+    ontology_version?: string;
 };
 
 export type MetatypeRelationshipKeyT = {
diff --git a/AdminWebApp/src/components/createMetatypeDialog.vue b/AdminWebApp/src/components/createMetatypeDialog.vue
index a60363697..c1138c7c5 100644
--- a/AdminWebApp/src/components/createMetatypeDialog.vue
+++ b/AdminWebApp/src/components/createMetatypeDialog.vue
@@ -70,7 +70,7 @@ export default class CreateMetatypeDialog extends Vue {
   valid = false
 
   createMetatype() {
-    this.$client.createMetatype(this.containerID, this.name, this.description)
+    this.$client.createMetatype(this.containerID, this.name, this.description, this.$store.getters.activeOntologyVersionID)
         .then(result => {
           if(!result) {
             this.errorMessage = this.$t('createMetatype.errorCreatingAPI') as string
diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index 49ab10bca..c048d8b36 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -86,7 +86,7 @@ export default class CreateNodeDialog extends Vue {
 
   @Watch('originSearch', {immediate: true})
   onOriginSearchChange(newVal: string) {
-    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: 'true'})
+    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: true})
         .then((metatypes) => {
           this.originMetatypes = metatypes as MetatypeT[]
         })
diff --git a/AdminWebApp/src/components/editMetatypeDialog.vue b/AdminWebApp/src/components/editMetatypeDialog.vue
index ab1eebe1f..f0f230ef5 100644
--- a/AdminWebApp/src/components/editMetatypeDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeDialog.vue
@@ -46,7 +46,7 @@
             <v-col :cols="12">
               <v-data-table
                   :headers="headers()"
-                  :items="selectedMetatype.properties"
+                  :items="selectedMetatype.keys"
                   :items-per-page="100"
                   :footer-props="{
                      'items-per-page-options': [25, 50, 100]
@@ -156,7 +156,7 @@ export default class EditMetatypeDialog extends Vue {
       this.$client.listMetatypeKeys(this.selectedMetatype.container_id, this.selectedMetatype.id)
           .then(keys => {
             if(this.selectedMetatype) {
-              this.selectedMetatype.properties = keys
+              this.selectedMetatype.keys = keys
               this.keysLoading = false
               this.$forceUpdate()
             }
@@ -169,7 +169,7 @@ export default class EditMetatypeDialog extends Vue {
   }
 
   deleteKey(key: MetatypeKeyT) {
-    this.$client.deleteMetatypeKey(this.selectedMetatype?.container_id!, this.selectedMetatype?.id!, key.id)
+    this.$client.deleteMetatypeKey(this.selectedMetatype?.container_id!, this.selectedMetatype?.id!, key.id, {permanent: !this.$store.getters.isEditMode})
     .then(result => {
       if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
 
diff --git a/AdminWebApp/src/components/editMetatypeRelationshipDialog.vue b/AdminWebApp/src/components/editMetatypeRelationshipDialog.vue
index 7fd718fe2..4a9e2b92d 100644
--- a/AdminWebApp/src/components/editMetatypeRelationshipDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeRelationshipDialog.vue
@@ -170,7 +170,7 @@ export default class EditMetatypeRelationshipDialog extends Vue {
   }
 
   deleteKey(key: MetatypeRelationshipKeyT) {
-    this.$client.deleteMetatypeRelationshipKey(this.selectedMetatypeRelationship?.container_id!, this.selectedMetatypeRelationship?.id!, key.id)
+    this.$client.deleteMetatypeRelationshipKey(this.selectedMetatypeRelationship?.container_id!, this.selectedMetatypeRelationship?.id!, key.id, {permanent: !this.$store.getters.isEditMode})
     .then(result => {
       if(!result) this.errorMessage = this.$t('editMetatypeRelationship.errorUpdatingAPI') as string
 
diff --git a/AdminWebApp/src/components/ontology/ontologyVersionToolbar.vue b/AdminWebApp/src/components/ontology/ontologyVersionToolbar.vue
index 0c91fe8c4..f45a1b138 100644
--- a/AdminWebApp/src/components/ontology/ontologyVersionToolbar.vue
+++ b/AdminWebApp/src/components/ontology/ontologyVersionToolbar.vue
@@ -27,7 +27,6 @@
       </v-select>
       <create-ontology-version-dialog
           v-if="$store.getters.isEditMode"
-          @versionCreated="listPendingVersions"
           :icon="true"
           :containerID="containerID">
       </create-ontology-version-dialog>
@@ -110,6 +109,8 @@ export default class OntologyVersionToolbar extends Vue {
 
   set isEditMode(mode: any) {
     this.$store.commit('setEditMode', mode)
+    this.$emit('editModeToggle')
+    this.listPendingVersions()
     return
   }
 
diff --git a/AdminWebApp/src/components/viewMetatypeDialog.vue b/AdminWebApp/src/components/viewMetatypeDialog.vue
new file mode 100644
index 000000000..071ef898d
--- /dev/null
+++ b/AdminWebApp/src/components/viewMetatypeDialog.vue
@@ -0,0 +1,131 @@
+<template>
+  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+    <template v-slot:activator="{ on }">
+      <v-icon
+          small
+          class="mr-2"
+          v-on="on"
+      >mdi-eye</v-icon>
+    </template>
+
+    <v-card v-if="selectedMetatype">
+      <v-card-text>
+        <v-container>
+          <error-banner :message="errorMessage"></error-banner>
+          <span class="headline">{{selectedMetatype.name}}</span>
+          <v-row>
+            <v-col :cols="12">
+              <h3>{{$t('viewMetatype.name')}}</h3>
+              <hr>
+              <p>{{selectedMetatype.name}}</p>
+
+              <h3>{{$t('viewMetatype.description')}}</h3>
+              <hr>
+              <p>{{selectedMetatype.description}}</p>
+            </v-col>
+
+            <v-col :cols="12" v-if="keysLoading">
+              <v-progress-linear indeterminate></v-progress-linear>
+            </v-col>
+            <v-col :cols="12">
+              <v-data-table
+                  :headers="headers()"
+                  :items="selectedMetatype.keys"
+                  :items-per-page="100"
+                  :footer-props="{
+                     'items-per-page-options': [25, 50, 100]
+                  }"
+                  class="elevation-1"
+              >
+
+                <template v-slot:top>
+                  <v-toolbar flat color="white">
+                    <v-toolbar-title>{{$t("viewMetatype.keys")}}</v-toolbar-title>
+                    <v-divider
+                        class="mx-4"
+                        inset
+                        vertical
+                    ></v-divider>
+                    <v-spacer></v-spacer>
+                  </v-toolbar>
+                </template>
+                <template v-slot:[`item.actions`]="{ item }">
+                 <view-metatype-key-dialog :metatypeKey="item" :metatype="metatype" :icon="true"></view-metatype-key-dialog>
+                </template>
+              </v-data-table>
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("viewMetatype.close")}}</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
+import {MetatypeKeyT, MetatypeT} from "../api/types";
+import ViewMetatypeKeyDialog from "@/components/viewMetatypeKeyDialog.vue";
+import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
+
+@Component({components: {
+    ViewMetatypeKeyDialog,
+    CreateMetatypeKeyDialog
+  }})
+export default class ViewMetatypeDialog extends Vue {
+  @Prop({required: true})
+  metatype!: MetatypeT;
+
+  errorMessage = ""
+  keysLoading = false
+  dialog = false
+  selectedMetatype: MetatypeT | null  = null
+  valid = false
+
+  // this way we only load the keys when the edit dialog is open, so we don't
+  // overload someone using this in a list
+  @Watch('dialog', {immediate: true})
+  isDialogOpen() {
+    if(this.dialog) {
+      this.loadKeys()
+    }
+  }
+
+  headers() {
+    return  [
+      { text: this.$t('viewMetatype.keyName'), value: 'name' },
+      { text: this.$t('viewMetatype.keyDescription'), value: 'description'},
+      { text: this.$t('viewMetatype.keyType'), value: 'data_type'},
+      { text: this.$t('viewMetatype.actions'), value: 'actions', sortable: false }
+    ]
+  }
+
+  mounted() {
+    // have to do this to avoid mutating properties
+    this.selectedMetatype = JSON.parse(JSON.stringify(this.metatype))
+  }
+
+  loadKeys() {
+    if(this.selectedMetatype) {
+      this.keysLoading = true
+      this.$client.listMetatypeKeys(this.selectedMetatype.container_id, this.selectedMetatype.id)
+          .then(keys => {
+            if(this.selectedMetatype) {
+              this.selectedMetatype.keys = keys
+              this.keysLoading = false
+              this.$forceUpdate()
+            }
+          })
+          .catch(e => {
+            this.errorMessage = e
+            this.keysLoading = false
+          })
+    }
+  }
+}
+
+</script>
diff --git a/AdminWebApp/src/components/viewMetatypeKeyDialog.vue b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
new file mode 100644
index 000000000..096559768
--- /dev/null
+++ b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
@@ -0,0 +1,143 @@
+<template>
+  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+    <template v-slot:activator="{ on }">
+      <v-icon
+          small
+          class="mr-2"
+          v-on="on"
+      >mdi-eye</v-icon>
+    </template>
+
+    <v-card v-if="selectedMetatypeKey">
+      <v-card-text>
+        <v-container>
+          <error-banner :message="errorMessage"></error-banner>
+          <v-row>
+            <v-col :cols="12">
+              <h3>{{$t('viewMetatype.name')}}</h3>
+              <hr>
+              <p>{{selectedMetatypeKey.name}}</p>
+
+              <h3>{{$t('viewMetatype.description')}}</h3>
+              <hr>
+              <p>{{selectedMetatypeKey.description}}</p>
+
+              <h3>{{$t('viewMetatype.propertyName')}}</h3>
+              <hr>
+              <p>{{selectedMetatypeKey.property_name}}</p>
+
+              <h3>{{$t('viewMetatype.dataType')}}</h3>
+              <hr>
+              <p>{{selectedMetatypeKey.data_type}}</p>
+
+              <v-checkbox
+                  v-model="selectedMetatypeKey.required"
+                  :disabled="true"
+              >
+                <template v-slot:label>{{$t('editMetatypeKey.required')}}</template>
+              </v-checkbox>
+
+
+
+                <h3>{{$t('editMetatypeKey.validation')}}</h3>
+                <v-text-field
+                    v-model="selectedMetatypeKey.validation.regex"
+                    :disabled="true"
+                    :label="$t('editMetatypeKey.regex')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.regexHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="selectedMetatypeKey.validation.max"
+                    :disabled="selectedMetatypeKey.validation.regex === ''"
+                    type="number"
+                    :label="$t('editMetatypeKey.max')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.maxHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="selectedMetatypeKey.validation.min"
+                    :disabled="selectedMetatypeKey.validation.regex === ''"
+                    type="number"
+                    :label="$t('editMetatypeKey.min')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.minHelp')"></info-tooltip></template>
+                </v-text-field>
+
+
+
+                <!-- default value and options should be comboboxes when set to enumeration -->
+                <div v-if="selectedMetatypeKey.data_type === 'enumeration'" >
+                  <v-combobox
+                      v-model="selectedMetatypeKey.default_value"
+                      multiple
+                      chips
+                      clearable
+                      deletable-chips
+                  ></v-combobox>
+                </div>
+
+                <v-combobox
+                    v-model="selectedMetatypeKey.options"
+                    :label="$t('editMetatypeKey.options')"
+                    multiple
+                    clearable
+                    chips
+                    deletable-chips
+                    :disabled="true"
+                ></v-combobox>
+
+              <h3>{{$t('viewMetatype.defaultValue')}}</h3>
+              <hr>
+              <p>{{selectedMetatypeKey.default_value}}</p>
+
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("viewMetatypeKey.close")}}</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
+import {MetatypeKeyT, MetatypeT} from "../api/types";
+
+@Component
+export default class ViewMetatypeKeyDialog extends Vue {
+  @Prop({required: true})
+  metatype!: MetatypeT;
+
+  @Prop({required: true})
+  metatypeKey!: MetatypeKeyT;
+
+  errorMessage = ""
+  dialog = false
+  formValid = false
+  selectedMetatypeKey: MetatypeKeyT | null  = null
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
+
+  @Watch('dialog', {immediate: true})
+  onDialogChange() {
+    if(this.dialog) this.selectedMetatypeKey = JSON.parse(JSON.stringify(this.metatypeKey))
+
+    if(this.selectedMetatypeKey && !this.selectedMetatypeKey.validation) {
+      this.selectedMetatypeKey.validation = {regex: "", min: 0, max: 0}
+    }
+  }
+
+  mounted() {
+    // have to do this to avoid mutating properties
+    this.selectedMetatypeKey = JSON.parse(JSON.stringify(this.metatypeKey))
+
+    if(this.selectedMetatypeKey && !this.selectedMetatypeKey.validation) {
+      this.selectedMetatypeKey.validation = {regex: "", min: 0, max: 0}
+    }
+  }
+}
+</script>
diff --git a/AdminWebApp/src/store/index.ts b/AdminWebApp/src/store/index.ts
index 51dc222e7..ee8d95a54 100644
--- a/AdminWebApp/src/store/index.ts
+++ b/AdminWebApp/src/store/index.ts
@@ -3,6 +3,7 @@ import Vuex from 'vuex';
 import {ChangelistT, ContainerT, OntologyVersionT} from '@/api/types';
 import {Client} from '@/api/client';
 import Config from '@/config';
+import OntologyVersionToolbar from '@/components/ontology/ontologyVersionToolbar.vue';
 
 Vue.use(Vuex);
 
@@ -21,7 +22,7 @@ export default new Vuex.Store({
             id: '',
             name: 'Primary',
         },
-        selectedPendingVersion: undefined,
+        selectedPendingVersion: {},
     },
     mutations: {
         initializeStore(state) {
@@ -97,8 +98,21 @@ export default new Vuex.Store({
             return undefined;
         },
 
+        selectedPendingOntologyVersionID: (state) => {
+            if (state.selectedPendingVersion) return (state.selectedPendingVersion as OntologyVersionT).id;
+            return undefined;
+        },
+
         isEditMode: (state) => {
             return state.editMode;
         },
+
+        activeOntologyVersionID: (state) => {
+            if (state.editMode) {
+                return (state.selectedPendingVersion as OntologyVersionT).id;
+            } else {
+                return (state.ontologyVersion as OntologyVersionT).id;
+            }
+        },
     },
 });
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index 131cd0f9e..4c57128f3 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -149,6 +149,10 @@ export default {
             importFromFile: 'Import Mappings From File',
         },
         metatypes: {
+            created: 'Created',
+            edited: 'Edited',
+            removed: 'Removed',
+            legendNote: "If you edit a Metatype's name, it may appear as if you created the metatype as we can no longer match it to the original ontology",
             metatypes: 'Metatypes',
             search: 'Search',
             create: 'Create',
@@ -163,6 +167,32 @@ export default {
             metatypeSuccessfullyCreated: 'Metatype created successfully',
             id: 'ID',
             copyID: 'Click to Copy ',
+            listCreated: 'Created',
+            listEdited: 'Edited',
+            listDeleted: 'Deleted',
+        },
+        viewMetatype: {
+            editMetatype: 'Edit Metatype',
+            edit: 'Edit',
+            name: 'Name',
+            nameRequired: 'name required',
+            description: 'Description',
+            descriptionRequired: 'description required',
+            close: 'Close',
+            errorUpdatingAPI: 'Error communicating with Deep Lynx:',
+            keys: 'Properties',
+            actions: 'Actions',
+            keyName: 'Name',
+            keyDescription: 'Description',
+            keyType: 'Data Type',
+            keyActions: 'Actions',
+            requiredField: 'Required Field',
+            propertyName: 'Property Name',
+            dataType: 'Data Type',
+            defaultValue: 'Default Value',
+        },
+        viewMetatypeKey: {
+            close: 'Close',
         },
         editMetatype: {
             editMetatype: 'Edit Metatype',
@@ -717,7 +747,7 @@ export default {
             deleteChangelist: 'Delete Changelist',
             sendApproval: 'Send Changelist for Approval',
             applyChangelist: 'Apply Changelist',
-            revokeApproval: 'Revoke Changelist Approval',
+            revokeApproval: 'Reject Changelist',
             rollbackOntology: 'Rollback to this Ontology Version (creates changelist for further approval)',
         },
         containers: {
diff --git a/AdminWebApp/src/views/MetatypeRelationshipPairs.vue b/AdminWebApp/src/views/MetatypeRelationshipPairs.vue
index a23ec6214..efc0ce16f 100644
--- a/AdminWebApp/src/views/MetatypeRelationshipPairs.vue
+++ b/AdminWebApp/src/views/MetatypeRelationshipPairs.vue
@@ -179,7 +179,7 @@ export default class MetatypeRelationshipPairs extends Vue {
   }
 
   deleteRelationship(item: any) {
-    this.$client.deleteMetatypeRelationshipPair(this.containerID, item.id)
+    this.$client.deleteMetatypeRelationshipPair(this.containerID, item.id, {permanent: !this.$store.getters.isEditMode})
         .then(() => {
           this.loadMetatypeRelationshipPairs()
         })
diff --git a/AdminWebApp/src/views/MetatypeRelationships.vue b/AdminWebApp/src/views/MetatypeRelationships.vue
index 929e1b1c4..3e496a313 100644
--- a/AdminWebApp/src/views/MetatypeRelationships.vue
+++ b/AdminWebApp/src/views/MetatypeRelationships.vue
@@ -177,7 +177,7 @@ export default class MetatypeRelationships extends Vue {
   }
 
   deleteRelationship(item: any) {
-    this.$client.deleteMetatypeRelationship(this.containerID, item.id)
+    this.$client.deleteMetatypeRelationship(this.containerID, item.id, {permanent: !this.$store.getters.isEditMode})
         .then(() => {
           this.loadMetatypeRelationships()
         })
diff --git a/AdminWebApp/src/views/Metatypes.vue b/AdminWebApp/src/views/Metatypes.vue
index 0f450d461..8af8f0d66 100644
--- a/AdminWebApp/src/views/Metatypes.vue
+++ b/AdminWebApp/src/views/Metatypes.vue
@@ -3,6 +3,8 @@
     <ontology-version-toolbar
         v-if="$store.getters.ontologyVersioningEnabled"
         :containerID="containerID"
+        @editModeToggle="loadMetatypes"
+        @selectedVersion="loadMetatypes"
         @selected="loadMetatypes">
     </ontology-version-toolbar>
     <v-data-table
@@ -16,6 +18,7 @@
           'items-per-page-options': [25, 50, 100]
         }"
         class="elevation-1"
+        :item-class="itemRowBackground"
     >
 
       <template v-slot:top>
@@ -35,7 +38,11 @@
               vertical
           ></v-divider>
           <v-spacer></v-spacer>
-          <create-metatype-dialog :containerID="containerID" @metatypeCreated="recentlyCreatedMetatype"></create-metatype-dialog>
+          <create-metatype-dialog
+              v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled) || !$store.getters.ontologyVersioningEnabled"
+              :containerID="containerID"
+              @metatypeCreated="recentlyCreatedMetatype">
+          </create-metatype-dialog>
         </v-toolbar>
         <v-row>
           <v-col :cols="6">
@@ -45,6 +52,14 @@
             <v-text-field v-model="description" :label="$t('metatypes.searchDescription')" class="mx-4"></v-text-field>
           </v-col>
         </v-row>
+        <v-row v-if="$store.getters.isEditMode">
+          <v-col :cols="2"><div class="box created"></div><p> - {{$t('metatypes.created')}}</p></v-col>
+          <v-col :cols="2"><div class="box edited"></div><p> - {{$t('metatypes.edited')}}</p></v-col>
+          <v-col :cols="2"><div class="box removed"></div><p> - {{$t('metatypes.removed')}}</p></v-col>
+        </v-row>
+        <v-row>
+          <v-col v-if="$store.getters.isEditMode" :cols="12"><p style="margin-left: 15px"><strong>Note: </strong> {{$t('metatypes.legendNote')}}</p></v-col>
+        </v-row>
       </template>
 
       <template v-slot:[`item.copy`]="{ item }">
@@ -58,9 +73,13 @@
       </template>
 
       <template v-slot:[`item.actions`]="{ item }">
-        <edit-metatype-dialog :metatype="item" :icon="true" @metatypeEdited="loadMetatypes()"></edit-metatype-dialog>
+        <view-metatype-dialog v-if="!$store.getters.isEditMode && $store.getters.ontologyVersioningEnabled" :metatype="item" :icon="true"></view-metatype-dialog>
+        <edit-metatype-dialog
+            v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled) || !$store.getters.ontologyVersioningEnabled"
+            :metatype="item" :icon="true" @metatypeEdited="loadMetatypes()"></edit-metatype-dialog>
         <v-icon
             small
+            v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled) || !$store.getters.ontologyVersioningEnabled"
             @click="deleteMetatype(item)"
         >
           mdi-delete
@@ -72,16 +91,21 @@
 
 <script lang="ts">
 import {Component, Prop, Vue, Watch} from 'vue-property-decorator'
-import { MetatypeT } from '@/api/types';
+import {MetatypeT, OntologyVersionT} from '@/api/types';
 import EditMetatypeDialog from "@/components/editMetatypeDialog.vue";
 import CreateMetatypeDialog from "@/components/createMetatypeDialog.vue";
 import {mdiFileDocumentMultiple} from "@mdi/js";
 import OntologyVersionToolbar from "@/components/ontology/ontologyVersionToolbar.vue";
+import ViewMetatypeDialog from "@/components/viewMetatypeDialog.vue";
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const Diff = require('diff');
+const diff = require('deep-diff').diff;
 
 @Component({components: {
     EditMetatypeDialog,
     CreateMetatypeDialog,
-    OntologyVersionToolbar
+    OntologyVersionToolbar,
+    ViewMetatypeDialog
   }})
 export default class Metatypes extends Vue {
   @Prop({required: true})
@@ -92,6 +116,7 @@ export default class Metatypes extends Vue {
   successMessage = ""
   metatypesLoading = false
   metatypes: MetatypeT[] = []
+  comparisonMetatypes: MetatypeT[] = []
   createdMetatype: MetatypeT | null = null
   metatypesCount = 0
   name = ""
@@ -136,7 +161,7 @@ export default class Metatypes extends Vue {
 
   countMetatypes() {
     this.$client.listMetatypes(this.containerID, {
-      ontologyVersion: this.$store.getters.selectedOntologyVersionID,
+      ontologyVersion: this.ontologyVersionID,
       count: true,
       name: (this.name !== "") ? this.name : undefined,
       description: (this.description !== "") ? this.description : undefined,
@@ -162,22 +187,44 @@ export default class Metatypes extends Vue {
     this.$client.listMetatypes(this.containerID, {
       limit: itemsPerPage,
       offset: itemsPerPage * pageNumber,
-      ontologyVersion: this.$store.getters.selectedOntologyVersionID,
+      ontologyVersion: this.ontologyVersionID,
       sortBy: sortParam,
       sortDesc: sortDescParam,
       name: (this.name !== "") ? this.name : undefined,
       description: (this.description !== "") ? this.description : undefined,
     })
         .then((results) => {
-          this.metatypesLoading = false
-          this.metatypes = results as MetatypeT[]
-          this.$forceUpdate()
+          if(!this.$store.getters.isEditMode) {
+            this.metatypes = results as MetatypeT[]
+            this.metatypesLoading = false
+            this.$forceUpdate()
+          } else {
+            let nameIn = "";
+            (results as MetatypeT[]).map((m, i) => {
+              if(i == 0 ) nameIn = m.name
+              else nameIn = nameIn + "," + m.name
+            })
+
+            this.$client.listMetatypes(this.containerID, {
+              ontologyVersion: this.$store.getters.selectedOntologyVersionID,
+              nameIn,
+              loadKeys: true
+            })
+            .then((comparison) => {
+              this.metatypesLoading = false
+              this.comparisonMetatypes = comparison as MetatypeT[]
+              this.metatypes = results as MetatypeT[]
+              this.$forceUpdate()
+            })
+            .catch((e: any) => this.errorMessage = e)
+          }
         })
         .catch((e: any) => this.errorMessage = e)
   }
 
   deleteMetatype(item: any) {
-    this.$client.deleteMetatype(this.containerID, item.id)
+    // if we're in edit mode, set permanent falst
+    this.$client.deleteMetatype(this.containerID, item.id, {permanent: !this.$store.getters.isEditMode})
         .then(() => {
           this.loadMetatypes()
         })
@@ -193,5 +240,152 @@ export default class Metatypes extends Vue {
   copyID(id: string) {
     navigator.clipboard.writeText(id)
   }
+
+  // compareMetatypes takes two metatypes and returns whether they are identical
+  // this is used to indicate when a metatype has been edited as part of the new ontology
+  compareMetatypes(original: MetatypeT, target: MetatypeT): boolean {
+    if(typeof  original === 'undefined') return true
+    if(typeof  target === 'undefined') return true
+    // first copy the objects over so that our key deletion does not affect the real object, since we can't compare
+    // ids and metadata we need to get rid of those on each object
+    const o = {}
+    const t = {}
+
+    Object.assign(o, original)
+    Object.assign(t, target)
+
+    // remove the keys we don't want to use to compare
+    function cleanMetatype(m: MetatypeT) {
+      if(m.created_at) delete m.created_at
+      if(m.created_by) delete m.created_by
+      if(m.modified_at) delete m.modified_at
+      if(m.modified_by) delete m.modified_by
+      if(m.ontology_version) delete m.ontology_version
+      if(m.id) delete m.id
+      delete m.old_id
+      delete m.parent_id
+
+      m.keys.map(p => {
+        if(p.created_at) delete p.created_at
+        if(p.created_by) delete p.created_by
+        if(p.modified_at) delete p.modified_at
+        if(p.modified_by) delete p.modified_by
+        if(p.id) delete p.id
+        if(p.metatype_id) delete p.metatype_id
+        if(p.ontology_version) delete  p.ontology_version
+      })
+    }
+
+    cleanMetatype(o as MetatypeT)
+    cleanMetatype(t as MetatypeT)
+
+    return diff(o, t)
+  }
+
+  itemRowBackground(item: any) {
+    if(this.$store.getters.isEditMode) {
+      const matchedMetatype =  this.comparisonMetatypes.find(m => m.name === item.name)!
+
+      if(item.deleted_at) {
+        return 'deleted-item'
+      }
+
+      if(!matchedMetatype) {
+        return 'created-item'
+      }
+
+      if(this.compareMetatypes(matchedMetatype, item)) {
+        return 'edited-item'
+      }
+    }
+    return ''
+  }
+
+  get ontologyVersionID() {
+    if (this.$store.getters.ontologyVersioningEnabled && this.$store.getters.isEditMode) {
+      return this.$store.getters.selectedPendingOntologyVersionID
+    } else if (this.$store.getters.ontologyVersioningEnabled) {
+      return this.$store.getters.selectedOntologyVersionID
+    } else {
+      return undefined
+    }
+  }
 }
 </script>
+
+<style lang="scss">
+  .edited-item {
+    background: #FB8C00;
+    color: white;
+
+    &:hover {
+      background: #FFA726 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .created-item {
+    background: #7CB342;
+    color: white;
+
+    &:hover {
+    background: #9CCC65 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .deleted-item {
+    background: #E53935;
+    color: white;
+
+    &:hover {
+      background: #EF5350 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .box {
+    float: left;
+    height: 20px;
+    width: 20px;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    clear: both;
+  }
+
+  .created {
+    background-color: #7CB342;
+  }
+
+  .edited {
+    background-color: #FB8C00;
+  }
+
+  .removed {
+    background-color: #E53935;
+  }
+</style>
diff --git a/AdminWebApp/src/views/OntologyVersioning.vue b/AdminWebApp/src/views/OntologyVersioning.vue
index 8b7b816e6..30edb28e6 100644
--- a/AdminWebApp/src/views/OntologyVersioning.vue
+++ b/AdminWebApp/src/views/OntologyVersioning.vue
@@ -105,7 +105,7 @@
                 <v-icon
                     @click="revokeChangelistApproval(item)"
                     v-bind="attrs" v-on="on"
-                    v-if="item.status === 'approved' && $auth.Auth('containers', 'write', containerID)"
+                    v-if="item.status === 'approved' && $auth.Auth('containers', 'write', containerID) || item.status === 'pending' && $auth.Auth('containers', 'write', containerID)"
                     small
                     class="mr-2">
                   mdi-close
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
index de02cc987..2e5a32634 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
@@ -142,7 +142,7 @@ export default class MetatypeKeyMapper extends Mapper {
 
     private archiveStatement(metatypeKeyID: string, userID: string): QueryConfig {
         return {
-            text: `UPDATE metatype_keys SET deleted_at = NOW(), modified_by = $2  WHERE id = $1`,
+            text: `UPDATE metatype_keys SET deleted_at = NOW(), modified_at = NOW(), modified_by = $2  WHERE id = $1`,
             values: [metatypeKeyID, userID],
         };
     }
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
index 8814e7b18..03b123f77 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
@@ -87,8 +87,8 @@ export default class MetatypeMapper extends Mapper {
     // My hope is that this method will allow us to be flexible and create more complicated
     // queries more easily.
     private createStatement(userID: string, ...metatypes: Metatype[]): string {
-        const text = `INSERT INTO metatypes(container_id,name,description, created_by, modified_by) VALUES %L RETURNING *`;
-        const values = metatypes.map((metatype) => [metatype.container_id, metatype.name, metatype.description, userID, userID]);
+        const text = `INSERT INTO metatypes(container_id,name,description, created_by, modified_by, ontology_version) VALUES %L RETURNING *`;
+        const values = metatypes.map((metatype) => [metatype.container_id, metatype.name, metatype.description, userID, userID, metatype.ontology_version]);
 
         return format(text, values);
     }
@@ -121,10 +121,11 @@ export default class MetatypeMapper extends Mapper {
                         name = u.name,
                         description = u.description,
                         modified_by = u.modified_by,
+                        ontology_version = u.ontology_version::bigint,
                         modified_at = NOW()
-                      FROM(VALUES %L) AS u(id, name, description, modified_by)
+                      FROM(VALUES %L) AS u(id, name, description, modified_by, ontology_version)
                       WHERE u.id::bigint = m.id RETURNING m.*`;
-        const values = metatypes.map((metatype) => [metatype.id, metatype.name, metatype.description, userID]);
+        const values = metatypes.map((metatype) => [metatype.id, metatype.name, metatype.description, userID, metatype.ontology_version]);
 
         return format(text, values);
     }
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_key_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_key_mapper.ts
index 42a9147a3..3d5437a0e 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_key_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_key_mapper.ts
@@ -141,7 +141,7 @@ export default class MetatypeRelationshipKeyMapper extends Mapper {
 
     private archiveStatement(metatypeKeyID: string, userID: string): QueryConfig {
         return {
-            text: `UPDATE metatype_relationship_keys SET deleted_at = NOW(), modified_by = $2  WHERE id = $1`,
+            text: `UPDATE metatype_relationship_keys SET deleted_at = NOW(), modified_at = NOW(), modified_by = $2  WHERE id = $1`,
             values: [metatypeKeyID, userID],
         };
     }
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_mapper.ts
index dd9070646..09a35b634 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_mapper.ts
@@ -96,7 +96,7 @@ export default class MetatypeRelationshipMapper extends Mapper {
 
     private archiveStatement(relationshipID: string, userID: string): QueryConfig {
         return {
-            text: `UPDATE metatype_relationships SET deleted_at = NOW(), modified_by = $2  WHERE id = $1`,
+            text: `UPDATE metatype_relationships SET deleted_at = NOW(), modified_at = NOW(), modified_by = $2  WHERE id = $1`,
             values: [relationshipID, userID],
         };
     }
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_pair_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_pair_mapper.ts
index a5363fb15..8de522283 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_pair_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_relationship_pair_mapper.ts
@@ -144,7 +144,7 @@ export default class MetatypeRelationshipPairMapper extends Mapper {
 
     private archiveStatement(pairID: string, userID: string): QueryConfig {
         return {
-            text: `UPDATE metatype_relationship_pairs SET deleted_at = NOW(), modified_by = $2  WHERE id = $1`,
+            text: `UPDATE metatype_relationship_pairs SET deleted_at = NOW(), modified_at = NOW(), modified_by = $2  WHERE id = $1`,
             values: [pairID, userID],
         };
     }
diff --git a/src/data_access_layer/migrations/018_deleted_at.sql b/src/data_access_layer/migrations/018_deleted_at.sql
new file mode 100644
index 000000000..31d703b36
--- /dev/null
+++ b/src/data_access_layer/migrations/018_deleted_at.sql
@@ -0,0 +1,184 @@
+ALTER TABLE metatypes ADD COLUMN deleted_at timestamp without time zone DEFAULT NULL;
+ALTER TABLE metatype_keys ADD COLUMN deleted_at timestamp without time zone DEFAULT NULL;
+ALTER TABLE metatype_relationships ADD COLUMN deleted_at timestamp without time zone DEFAULT NULL;
+ALTER TABLE metatype_relationship_keys ADD COLUMN deleted_at timestamp without time zone DEFAULT NULL;
+ALTER TABLE metatype_relationship_pairs ADD COLUMN deleted_at timestamp without time zone DEFAULT NULL;
+
+CREATE OR REPLACE FUNCTION clone_ontology(userID bigint, baseOntology bigint, targetOntology bigint) RETURNS void AS $$
+DECLARE
+    createdTime timestamp without time zone;
+BEGIN
+    UPDATE ontology_versions SET status = 'generating' WHERE id = targetOntology;
+
+    SELECT created_at INTO createdTime FROM ontology_versions WHERE id = targetOntology;
+
+    INSERT INTO metatypes(
+        container_id,
+        name,
+        description,
+        created_at,
+        modified_at,
+        created_by,
+        modified_by,
+        ontology_version,
+        old_id)
+    SELECT container_id,
+           name,
+           description,
+           createdTime,
+           createdTime,
+           userID,
+           userID,
+           targetOntology,
+           id
+    FROM metatypes WHERE ontology_version = baseOntology;
+
+
+    INSERT INTO metatype_keys(
+        metatype_id,
+        name,
+        description,
+        required,
+        property_name,
+        data_type,
+        options,
+        default_value,
+        validation,
+        created_at,
+        modified_at,
+        created_by,
+        modified_by,
+        ontology_version,
+        container_id)
+    SELECT  metatypes.id,
+            k.name,
+            k.description,
+            k.required,
+            k.property_name,
+            k.data_type,
+            k.options,
+            k.default_value,
+            k.validation,
+            createdTime,
+            createdTime,
+            userID,
+            userID,
+            targetOntology,
+            k.container_id
+    FROM metatype_keys k
+             LEFT JOIN metatypes ON metatypes.old_id = k.metatype_id
+    WHERE k.ontology_version = baseOntology AND metatypes.ontology_version = targetOntology;
+
+    INSERT INTO metatype_relationships(
+        container_id,
+        name,
+        description,
+        created_at,
+        modified_at,
+        created_by,
+        modified_by,
+        ontology_version,
+        old_id)
+    SELECT container_id,
+           name,
+           description,
+           createdTime,
+           createdTime,
+           userID,
+           userID,
+           targetOntology,
+           id
+    FROM metatype_relationships WHERE ontology_version = baseOntology;
+
+
+    INSERT INTO metatype_relationship_keys(
+        metatype_relationship_id,
+        name,
+        description,
+        required,
+        property_name,
+        data_type,
+        options,
+        default_value,
+        validation,
+        created_at,
+        modified_at,
+        created_by,
+        modified_by,
+        ontology_version,
+        container_id)
+    SELECT  metatype_relationships.id,
+            k.name,
+            k.description,
+            k.required,
+            k.property_name,
+            k.data_type,
+            k.options,
+            k.default_value,
+            k.validation,
+            createdTime,
+            createdTime,
+            userID,
+            userID,
+            targetOntology,
+            k.container_id
+    FROM metatype_relationship_keys k
+             LEFT JOIN metatype_relationships ON metatype_relationships.old_id = k.metatype_relationship_id
+    WHERE k.ontology_version = baseOntology AND metatype_relationships.ontology_version = targetOntology;
+
+
+    INSERT INTO metatype_relationship_pairs(
+        relationship_id,
+        origin_metatype_id,
+        destination_metatype_id,
+        container_id,
+        name,
+        description,
+        relationship_type,
+        created_at,
+        modified_at,
+        created_by,
+        modified_by,
+        ontology_version)
+    SELECT  r.id,
+            origin.id,
+            destination.id,
+            p.container_id,
+            p.name,
+            p.description,
+            p.relationship_type,
+            createdTime,
+            createdTime,
+            userID,
+            userID,
+            targetOntology
+    FROM metatype_relationship_pairs p
+             LEFT JOIN metatypes origin ON origin.old_id = p.origin_metatype_id
+             LEFT JOIN metatypes destination ON destination.old_id = p.destination_metatype_id
+             LEFT JOIN metatype_relationships r ON r.old_id = p.relationship_id
+    WHERE p.ontology_version = baseOntology AND origin.ontology_version = targetOntology AND destination.ontology_version = targetOntology AND r.ontology_version = targetOntology;
+
+    UPDATE ontology_versions SET status = 'ready' WHERE id = targetOntology;
+
+    RETURN;
+END;
+$$ language plpgsql;
+
+SELECT name FROM metatype_keys WHERE metatype_id = 15132
+EXCEPT
+SELECT name from metatype_keys WHERe metatype_id = 15133
+
+    GET METATYPES NOT PART OF THE ORIGINAL ONTOLOGY
+SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
+                                       EXCEPT
+                                       SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238
+
+    GET SHARED METATYPES
+SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
+                                       INTERSECT
+                                       SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238 OR ontology_version = 1239;
+
+
+SELECT * FROm metatype_keys WHERe metatype_id IN(SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
+                                                                                        INTERSECT
+                                                                                        SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238 OR ontology_version = 1239) AND ontology_version = 1239
\ No newline at end of file
diff --git a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
index 066a36028..b15ff7e2a 100644
--- a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
@@ -337,6 +337,21 @@ export default class MetatypeRepository extends Repository implements Repository
         return this;
     }
 
+    modified_at(operator: string, value?: any) {
+        super.query('modified_at', operator, value, 'date');
+        return this;
+    }
+
+    created_at(operator: string, value?: any) {
+        super.query('created_at', operator, value, 'date');
+        return this;
+    }
+
+    deleted_at(operator: string, value?: any) {
+        super.query('deleted_at', operator, value, 'date');
+        return this;
+    }
+
     count(): Promise<Result<number>> {
         return super.count();
     }
diff --git a/src/data_access_layer/repositories/repository.ts b/src/data_access_layer/repositories/repository.ts
index 8924cc138..6f8ad403b 100644
--- a/src/data_access_layer/repositories/repository.ts
+++ b/src/data_access_layer/repositories/repository.ts
@@ -93,7 +93,7 @@ export class Repository {
             }
 
             case 'date': {
-                typeCast = 'timestamp';
+                typeCast = 'timestamp(0)';
                 break;
             }
         }
@@ -147,7 +147,40 @@ export class Repository {
         return this;
     }
 
-    query(fieldName: string, operator: string, value?: any) {
+    query(fieldName: string, operator: string, value?: any, dataType?: string) {
+        let typeCast = 'text';
+
+        switch (dataType) {
+            case undefined: {
+                typeCast = 'text';
+                break;
+            }
+
+            case 'number': {
+                typeCast = 'integer';
+                break;
+            }
+
+            case 'number64': {
+                typeCast = 'bigint';
+                break;
+            }
+
+            case 'float': {
+                typeCast = 'numeric';
+                break;
+            }
+            case 'float64': {
+                typeCast = 'numeric';
+                break;
+            }
+
+            case 'date': {
+                typeCast = 'timestamp(0)';
+                break;
+            }
+        }
+
         switch (operator) {
             case 'eq': {
                 this._values.push(value);
@@ -164,6 +197,16 @@ export class Repository {
                 this._rawQuery.push(`${fieldName} ILIKE $${this._values.length}`);
                 break;
             }
+            case '<': {
+                this._values.push(value);
+                this._rawQuery.push(`${fieldName}::${typeCast} < $${this._values.length}::${typeCast}`);
+                break;
+            }
+            case '>': {
+                this._values.push(value);
+                this._rawQuery.push(`${fieldName}::${typeCast} > $${this._values.length}::${typeCast}`);
+                break;
+            }
             case 'in': {
                 let values: any[] = [];
                 if (!Array.isArray(value)) {
diff --git a/src/domain_objects/data_warehouse/ontology/metatype.ts b/src/domain_objects/data_warehouse/ontology/metatype.ts
index bed0c5c7a..3b25b1db3 100644
--- a/src/domain_objects/data_warehouse/ontology/metatype.ts
+++ b/src/domain_objects/data_warehouse/ontology/metatype.ts
@@ -1,5 +1,5 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsBoolean, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
+import {IsBoolean, IsDate, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
 import MetatypeKey from './metatype_key';
 import * as t from 'io-ts';
 import Result from '../../../common_classes/result';
@@ -34,6 +34,15 @@ export default class Metatype extends BaseDomainClass {
     @IsString()
     description = '';
 
+    @IsOptional()
+    @IsDate()
+    @Type(() => Date)
+    deleted_at?: Date;
+
+    @IsOptional()
+    @IsString()
+    ontology_version?: string;
+
     @Type(() => MetatypeKey)
     keys: MetatypeKey[] | undefined;
     // for tracking removed keys for update
diff --git a/src/domain_objects/data_warehouse/ontology/metatype_key.ts b/src/domain_objects/data_warehouse/ontology/metatype_key.ts
index 1a7b5de8b..7e3e653d1 100644
--- a/src/domain_objects/data_warehouse/ontology/metatype_key.ts
+++ b/src/domain_objects/data_warehouse/ontology/metatype_key.ts
@@ -1,5 +1,6 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsArray, IsBoolean, IsIn, IsNotEmpty, IsObject, IsOptional, IsString, Matches, MinLength} from 'class-validator';
+import {IsArray, IsBoolean, IsDate, IsIn, IsNotEmpty, IsObject, IsOptional, IsString, Matches, MinLength} from 'class-validator';
+import {Type} from 'class-transformer';
 
 /*
     MetatypeKey represents a metatype key record in the Deep Lynx database and the various
@@ -57,6 +58,11 @@ export default class MetatypeKey extends BaseDomainClass {
     @IsOptional()
     default_value?: string | boolean | number | any[];
 
+    @IsOptional()
+    @IsDate()
+    @Type(() => Date)
+    deleted_at?: Date;
+
     constructor(input: {
         metatype_id?: string;
         container_id?: string;
diff --git a/src/domain_objects/data_warehouse/ontology/metatype_relationship.ts b/src/domain_objects/data_warehouse/ontology/metatype_relationship.ts
index 209afb132..c630070be 100644
--- a/src/domain_objects/data_warehouse/ontology/metatype_relationship.ts
+++ b/src/domain_objects/data_warehouse/ontology/metatype_relationship.ts
@@ -1,5 +1,5 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsBoolean, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
+import {IsBoolean, IsDate, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
 import MetatypeRelationshipKey from './metatype_relationship_key';
 import * as t from 'io-ts';
 import Result from '../../../common_classes/result';
@@ -41,6 +41,11 @@ export default class MetatypeRelationship extends BaseDomainClass {
     // for tracking removed keys for update
     #removedKeys: MetatypeRelationshipKey[] | undefined;
 
+    @IsOptional()
+    @IsDate()
+    @Type(() => Date)
+    deleted_at?: Date;
+
     constructor(input: {container_id?: string; name: string; description: string}) {
         super();
 
diff --git a/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts b/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts
index c68c77927..caeb9736e 100644
--- a/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts
+++ b/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts
@@ -1,5 +1,6 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsArray, IsBoolean, IsIn, IsNotEmpty, IsObject, IsOptional, IsString, Matches, MinLength} from 'class-validator';
+import {IsArray, IsBoolean, IsDate, IsIn, IsNotEmpty, IsObject, IsOptional, IsString, Matches, MinLength} from 'class-validator';
+import {Type} from 'class-transformer';
 
 /*
     MetatypeRelationshipKey represents a metatype relationship key record in the
@@ -58,6 +59,11 @@ export default class MetatypeRelationshipKey extends BaseDomainClass {
     @IsOptional()
     default_value?: string | boolean | number | any[];
 
+    @IsOptional()
+    @IsDate()
+    @Type(() => Date)
+    deleted_at?: Date;
+
     constructor(input: {
         metatype_relationship_id?: string;
         container_id?: string;
diff --git a/src/domain_objects/data_warehouse/ontology/metatype_relationship_pair.ts b/src/domain_objects/data_warehouse/ontology/metatype_relationship_pair.ts
index 9900c5696..e14e19be7 100644
--- a/src/domain_objects/data_warehouse/ontology/metatype_relationship_pair.ts
+++ b/src/domain_objects/data_warehouse/ontology/metatype_relationship_pair.ts
@@ -1,6 +1,6 @@
 import {BaseDomainClass} from '../../../common_classes/base_domain_class';
-import {IsBoolean, IsIn, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
-import {Expose, plainToClass, Transform} from 'class-transformer';
+import {IsBoolean, IsDate, IsIn, IsNotEmpty, IsOptional, IsString, MinLength, registerDecorator, ValidationArguments, ValidationOptions} from 'class-validator';
+import {Expose, plainToClass, Transform, Type} from 'class-transformer';
 import Metatype, {MetatypeID} from './metatype';
 import MetatypeRelationship, {MetatypeRelationshipID} from './metatype_relationship';
 
@@ -111,6 +111,11 @@ export default class MetatypeRelationshipPair extends BaseDomainClass {
     @IsIn(['many:many', 'one:one', 'one:many', 'many:one'])
     relationship_type = 'many:many';
 
+    @IsOptional()
+    @IsDate()
+    @Type(() => Date)
+    deleted_at?: Date;
+
     constructor(input: {
         name: string;
         description: string;
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
index 415eaa6cd..9c8deb592 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
@@ -111,12 +111,21 @@ export default class MetatypeKeyRoutes {
 
     private static archiveMetatypeKey(req: Request, res: Response, next: NextFunction) {
         if (req.metatypeKey) {
-            repo.archive(req.currentUser!, req.metatypeKey)
-                .then((result) => {
-                    result.asResponse(res);
-                })
-                .catch((err) => res.status(500).send(err))
-                .finally(() => next());
+            if (req.query.permanent !== undefined && String(req.query.permanent).toLowerCase() === 'true') {
+                repo.delete(req.metatypeKey)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            } else {
+                repo.archive(req.currentUser!, req.metatypeKey)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            }
         } else {
             Result.Failure('metatype key not found', 404).asResponse(res);
             next();
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_key_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_key_routes.ts
index bc9684e93..069488bb5 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_key_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_key_routes.ts
@@ -121,12 +121,21 @@ export default class MetatypeRelationshipKeyRoutes {
 
     private static archiveMetatypeRelationshipKey(req: Request, res: Response, next: NextFunction) {
         if (req.metatypeRelationshipKey) {
-            repo.archive(req.currentUser!, req.metatypeRelationshipKey)
-                .then((result) => {
-                    result.asResponse(res);
-                })
-                .catch((err) => res.status(500).send(err))
-                .finally(() => next());
+            if (req.query.permanent !== undefined && String(req.query.permanent).toLowerCase() === 'true') {
+                repo.delete(req.metatypeRelationshipKey)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            } else {
+                repo.archive(req.currentUser!, req.metatypeRelationshipKey)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            }
         } else {
             Result.Failure('metatype relationship key not found', 404).asResponse(res);
             next();
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
index 2e5ecd592..be39fb1bc 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
@@ -164,12 +164,21 @@ export default class MetatypeRelationshipPairRoutes {
 
     private static archiveMetatypeRelationshipPair(req: Request, res: Response, next: NextFunction) {
         if (req.metatypeRelationshipPair) {
-            repo.archive(req.currentUser!, req.metatypeRelationshipPair)
-                .then((result) => {
-                    result.asResponse(res);
-                })
-                .catch((err) => res.status(500).send(err))
-                .finally(() => next());
+            if (req.query.permanent !== undefined && String(req.query.permanent).toLowerCase() === 'true') {
+                repo.delete(req.metatypeRelationshipPair)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            } else {
+                repo.archive(req.currentUser!, req.metatypeRelationshipPair)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            }
         } else {
             Result.Failure('metatype relationship pair not found', 404).asResponse(res);
             next();
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
index 68dfd4969..bab35cf76 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
@@ -145,12 +145,21 @@ export default class MetatypeRelationshipRoutes {
 
     private static archiveMetatypeRelationship(req: Request, res: Response, next: NextFunction) {
         if (req.metatypeRelationship) {
-            repo.archive(req.currentUser!, req.metatypeRelationship)
-                .then((result) => {
-                    result.asResponse(res);
-                })
-                .catch((err) => res.status(500).send(err))
-                .finally(() => next());
+            if (req.query.permanent !== undefined && String(req.query.permanent).toLowerCase() === 'true') {
+                repo.delete(req.metatypeRelationship)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            } else {
+                repo.archive(req.currentUser!, req.metatypeRelationship)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            }
         } else {
             Result.Failure('metatype relationship not found', 404).asResponse(res);
             next();
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
index c19aa913b..3c7530469 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
@@ -74,8 +74,22 @@ export default class MetatypeRoutes {
 
         if (typeof req.query.ontologyVersion !== 'undefined' && (req.query.ontologyVersion as string) !== '') {
             repository = repository.and().ontologyVersion('eq', req.query.ontologyVersion);
-        } else {
-            repository = repository.and().ontologyVersion('is null');
+        }
+
+        if (typeof req.query.modifiedAfter !== 'undefined' && (req.query.modifiedAfter as string) !== '') {
+            repository = repository.and().modified_at('>', req.query.modifiedAfter);
+        }
+
+        if (typeof req.query.createdAfter !== 'undefined' && (req.query.createdAfter as string) !== '') {
+            repository = repository.and().created_at('>', req.query.createdAfter);
+        }
+
+        if (typeof req.query.deleted !== 'undefined' && String(req.query.deleted as string).toLowerCase() === 'true') {
+            repository = repository.and().deleted_at('is not null');
+        }
+
+        if (typeof req.query.nameIn !== 'undefined' && (req.query.nameIn as string) !== '') {
+            repository = repository.and().name('in', `%${req.query.nameIn}%`);
         }
 
         if (req.query.count !== undefined && String(req.query.count).toLowerCase() === 'true') {
@@ -132,12 +146,21 @@ export default class MetatypeRoutes {
 
     private static archiveMetatype(req: Request, res: Response, next: NextFunction) {
         if (req.metatype) {
-            repo.archive(req.currentUser!, req.metatype)
-                .then((result) => {
-                    result.asResponse(res);
-                })
-                .catch((err) => res.status(500).send(err))
-                .finally(() => next());
+            if (req.query.permanent !== undefined && String(req.query.permanent).toLowerCase() === 'true') {
+                repo.delete(req.metatype)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            } else {
+                repo.archive(req.currentUser!, req.metatype)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
+            }
         } else {
             Result.Failure('metatype not found', 404).asResponse(res);
             next();

From 7f05762e369522e44b0308bed7485cd52eca1a2c Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Tue, 22 Feb 2022 08:30:50 -0700
Subject: [PATCH 16/31] deleted the uneeded .env copy

---
 AdminWebApp/{.env-sample copy => .env-sample} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename AdminWebApp/{.env-sample copy => .env-sample} (100%)

diff --git a/AdminWebApp/.env-sample copy b/AdminWebApp/.env-sample
similarity index 100%
rename from AdminWebApp/.env-sample copy
rename to AdminWebApp/.env-sample

From 33f8a9c77070b2293e4dbc086fa6b335f76987b3 Mon Sep 17 00:00:00 2001
From: Kolton Heaps <Kolton.Heaps@inl.gov>
Date: Tue, 22 Feb 2022 08:30:50 -0700
Subject: [PATCH 17/31] deleted the uneeded .env copy

---
 .env-sample                                   | 5 +----
 AdminWebApp/{.env-sample copy => .env-sample} | 0
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename AdminWebApp/{.env-sample copy => .env-sample} (100%)

diff --git a/.env-sample b/.env-sample
index 0e2496f61..da7ae8a61 100644
--- a/.env-sample
+++ b/.env-sample
@@ -126,7 +126,4 @@ RSA_CLIENT_KEY=
 RSA_CLIENT_ID=
 
 # Email for the authorized HPC user to access tasks
-HPC_EMAIL=
-
-# Jazz DNG adapter settings
-DNG_HOST=
+HPC_EMAIL=
\ No newline at end of file
diff --git a/AdminWebApp/.env-sample copy b/AdminWebApp/.env-sample
similarity index 100%
rename from AdminWebApp/.env-sample copy
rename to AdminWebApp/.env-sample

From c8e3915fcecbad9030984a9c55137fa3d1457a02 Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Tue, 22 Feb 2022 10:41:59 -0700
Subject: [PATCH 18/31] basic comparison screen

---
 AdminWebApp/src/api/client.ts                 |  3 +-
 .../src/components/editMetatypeDialog.vue     | 77 +++++++++++++++++--
 .../src/components/editMetatypeKeyDialog.vue  |  2 +-
 .../src/components/viewMetatypeDialog.vue     | 37 ++++++---
 .../src/components/viewMetatypeKeyDialog.vue  |  2 +-
 AdminWebApp/src/translations.ts               |  2 +
 AdminWebApp/src/views/Metatypes.vue           | 58 +++++++++++---
 .../ontology/metatype_mapper.ts               | 11 +++
 .../ontology/metatype_repository.ts           | 10 +++
 .../ontology/metatype_routes.ts               |  9 ++-
 10 files changed, 179 insertions(+), 32 deletions(-)

diff --git a/AdminWebApp/src/api/client.ts b/AdminWebApp/src/api/client.ts
index 83516c3d7..52065de1d 100644
--- a/AdminWebApp/src/api/client.ts
+++ b/AdminWebApp/src/api/client.ts
@@ -264,9 +264,10 @@ export class Client {
         return this.put<boolean>(`/containers/${containerID}/metatypes/${metatypeID}`, metatype);
     }
 
-    deleteMetatype(containerID: string, metatypeID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+    deleteMetatype(containerID: string, metatypeID: string, {permanent, reverse}: {permanent?: boolean; reverse?: boolean}): Promise<boolean> {
         const query: {[key: string]: any} = {};
         if (permanent) query.permanent = permanent;
+        if (reverse) query.reverse = reverse;
 
         return this.delete(`/containers/${containerID}/metatypes/${metatypeID}`, query);
     }
diff --git a/AdminWebApp/src/components/editMetatypeDialog.vue b/AdminWebApp/src/components/editMetatypeDialog.vue
index f0f230ef5..e1d445d4b 100644
--- a/AdminWebApp/src/components/editMetatypeDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="90%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
@@ -16,7 +16,7 @@
           <error-banner :message="errorMessage"></error-banner>
           <span class="headline">{{$t('editMetatype.edit')}} {{selectedMetatype.name}}</span>
           <v-row>
-            <v-col :cols="12">
+            <v-col :cols="6" v-if="comparisonMetatype">
 
               <v-form
                   ref="form"
@@ -26,6 +26,8 @@
                     v-model="selectedMetatype.name"
                     :rules="[v => !!v || $t('editMetatype.nameRequired')]"
                     required
+                    :disabled="true"
+                    style="color: black"
                 >
                   <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
                 </v-text-field>
@@ -33,17 +35,68 @@
                     v-model="selectedMetatype.description"
                     :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
                     required
+                    :disabled="true"
+                    style="color: black"
                 >
                   <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
                 </v-textarea>
               </v-form>
               <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
-            </v-col>
 
-            <v-col :cols="12" v-if="keysLoading">
-              <v-progress-linear indeterminate></v-progress-linear>
+              <v-progress-linear v-if="keysLoading" indeterminate></v-progress-linear>
+              <v-data-table
+                  :headers="headers()"
+                  :items="selectedMetatype.keys"
+                  :items-per-page="100"
+                  :footer-props="{
+                     'items-per-page-options': [25, 50, 100]
+                  }"
+                  class="elevation-1"
+                  sort-by="name"
+              >
+
+                <template v-slot:top>
+                  <v-toolbar flat color="white">
+                    <v-toolbar-title>{{$t("editMetatype.keys")}}</v-toolbar-title>
+                    <v-divider
+                        class="mx-4"
+                        inset
+                        vertical
+                    ></v-divider>
+                    <v-spacer></v-spacer>
+                  </v-toolbar>
+                </template>
+                <template v-slot:[`item.actions`]="{ item }">
+                  <view-metatype-key-dialog :metatypeKey="item" :metatype="metatype" :icon="true" @metatypeKeyEdited="loadKeys()"></view-metatype-key-dialog>
+                </template>
+              </v-data-table>
             </v-col>
-            <v-col :cols="12">
+
+
+            <v-col :cols="(comparisonMetatype) ? 6 : 12">
+
+              <v-form
+                  ref="form"
+                  v-model="valid"
+              >
+                <v-text-field
+                    v-model="selectedMetatype.name"
+                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+                <v-textarea
+                    v-model="selectedMetatype.description"
+                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
+                    required
+                >
+                  <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
+                </v-textarea>
+              </v-form>
+              <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
+
+              <v-progress-linear v-if="keysLoading" indeterminate></v-progress-linear>
               <v-data-table
                   :headers="headers()"
                   :items="selectedMetatype.keys"
@@ -52,6 +105,8 @@
                      'items-per-page-options': [25, 50, 100]
                   }"
                   class="elevation-1"
+
+                  sort-by="name"
               >
 
                 <template v-slot:top>
@@ -95,10 +150,12 @@ import {Component, Prop, Watch, Vue} from 'vue-property-decorator'
 import {MetatypeKeyT, MetatypeT} from "../api/types";
 import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
 import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
+import ViewMetatypeKeyDialog from "@/components/viewMetatypeKeyDialog.vue";
 
 @Component({components: {
     EditMetatypeKeyDialog,
-    CreateMetatypeKeyDialog
+    CreateMetatypeKeyDialog,
+    ViewMetatypeKeyDialog
   }})
 export default class EditMetatypeDialog extends Vue {
   @Prop({required: true})
@@ -107,6 +164,9 @@ export default class EditMetatypeDialog extends Vue {
   @Prop({required: false})
   readonly icon!: boolean
 
+  @Prop({required: false, default: undefined})
+  comparisonMetatype: MetatypeT | undefined
+
   errorMessage = ""
   keysLoading = false
   dialog = false
@@ -155,9 +215,10 @@ export default class EditMetatypeDialog extends Vue {
       this.keysLoading = true
       this.$client.listMetatypeKeys(this.selectedMetatype.container_id, this.selectedMetatype.id)
           .then(keys => {
+            this.keysLoading = false
+
             if(this.selectedMetatype) {
               this.selectedMetatype.keys = keys
-              this.keysLoading = false
               this.$forceUpdate()
             }
           })
diff --git a/AdminWebApp/src/components/editMetatypeKeyDialog.vue b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
index 7439131e9..763603183 100644
--- a/AdminWebApp/src/components/editMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+  <v-dialog v-model="dialog" @click:outside="dialog = false" width="50%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
diff --git a/AdminWebApp/src/components/viewMetatypeDialog.vue b/AdminWebApp/src/components/viewMetatypeDialog.vue
index 071ef898d..fcd1896d7 100644
--- a/AdminWebApp/src/components/viewMetatypeDialog.vue
+++ b/AdminWebApp/src/components/viewMetatypeDialog.vue
@@ -15,13 +15,29 @@
           <span class="headline">{{selectedMetatype.name}}</span>
           <v-row>
             <v-col :cols="12">
-              <h3>{{$t('viewMetatype.name')}}</h3>
-              <hr>
-              <p>{{selectedMetatype.name}}</p>
-
-              <h3>{{$t('viewMetatype.description')}}</h3>
-              <hr>
-              <p>{{selectedMetatype.description}}</p>
+              <v-form
+                  ref="form"
+                  v-model="valid"
+              >
+                <v-text-field
+                    v-model="selectedMetatype.name"
+                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
+                    required
+                    :disabled="true"
+                    style="color: black"
+                >
+                  <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+                <v-textarea
+                    v-model="selectedMetatype.description"
+                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
+                    required
+                    :disabled="true"
+                    style="color: black"
+                >
+                  <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
+                </v-textarea>
+              </v-form>
             </v-col>
 
             <v-col :cols="12" v-if="keysLoading">
@@ -36,6 +52,7 @@
                      'items-per-page-options': [25, 50, 100]
                   }"
                   class="elevation-1"
+                  sort-by="name"
               >
 
                 <template v-slot:top>
@@ -97,9 +114,9 @@ export default class ViewMetatypeDialog extends Vue {
 
   headers() {
     return  [
-      { text: this.$t('viewMetatype.keyName'), value: 'name' },
-      { text: this.$t('viewMetatype.keyDescription'), value: 'description'},
-      { text: this.$t('viewMetatype.keyType'), value: 'data_type'},
+      { text: this.$t('viewMetatype.keyName'), value: 'name', sortable: false },
+      { text: this.$t('viewMetatype.keyDescription'), value: 'description', sortable: false},
+      { text: this.$t('viewMetatype.keyType'), value: 'data_type', sortable: false},
       { text: this.$t('viewMetatype.actions'), value: 'actions', sortable: false }
     ]
   }
diff --git a/AdminWebApp/src/components/viewMetatypeKeyDialog.vue b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
index 096559768..0ef3a946a 100644
--- a/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+  <v-dialog v-model="dialog" @click:outside="dialog = false" width="50%">
     <template v-slot:activator="{ on }">
       <v-icon
           small
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index 4c57128f3..709b5a13f 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -149,6 +149,8 @@ export default {
             importFromFile: 'Import Mappings From File',
         },
         metatypes: {
+            restoreMetatype: 'Restore removed Metatype',
+            removeMetatype: 'Remove Metatype',
             created: 'Created',
             edited: 'Edited',
             removed: 'Removed',
diff --git a/AdminWebApp/src/views/Metatypes.vue b/AdminWebApp/src/views/Metatypes.vue
index 8af8f0d66..10c54d31e 100644
--- a/AdminWebApp/src/views/Metatypes.vue
+++ b/AdminWebApp/src/views/Metatypes.vue
@@ -74,16 +74,45 @@
 
       <template v-slot:[`item.actions`]="{ item }">
         <view-metatype-dialog v-if="!$store.getters.isEditMode && $store.getters.ontologyVersioningEnabled" :metatype="item" :icon="true"></view-metatype-dialog>
-        <edit-metatype-dialog
-            v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled) || !$store.getters.ontologyVersioningEnabled"
-            :metatype="item" :icon="true" @metatypeEdited="loadMetatypes()"></edit-metatype-dialog>
-        <v-icon
-            small
-            v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled) || !$store.getters.ontologyVersioningEnabled"
-            @click="deleteMetatype(item)"
-        >
-          mdi-delete
-        </v-icon>
+
+           <edit-metatype-dialog
+               v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled && !item.deleted_at) || !$store.getters.ontologyVersioningEnabled"
+               :metatype="item"
+               :comparisonMetatype="comparisonMetatypes.find(m => m.name === item.name)"
+               :icon="true"
+               @metatypeEdited="loadMetatypes()"
+           >
+           </edit-metatype-dialog>
+
+        <v-tooltip bottom>
+          <template v-slot:activator="{on, attrs}">
+            <v-icon
+                v-bind="attrs"
+                v-on="on"
+                small
+                v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled && !item.deleted_at) || !$store.getters.ontologyVersioningEnabled"
+                @click="deleteMetatype(item)"
+            >
+              mdi-delete
+            </v-icon>
+          </template>
+          <span>{{$t('metatypes.removeMetatype')}}</span>
+        </v-tooltip>
+        <v-tooltip bottom>
+          <template v-slot:activator="{on, attrs}">
+            <v-icon
+                v-bind="attrs"
+                v-on="on"
+                small
+                v-if="($store.getters.isEditMode && $store.getters.ontologyVersioningEnabled && item.deleted_at)"
+                @click="undeleteMetatype(item)"
+            >
+              mdi-restore
+            </v-icon>
+          </template>
+          <span>{{$t('metatypes.restoreMetatype')}}</span>
+        </v-tooltip>
+
       </template>
     </v-data-table>
   </div>
@@ -231,6 +260,15 @@ export default class Metatypes extends Vue {
         .catch(e => this.errorMessage = e)
   }
 
+  undeleteMetatype(item: any) {
+    // if we're in edit mode, set permanent falst
+    this.$client.deleteMetatype(this.containerID, item.id, {reverse: true})
+        .then(() => {
+          this.loadMetatypes()
+        })
+        .catch(e => this.errorMessage = e)
+  }
+
   recentlyCreatedMetatype(metatype: MetatypeT) {
     this.createdMetatype = metatype
     this.countMetatypes()
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
index 03b123f77..57f843b31 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_mapper.ts
@@ -82,6 +82,10 @@ export default class MetatypeMapper extends Mapper {
         return super.runStatement(this.archiveStatement(id, userID));
     }
 
+    public async Unarchive(id: string, userID: string): Promise<Result<boolean>> {
+        return super.runStatement(this.unarchiveStatement(id, userID));
+    }
+
     // Below are a set of query building functions. So far they're very simple
     // and the return value is something that the postgres-node driver can understand
     // My hope is that this method will allow us to be flexible and create more complicated
@@ -109,6 +113,13 @@ export default class MetatypeMapper extends Mapper {
         };
     }
 
+    private unarchiveStatement(metatypeID: string, userID: string): QueryConfig {
+        return {
+            text: `UPDATE metatypes SET deleted_at = NULL, modified_at = NOW(), modified_by = $2  WHERE id = $1`,
+            values: [metatypeID, userID],
+        };
+    }
+
     private deleteStatement(metatypeID: string): QueryConfig {
         return {
             text: `DELETE FROM metatypes WHERE id = $1`,
diff --git a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
index b15ff7e2a..955dcca09 100644
--- a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_repository.ts
@@ -264,6 +264,16 @@ export default class MetatypeRepository extends Repository implements Repository
         return Promise.resolve(Result.Failure('metatype has no id'));
     }
 
+    unarchive(user: User, m: Metatype): Promise<Result<boolean>> {
+        if (m.id) {
+            void this.deleteCached(m.id);
+
+            return this.#mapper.Unarchive(m.id, user.id!);
+        }
+
+        return Promise.resolve(Result.Failure('metatype has no id'));
+    }
+
     async findByID(id: string, loadKeys = true): Promise<Result<Metatype>> {
         const cached = await this.getCached(id);
         if (cached) {
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
index 3c7530469..40bb3c821 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_routes.ts
@@ -89,7 +89,7 @@ export default class MetatypeRoutes {
         }
 
         if (typeof req.query.nameIn !== 'undefined' && (req.query.nameIn as string) !== '') {
-            repository = repository.and().name('in', `%${req.query.nameIn}%`);
+            repository = repository.and().name('in', `${req.query.nameIn}`);
         }
 
         if (req.query.count !== undefined && String(req.query.count).toLowerCase() === 'true') {
@@ -153,6 +153,13 @@ export default class MetatypeRoutes {
                     })
                     .catch((err) => res.status(500).send(err))
                     .finally(() => next());
+            } else if (req.query.reverse !== undefined && String(req.query.reverse).toLowerCase() === 'true') {
+                repo.unarchive(req.currentUser!, req.metatype)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
             } else {
                 repo.archive(req.currentUser!, req.metatype)
                     .then((result) => {

From dbcd3c8adf5c53d852c5b5803a3121b13bd77aba Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Tue, 22 Feb 2022 10:43:45 -0700
Subject: [PATCH 19/31] quick fix

---
 .../ontology/metatype_relationship_pair_routes.ts               | 2 --
 .../data_warehouse/ontology/metatype_relationship_routes.ts     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
index be39fb1bc..08484675f 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_pair_routes.ts
@@ -105,8 +105,6 @@ export default class MetatypeRelationshipPairRoutes {
 
         if (typeof req.query.ontologyVersion !== 'undefined' && (req.query.ontologyVersion as string) !== '') {
             repository = repository.and().ontologyVersion('eq', req.query.ontologyVersion);
-        } else {
-            repository = repository.and().ontologyVersion('is null');
         }
 
         if (req.query.count !== undefined && String(req.query.count).toLowerCase() === 'true') {
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
index bab35cf76..cbe40e787 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_relationship_routes.ts
@@ -87,8 +87,6 @@ export default class MetatypeRelationshipRoutes {
 
         if (typeof req.query.ontologyVersion !== 'undefined' && (req.query.ontologyVersion as string) !== '') {
             repository = repository.and().ontologyVersion('eq', req.query.ontologyVersion);
-        } else {
-            repository = repository.and().ontologyVersion('is null');
         }
 
         if (req.query.count !== undefined && String(req.query.count).toLowerCase() === 'true') {

From 9004b5af9117cfa5f3860ae4f68c340f0b1ac3e8 Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Tue, 22 Feb 2022 11:07:33 -0700
Subject: [PATCH 20/31] mr corrections

---
 .../src/components/viewMetatypeKeyDialog.vue  |  2 +-
 AdminWebApp/src/views/Metatypes.vue           |  2 +-
 ...{018_deleted_at.sql => 019_deleted_at.sql} | 21 +------------------
 3 files changed, 3 insertions(+), 22 deletions(-)
 rename src/data_access_layer/migrations/{018_deleted_at.sql => 019_deleted_at.sql} (79%)

diff --git a/AdminWebApp/src/components/viewMetatypeKeyDialog.vue b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
index 0ef3a946a..4643298bb 100644
--- a/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/viewMetatypeKeyDialog.vue
@@ -120,7 +120,7 @@ export default class ViewMetatypeKeyDialog extends Vue {
   dialog = false
   formValid = false
   selectedMetatypeKey: MetatypeKeyT | null  = null
-  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file", "list"]
 
   @Watch('dialog', {immediate: true})
   onDialogChange() {
diff --git a/AdminWebApp/src/views/Metatypes.vue b/AdminWebApp/src/views/Metatypes.vue
index 10c54d31e..15a417c42 100644
--- a/AdminWebApp/src/views/Metatypes.vue
+++ b/AdminWebApp/src/views/Metatypes.vue
@@ -252,7 +252,7 @@ export default class Metatypes extends Vue {
   }
 
   deleteMetatype(item: any) {
-    // if we're in edit mode, set permanent falst
+    // if we're in edit mode, set permanent false
     this.$client.deleteMetatype(this.containerID, item.id, {permanent: !this.$store.getters.isEditMode})
         .then(() => {
           this.loadMetatypes()
diff --git a/src/data_access_layer/migrations/018_deleted_at.sql b/src/data_access_layer/migrations/019_deleted_at.sql
similarity index 79%
rename from src/data_access_layer/migrations/018_deleted_at.sql
rename to src/data_access_layer/migrations/019_deleted_at.sql
index 31d703b36..40274abab 100644
--- a/src/data_access_layer/migrations/018_deleted_at.sql
+++ b/src/data_access_layer/migrations/019_deleted_at.sql
@@ -162,23 +162,4 @@ BEGIN
 
     RETURN;
 END;
-$$ language plpgsql;
-
-SELECT name FROM metatype_keys WHERE metatype_id = 15132
-EXCEPT
-SELECT name from metatype_keys WHERe metatype_id = 15133
-
-    GET METATYPES NOT PART OF THE ORIGINAL ONTOLOGY
-SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
-                                       EXCEPT
-                                       SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238
-
-    GET SHARED METATYPES
-SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
-                                       INTERSECT
-                                       SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238 OR ontology_version = 1239;
-
-
-SELECT * FROm metatype_keys WHERe metatype_id IN(SELECT id FROM metatypes WHERE name IN(SELECT name FROM metatypes WHERE ontology_version = 1238
-                                                                                        INTERSECT
-                                                                                        SELECT name from metatypes WHERE ontology_version = 1239) AND ontology_version = 1238 OR ontology_version = 1239) AND ontology_version = 1239
\ No newline at end of file
+$$ language plpgsql;
\ No newline at end of file

From efffa4934c5e9edbc8d4c664edd054d6b47f66a9 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Wed, 23 Feb 2022 13:51:42 -0700
Subject: [PATCH 21/31] cleaned up imports

---
 src/domain_objects/data_warehouse/data/node.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/domain_objects/data_warehouse/data/node.ts b/src/domain_objects/data_warehouse/data/node.ts
index f17a7d215..d6e746865 100644
--- a/src/domain_objects/data_warehouse/data/node.ts
+++ b/src/domain_objects/data_warehouse/data/node.ts
@@ -6,9 +6,6 @@ import Container from '../ontology/container';
 import Edge from './edge';
 import {Conversion} from '../etl/type_transformation';
 import MetatypeRelationshipPair, {MetatypeRelationshipPairID} from '../ontology/metatype_relationship_pair';
-import EdgeMapper from '../../../data_access_layer/mappers/data_warehouse/data/edge_mapper';
-import { string } from 'io-ts';
-import e from 'express';
 import { EdgeMetadata } from './edge';
 
 export class NodeMetadata {

From d25c9777a52e6e8fadd0177c57330670a603e664 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Thu, 24 Feb 2022 11:03:17 -0700
Subject: [PATCH 22/31] endpoint returns NodeLeaf objects

---
 .../data_warehouse/data/node_repository.ts          |  4 ++--
 .../routes/data_warehouse/data/graph_routes.ts      | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
index 5990e47aa..960ba0d26 100644
--- a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
@@ -38,7 +38,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         if (!node.isError) {
             const metatype = await this.#metatypeRepo.findByID(node.value.metatype!.id!);
             if (metatype.isError) Logger.error(`unable to load node's metatype`);
-            else Object.assign(node.value.metatype, metatype.value);
+            else Object.assign(node.value.metatype!, metatype.value);
         }
 
         return Promise.resolve(node);
@@ -50,7 +50,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         if (!node.isError) {
             const metatype = await this.#metatypeRepo.findByID(node.value.metatype!.id!);
             if (metatype.isError) Logger.error(`unable to load node's metatype`);
-            else Object.assign(node.value.metatype, metatype.value);
+            else Object.assign(node.value.metatype!, metatype.value);
         }
 
         return Promise.resolve(node);
diff --git a/src/http_server/routes/data_warehouse/data/graph_routes.ts b/src/http_server/routes/data_warehouse/data/graph_routes.ts
index 7c977ed65..d5f7d36b0 100644
--- a/src/http_server/routes/data_warehouse/data/graph_routes.ts
+++ b/src/http_server/routes/data_warehouse/data/graph_routes.ts
@@ -18,7 +18,7 @@ export default class GraphRoutes {
         app.get('/containers/:containerID/graphs/nodes/:nodeID', ...middleware, authInContainer('read', 'data'), this.retrieveNode);
 
         // This should return a node and all connected nodes and connecting edges for n layers.
-        app.get('/containers/:containerID/graphs/nodes/:nodeID/graph?depth=10', ...middleware, authInContainer('read', 'data'), this.retrieveNthNodes);
+        app.get('/containers/:containerID/graphs/nodes/:nodeID/graph', ...middleware, authInContainer('read', 'data'), this.retrieveNthNodes);
 
         
         app.get('/containers/:containerID/graphs/nodes/:nodeID/files', ...middleware, authInContainer('read', 'data'), this.listFilesForNode);
@@ -99,16 +99,21 @@ export default class GraphRoutes {
 
     // This should return a node and all connected nodes and connecting edges for n layers.
     private static retrieveNthNodes(req: Request, res: Response, next: NextFunction) {
-        if (req.nodeLeaf) {
+        console.log(req);
+        if (req.node) {
+            let depth: any = '10';
+            if (typeof req.query.depth !== 'undefined' && (req.query.depth as string) !== '') {
+                depth = req.query.depth;
+            } 
             nodeRepo
-                .findNthNodesByID(req.nodeLeaf.origin_id!, req.nodeLeaf.depth!)
+                .findNthNodesByID(req.node.id!, depth)
                 .then((result) => {
                     result.asResponse(res);
                 })
                 .catch((err) => res.status(500).send(err))
                 .finally(() => next());
         } else {
-            Result.Failure(`node not found`, 404).asResponse(res);
+            Result.Failure(`graph not found`, 404).asResponse(res);
             next();
         }
     }

From e130829905c441ab94772b43c11ac0a8b6da5aa2 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Thu, 24 Feb 2022 12:10:56 -0700
Subject: [PATCH 23/31] fixed naming convention

---
 .../mappers/data_warehouse/data/node_mapper.ts         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
index 1f2417b5c..7a156e3be 100644
--- a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
@@ -253,10 +253,10 @@ export default class NodeMapper extends Mapper {
     // This should return a node and all connected nodes and connecting edges for n layers.
     private retrieveNthNodesStatement(nodeID: string, depth: string): QueryConfig {
         return {
-            text: `WITH RECURSIVE related (orig_id, orig_container_id, orig_metatype_id, orig_data_source_id, orig_import_data_id,
-                                            orig_data_staging_id, orig_type_mapping_transformation_id, orig_original_data_id, orig_properties,
-                                            orig_metadata, orig_created_at, orig_modified_at, orig_deleted_at, orig_created_by, orig_modified_by,
-                                            orig_metatype_name, edge_id, edge_container_id, edge_relationship_pair_id, edge_data_source_id,
+            text: `WITH RECURSIVE related (origin_id, origin_container_id, origin_metatype_id, origin_data_source_id, origin_import_data_id,
+                                            origin_data_staging_id, origin_type_mapping_transformation_id, origin_original_data_id, origin_properties,
+                                            origin_metadata, origin_created_at, origin_modified_at, origin_deleted_at, origin_created_by, origin_modified_by,
+                                            origin_metatype_name, edge_id, edge_container_id, edge_relationship_pair_id, edge_data_source_id,
                                             edge_import_data_id, edge_data_staging_id, edge_type_mapping_transformation_id, edge_metadata,
                                             edge_created_at, edge_modified_at, edge_deleted_at, edge_properties, edge_modified_by, edge_created_by,
                                             dest_id, dest_container_id, dest_metatype_id, dest_data_source_id, dest_import_data_id, dest_data_staging_id,
@@ -288,7 +288,7 @@ export default class NodeMapper extends Mapper {
                             ON r.dest_id IN (e.origin_id, e.destination_id)
                         JOIN current_nodes d
                             ON d.id IN (e.origin_id, e.destination_id)
-                            AND d.id != r.orig_id AND d.id != r.dest_id
+                            AND d.id != r.origin_id AND d.id != r.dest_id
                     ) SELECT * FROM related WHERE lvl <= $2;`,
             values: [nodeID, depth],
         };

From d6c6481e82694a3e2379f2bb9798a0ae5a2b7c46 Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Thu, 24 Feb 2022 12:14:57 -0700
Subject: [PATCH 24/31] quick commit to hold

---
 AdminWebApp/src/api/client.ts                 |   8 +-
 .../components/createMetatypeKeyDialog.vue    |   2 +-
 .../src/components/editMetatypeDialog.vue     | 179 +++++++++++++++++-
 .../src/components/editMetatypeKeyDialog.vue  | 120 +++++++++++-
 AdminWebApp/src/views/Metatypes.vue           |   4 +-
 .../ontology/metatype_key_mapper.ts           |  11 ++
 .../ontology/metatype_key_repository.ts       |   9 +
 .../ontology/metatype_key_routes.ts           |   7 +
 8 files changed, 322 insertions(+), 18 deletions(-)

diff --git a/AdminWebApp/src/api/client.ts b/AdminWebApp/src/api/client.ts
index 52065de1d..f7b5e40fa 100644
--- a/AdminWebApp/src/api/client.ts
+++ b/AdminWebApp/src/api/client.ts
@@ -280,9 +280,15 @@ export class Client {
         return this.post<MetatypeKeyT[]>(`/containers/${containerID}/metatypes/${metatypeID}/keys`, key);
     }
 
-    deleteMetatypeKey(containerID: string, metatypeID: string, keyID: string, {permanent}: {permanent?: boolean}): Promise<boolean> {
+    deleteMetatypeKey(
+        containerID: string,
+        metatypeID: string,
+        keyID: string,
+        {permanent, reverse}: {permanent?: boolean; reverse?: boolean},
+    ): Promise<boolean> {
         const query: {[key: string]: any} = {};
         if (permanent) query.permanent = permanent;
+        if (reverse) query.reverse = reverse;
 
         return this.delete(`/containers/${containerID}/metatypes/${metatypeID}/keys/${keyID}`, query);
     }
diff --git a/AdminWebApp/src/components/createMetatypeKeyDialog.vue b/AdminWebApp/src/components/createMetatypeKeyDialog.vue
index 91ac1ecf8..692e1c92d 100644
--- a/AdminWebApp/src/components/createMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/createMetatypeKeyDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" max-width="60%">
+  <v-dialog v-model="dialog" @click:outside="dialog = false" width="50%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
diff --git a/AdminWebApp/src/components/editMetatypeDialog.vue b/AdminWebApp/src/components/editMetatypeDialog.vue
index e1d445d4b..9e756f491 100644
--- a/AdminWebApp/src/components/editMetatypeDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeDialog.vue
@@ -20,29 +20,27 @@
 
               <v-form
                   ref="form"
-                  v-model="valid"
               >
                 <v-text-field
                     v-model="selectedMetatype.name"
-                    :rules="[v => !!v || $t('editMetatype.nameRequired')]"
                     required
                     :disabled="true"
-                    style="color: black"
+                    class="disabled"
                 >
                   <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
                 </v-text-field>
                 <v-textarea
                     v-model="selectedMetatype.description"
-                    :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
                     required
                     :disabled="true"
-                    style="color: black"
+                    class="disabled"
                 >
                   <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
                 </v-textarea>
               </v-form>
               <p><span style="color:red">*</span> = {{$t('editMetatype.requiredField')}}</p>
 
+
               <v-progress-linear v-if="keysLoading" indeterminate></v-progress-linear>
               <v-data-table
                   :headers="headers()"
@@ -54,7 +52,6 @@
                   class="elevation-1"
                   sort-by="name"
               >
-
                 <template v-slot:top>
                   <v-toolbar flat color="white">
                     <v-toolbar-title>{{$t("editMetatype.keys")}}</v-toolbar-title>
@@ -105,7 +102,7 @@
                      'items-per-page-options': [25, 50, 100]
                   }"
                   class="elevation-1"
-
+                  :item-class="keyItemRowBackground"
                   sort-by="name"
               >
 
@@ -122,15 +119,35 @@
                   </v-toolbar>
                 </template>
                 <template v-slot:[`item.actions`]="{ item }">
-                 <edit-metatype-key-dialog :metatypeKey="item" :metatype="metatype" :icon="true" @metatypeKeyEdited="loadKeys()"></edit-metatype-key-dialog>
+                  <div v-if="$store.getters.isEditMode && !item.deleted_at">
+                    <edit-metatype-key-dialog
+                        :metatypeKey="item"
+                        :metatype="metatype"
+                        :icon="true"
+                        :comparison-metatype-key="comparisonMetatype.keys.find(k => k.name === item.name)"
+                        @metatypeKeyEdited="loadKeys()"></edit-metatype-key-dialog>
+                    <v-icon
+                        small
+                        @click="deleteKey(item)"
+                    >
+                      mdi-delete
+                    </v-icon>
+                  </div>
+
                   <v-icon
+                      v-if="$store.getters.isEditMode && item.deleted_at"
                       small
-                      @click="deleteKey(item)"
+                      @click="undeleteKey(item)"
                   >
-                    mdi-delete
+                    mdi-restore
                   </v-icon>
                 </template>
               </v-data-table>
+              <v-row v-if="$store.getters.isEditMode" style="margin-top: 15px">
+                <v-col :cols="3"><div class="box created"></div><p> - {{$t('metatypes.created')}}</p></v-col>
+                <v-col :cols="3"><div class="box edited"></div><p> - {{$t('metatypes.edited')}}</p></v-col>
+                <v-col :cols="3"><div class="box removed"></div><p> - {{$t('metatypes.removed')}}</p></v-col>
+              </v-row>
             </v-col>
           </v-row>
         </v-container>
@@ -151,6 +168,7 @@ import {MetatypeKeyT, MetatypeT} from "../api/types";
 import EditMetatypeKeyDialog from "@/components/editMetatypeKeyDialog.vue";
 import CreateMetatypeKeyDialog from "@/components/createMetatypeKeyDialog.vue";
 import ViewMetatypeKeyDialog from "@/components/viewMetatypeKeyDialog.vue";
+const diff = require('deep-diff').diff;
 
 @Component({components: {
     EditMetatypeKeyDialog,
@@ -164,6 +182,7 @@ export default class EditMetatypeDialog extends Vue {
   @Prop({required: false})
   readonly icon!: boolean
 
+  // comparison metatype should always be coming in with its keys, so no need to fetch them
   @Prop({required: false, default: undefined})
   comparisonMetatype: MetatypeT | undefined
 
@@ -238,6 +257,146 @@ export default class EditMetatypeDialog extends Vue {
     })
     .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
   }
+
+  undeleteKey(key: MetatypeKeyT) {
+    this.$client.deleteMetatypeKey(this.selectedMetatype?.container_id!, this.selectedMetatype?.id!, key.id, {reverse: true})
+        .then(result => {
+          if(!result) this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string
+
+          this.loadKeys()
+        })
+        .catch(e => this.errorMessage = this.$t('editMetatype.errorUpdatingAPI') as string + e)
+  }
+
+  keyItemRowBackground(item: any) {
+    if(this.$store.getters.isEditMode) {
+      const matchedKey =  this.comparisonMetatype?.keys.find(k => k.name === item.name)!
+
+      if(item.deleted_at) {
+        return 'deleted-item'
+      }
+
+      if(!matchedKey) {
+        return 'created-item'
+      }
+
+      if(this.compareKeys(matchedKey, item)) {
+        return 'edited-item'
+      }
+    }
+    return ''
+  }
+
+  // this function will indicate whether two keys are different
+  compareKeys(original: MetatypeKeyT, target: MetatypeKeyT): boolean {
+    if(typeof this.comparisonMetatype === 'undefined' || typeof this.selectedMetatype === 'undefined') return false
+
+    const o: {[key: string]: any} = {}
+    const t: {[key: string]: any} = {}
+    Object.assign(o, original)
+    Object.assign(t, target)
+
+    // remove the keys we don't want to use to compare
+    function cleanKey(p: MetatypeKeyT) {
+      if(p.created_at) delete p.created_at
+      if(p.created_by) delete p.created_by
+      if(p.modified_at) delete p.modified_at
+      if(p.modified_by) delete p.modified_by
+      if(p.id) delete p.id
+      if(p.metatype_id) delete p.metatype_id
+      if(p.ontology_version) delete  p.ontology_version
+    }
+
+    cleanKey(o as MetatypeKeyT)
+    cleanKey(t as MetatypeKeyT)
+
+    return diff(o, t)
+  }
 }
 
 </script>
+
+<style lang="scss">
+  .disabled input {
+    color: black !important;
+  }
+
+  .disabled textarea {
+    color: black !important;
+  }
+
+  .edited-item {
+    background: #FB8C00;
+    color: white;
+
+    &:hover {
+      background: #FFA726 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .created-item {
+    background: #7CB342;
+    color: white;
+
+    &:hover {
+      background: #9CCC65 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .deleted-item {
+    background: #E53935;
+    color: white;
+
+    &:hover {
+      background: #EF5350 !important;
+      color: black;
+    }
+
+    .v-icon__svg {
+      color: white !important;
+    }
+
+    .v-icon {
+      color: white !important;
+    }
+  }
+
+  .box {
+    float: left;
+    height: 20px;
+    width: 20px;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    clear: both;
+  }
+
+  .created {
+    background-color: #7CB342;
+  }
+
+  .edited {
+    background-color: #FB8C00;
+  }
+
+  .removed {
+    background-color: #E53935;
+  }
+</style>
diff --git a/AdminWebApp/src/components/editMetatypeKeyDialog.vue b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
index 763603183..50d06527d 100644
--- a/AdminWebApp/src/components/editMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" @click:outside="dialog = false" width="50%">
+  <v-dialog v-model="dialog" @click:outside="dialog = false" width="60%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
@@ -16,8 +16,119 @@
           <error-banner :message="errorMessage"></error-banner>
           <span class="headline">{{$t('editMetatypeKey.edit')}} {{selectedMetatypeKey.name}}</span>
           <v-row>
-            <v-col :cols="12">
+            <v-col v-if="comparisonMetatypeKey" :cols="6">
 
+              <v-form>
+                <v-text-field
+                    v-model="comparisonMetatypeKey.name"
+                >
+                  <template v-slot:label>{{$t('editMetatypeKey.name')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+
+                <v-text-field
+                    v-model="comparisonMetatypeKey.property_name"
+                >
+                  <template v-slot:label>{{$t('editMetatypeKey.propertyName')}} <small style="color:red" >*</small></template>
+                </v-text-field>
+                <v-select
+                    v-model="comparisonMetatypeKey.data_type"
+                    disabled
+                >
+                  <template v-slot:label>{{$t('editMetatypeKey.dataType')}} <small style="color:red" >*</small></template>
+                </v-select>
+                <v-checkbox
+                    disabled
+                    v-model="comparisonMetatypeKey.required"
+                >
+                  <template v-slot:label>{{$t('editMetatypeKey.required')}} <small style="color:#ff0000" >*</small></template>
+                </v-checkbox>
+                <v-textarea
+                    v-model="comparisonMetatypeKey.description"
+                    :rows="2"
+                    disabled
+                >
+                  <template v-slot:label>{{$t('editMetatypeKey.description')}} <small style="color:#ff0000" >*</small></template>
+                </v-textarea>
+
+                <h3>{{$t('editMetatypeKey.validation')}}</h3>
+                <v-text-field
+                    v-model="comparisonMetatypeKey.validation.regex"
+                    disabled
+                    :label="$t('editMetatypeKey.regex')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.regexHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="comparisonMetatypeKey.validation.max"
+                    type="number"
+                    :label="$t('editMetatypeKey.max')"
+                    disabled
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.maxHelp')"></info-tooltip></template>
+                </v-text-field>
+                <v-text-field
+                    v-model.number="comparisonMetatypeKey.validation.min"
+                    disabled
+                    type="number"
+                    :label="$t('editMetatypeKey.min')"
+                >
+                  <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.minHelp')"></info-tooltip></template>
+                </v-text-field>
+
+
+
+                <!-- default value and options should be comboboxes when set to enumeration -->
+                <div v-if="comparisonMetatypeKey.data_type === 'enumeration'" >
+                  <v-combobox
+                      v-model="comparisonMetatypeKey.default_value"
+                      multiple
+                      chips
+                      clearable
+                      disabled
+                      deletable-chips
+                  ></v-combobox>
+                </div>
+
+                <div v-if="comparisonMetatypeKey.data_type !== 'enumeration'" >
+                  <v-text-field
+                      v-if="comparisonMetatypeKey.data_type === 'number'"
+                      v-model="comparisonMetatypeKey.default_value"
+                      type="number"
+                      disabled
+                      :label="$t('editMetatypeKey.defaultValue')"
+                  ></v-text-field>
+                  <v-select
+                      v-else-if="comparisonMetatypeKey.data_type === 'boolean'"
+                      v-model="comparisonMetatypeKey.default_value"
+                      disabled
+                      :label="$t('editMetatypeKey.defaultValue')"
+                      :items="booleanOptions"
+                      required
+                  >
+                  </v-select>
+                  <v-text-field
+                      v-else
+                      disabled
+                      v-model="comparisonMetatypeKey.default_value"
+                      :label="$t('editMetatypeKey.defaultValue')"
+                  ></v-text-field>
+                </div>
+
+                <v-combobox
+                    v-model="comparisonMetatypeKey.options"
+                    :label="$t('editMetatypeKey.options')"
+                    multiple
+                    clearable
+                    disabled
+                    chips
+                    deletable-chips
+                ></v-combobox>
+              </v-form>
+              <p><span style="color:red">*</span> = {{$t('editMetatypeKey.requiredField')}}</p>
+            </v-col>
+
+
+            <v-col :cols="(comparisonMetatypeKey) ? 6 : 12">
               <v-form
                   ref="form"
                   v-model="formValid"
@@ -135,7 +246,7 @@
       <v-card-actions>
         <v-spacer></v-spacer>
         <v-btn color="blue darken-1" text @click="dialog = false" >{{$t("editMetatypeKey.cancel")}}</v-btn>
-        <v-btn color="blue darken-1" :disabled="!formValid" text @click="editMetatypeKey()">{{$t("editMetatypeKey.save")}}</v-btn>
+        <v-btn color="blue darken-1" text @click="editMetatypeKey()">{{$t("editMetatypeKey.save")}}</v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
@@ -153,6 +264,9 @@ export default class EditMetatypeKeyDialog extends Vue {
   @Prop({required: true})
   metatypeKey!: MetatypeKeyT;
 
+  @Prop({required: true, default: undefined})
+  comparisonMetatypeKey!: MetatypeKeyT | undefined;
+
   @Prop({required: false})
   readonly icon!: boolean
 
diff --git a/AdminWebApp/src/views/Metatypes.vue b/AdminWebApp/src/views/Metatypes.vue
index 15a417c42..fd6f4cd30 100644
--- a/AdminWebApp/src/views/Metatypes.vue
+++ b/AdminWebApp/src/views/Metatypes.vue
@@ -127,7 +127,6 @@ import {mdiFileDocumentMultiple} from "@mdi/js";
 import OntologyVersionToolbar from "@/components/ontology/ontologyVersionToolbar.vue";
 import ViewMetatypeDialog from "@/components/viewMetatypeDialog.vue";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const Diff = require('diff');
 const diff = require('deep-diff').diff;
 
 @Component({components: {
@@ -282,8 +281,7 @@ export default class Metatypes extends Vue {
   // compareMetatypes takes two metatypes and returns whether they are identical
   // this is used to indicate when a metatype has been edited as part of the new ontology
   compareMetatypes(original: MetatypeT, target: MetatypeT): boolean {
-    if(typeof  original === 'undefined') return true
-    if(typeof  target === 'undefined') return true
+    if(typeof  original === 'undefined' || typeof target === 'undefined') return true
     // first copy the objects over so that our key deletion does not affect the real object, since we can't compare
     // ids and metadata we need to get rid of those on each object
     const o = {}
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
index 2e5a32634..44faf3c39 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/metatype_key_mapper.ts
@@ -88,6 +88,10 @@ export default class MetatypeKeyMapper extends Mapper {
         return super.runStatement(this.archiveStatement(id, userID));
     }
 
+    public async Unarchive(id: string, userID: string): Promise<Result<boolean>> {
+        return super.runStatement(this.unarchiveStatement(id, userID));
+    }
+
     // Below are a set of query building functions. So far they're very simple
     // and the return value is something that the postgres-node driver can understand
     // My hope is that this method will allow us to be flexible and create more complicated
@@ -147,6 +151,13 @@ export default class MetatypeKeyMapper extends Mapper {
         };
     }
 
+    private unarchiveStatement(metatypeKeyID: string, userID: string): QueryConfig {
+        return {
+            text: `UPDATE metatype_keys SET deleted_at = NULL, modified_at = NOW(), modified_by = $2  WHERE id = $1`,
+            values: [metatypeKeyID, userID],
+        };
+    }
+
     private bulkDeleteStatement(keys: MetatypeKey[]): string {
         const text = `DELETE FROM metatype_keys WHERE id IN(%L)`;
         const values = keys.filter((k) => k.id).map((k) => k.id as string);
diff --git a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_key_repository.ts b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_key_repository.ts
index 3ea878fff..5898bc5bf 100644
--- a/src/data_access_layer/repositories/data_warehouse/ontology/metatype_key_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/ontology/metatype_key_repository.ts
@@ -33,6 +33,15 @@ export default class MetatypeKeyRepository extends Repository implements Reposit
         return Promise.resolve(Result.Failure(`key has no id`));
     }
 
+    unarchive(user: User, k: MetatypeKey): Promise<Result<boolean>> {
+        if (k.id) {
+            void this.#metatypeRepo.deleteCached(k.metatype_id!);
+            return this.#mapper.Unarchive(k.id, user.id!);
+        }
+
+        return Promise.resolve(Result.Failure(`key has no id`));
+    }
+
     findByID(id: string): Promise<Result<MetatypeKey>> {
         return this.#mapper.Retrieve(id);
     }
diff --git a/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts b/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
index 9c8deb592..9b6ae4b2a 100644
--- a/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/metatype_key_routes.ts
@@ -118,6 +118,13 @@ export default class MetatypeKeyRoutes {
                     })
                     .catch((err) => res.status(500).send(err))
                     .finally(() => next());
+            } else if (req.query.reverse !== undefined && String(req.query.reverse).toLowerCase() === 'true') {
+                repo.unarchive(req.currentUser!, req.metatypeKey)
+                    .then((result) => {
+                        result.asResponse(res);
+                    })
+                    .catch((err) => res.status(500).send(err))
+                    .finally(() => next());
             } else {
                 repo.archive(req.currentUser!, req.metatypeKey)
                     .then((result) => {

From db68c2a5c1b14c591eb52fcab852c736d5cb7a3a Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Thu, 24 Feb 2022 12:16:47 -0700
Subject: [PATCH 25/31] queue now deletes on success

---
 src/services/queue/database_queue_impl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/queue/database_queue_impl.ts b/src/services/queue/database_queue_impl.ts
index 49b9e58c3..0b8b5c9ed 100644
--- a/src/services/queue/database_queue_impl.ts
+++ b/src/services/queue/database_queue_impl.ts
@@ -40,7 +40,7 @@ export default class DatabaseQueue implements QueueInterface {
 
             // mark the task completed in the database
             stream.on('data', (data: any) => {
-                this.pool.query({text: `UPDATE queue SET processed_at = NOW() WHERE id = $1`, values: [data.id]}).catch((e) => {
+                this.pool.query({text: `DELETE FROM queue WHERE id = $1`, values: [data.id]}).catch((e) => {
                     Logger.error(`unable to mark queue item as done ${e}`);
                 });
             });

From 0980db4dab821bf488f1431232df5b970bb5448b Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Thu, 24 Feb 2022 12:31:38 -0700
Subject: [PATCH 26/31] mr corrections

---
 .../src/components/editMetatypeKeyDialog.vue      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/AdminWebApp/src/components/editMetatypeKeyDialog.vue b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
index 50d06527d..ef2ad0992 100644
--- a/AdminWebApp/src/components/editMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
@@ -18,20 +18,23 @@
           <v-row>
             <v-col v-if="comparisonMetatypeKey" :cols="6">
 
-              <v-form>
+              <v-form class="disabled">
                 <v-text-field
                     v-model="comparisonMetatypeKey.name"
+                    disabled
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.name')}} <small style="color:red" >*</small></template>
                 </v-text-field>
 
                 <v-text-field
                     v-model="comparisonMetatypeKey.property_name"
+                    disabled
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.propertyName')}} <small style="color:red" >*</small></template>
                 </v-text-field>
                 <v-select
                     v-model="comparisonMetatypeKey.data_type"
+                    :items="dataTypes"
                     disabled
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.dataType')}} <small style="color:red" >*</small></template>
@@ -312,3 +315,13 @@ export default class EditMetatypeKeyDialog extends Vue {
   }
 }
 </script>
+
+<style lang="scss">
+.disabled input {
+  color: black !important;
+}
+
+.disabled textarea {
+  color: black !important;
+}
+</style>

From 193862bb450c37b669c08964767e6305ed2422b7 Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Thu, 24 Feb 2022 12:10:56 -0700
Subject: [PATCH 27/31] fixed naming convention

---
 .../Core.swagger_collection.yaml              | 458 ++++++++++++++++++
 .../data_warehouse/data/node_mapper.ts        |  24 +-
 2 files changed, 470 insertions(+), 12 deletions(-)

diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
index 561e70f0d..7b5f12487 100644
--- a/API Documentation/Core.swagger_collection.yaml	
+++ b/API Documentation/Core.swagger_collection.yaml	
@@ -495,6 +495,447 @@ paths:
       deprecated: false
       x-codegen-request-body-name: Body
       description: Archives a node
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: node_id
+        in: path
+        required: true
+  '/containers/{container_id}/graphs/nodes/{node_id}/graph':
+    get:
+      tags:
+        - Graph
+      summary: Nth Node Query
+      description: Retrieve n layers of node-edge relationships given a depth n and an origin node id.
+      operationId: RetrieveNthNodes
+      parameters:
+        - name: container_id
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: node_id
+          in: path
+          required: true
+          schema:
+            type: string
+        - schema:
+            type: string
+            default: '10'
+          in: query
+          name: depth
+          description: Number of layers deep to query. Defaults to 10.
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                description: ''
+                type: object
+                x-examples:
+                  example-1:
+                    value:
+                      - origin_properties:
+                          id: null
+                          name: null
+                          room: null
+                          action: null
+                          object: null
+                          building: null
+                          location: null
+                          condition: null
+                          elevation: null
+                          item_type: null
+                          step_type: null
+                          action_verb: null
+                          description: null
+                          instruction: null
+                          requires_CV: null
+                          requires_IV: null
+                          requires_PC: null
+                          requires_QA: null
+                          applicability: null
+                          hold_point_end: null
+                          additional_info: null
+                          hold_point_start: null
+                          critical_location: null
+                          original_duration: null
+                          step_construct_type: null
+                          responsible_performer: null
+                          critical_supplemental_information: null
+                        edge_properties: {}
+                        destination_properties:
+                          id: null
+                          name: null
+                          value: null
+                          status_by: null
+                          description: null
+                          status_date: null
+                          primary_text: null
+                          creation_date: null
+                          creation_user: null
+                          modified_date: null
+                          modified_user: null
+                        origin_id: '1457'
+                        origin_container_id: '13'
+                        origin_data_source_id: '9'
+                        origin_import_data_id: null
+                        origin_data_staging_id: null
+                        origin_type_mapping_transformation_id: null
+                        origin_original_data_id: null
+                        origin_metadata: null
+                        origin_created_at: '2022-02-23T20:24:18.809Z'
+                        origin_modified_at: '2022-02-23T20:24:18.801Z'
+                        origin_deleted_at: null
+                        origin_created_by: '1'
+                        origin_modified_by: '1'
+                        origin_metatype_name: StepAction
+                        edge_id: '16'
+                        edge_container_id: '13'
+                        edge_relationship_pair_id: '56521'
+                        edge_data_source_id: '9'
+                        edge_import_data_id: null
+                        edge_data_staging_id: null
+                        edge_type_mapping_transformation_id: null
+                        edge_metadata: null
+                        edge_created_at: '2022-02-23T20:26:15.605Z'
+                        edge_modified_at: '2022-02-23T20:26:15.563Z'
+                        edge_deleted_at: null
+                        edge_modified_by: '1'
+                        edge_created_by: '1'
+                        destination_id: '1456'
+                        destination_container_id: '13'
+                        destination_data_source_id: '9'
+                        destination_import_data_id: null
+                        destination_data_staging_id: null
+                        destination_type_mapping_transformation_id: null
+                        destination_original_data_id: null
+                        destination_metadata: null
+                        destination_created_at: '2022-02-23T20:23:43.883Z'
+                        destination_modified_at: '2022-02-23T20:23:43.743Z'
+                        destination_deleted_at: null
+                        destination_created_by: '1'
+                        destination_modified_by: '1'
+                        destination_metatype_name: Status
+                        lvl: 1
+                        metatype_id:
+                          name: ''
+                          description: ''
+                        destination_metatype_id: ''
+                      - origin_properties:
+                          id: null
+                          name: null
+                          value: null
+                          status_by: null
+                          description: null
+                          status_date: null
+                          primary_text: null
+                          creation_date: null
+                          creation_user: null
+                          modified_date: null
+                          modified_user: null
+                        edge_properties: {}
+                        destination_properties:
+                          id: null
+                          name: null
+                          description: null
+                          primary_text: null
+                          creation_date: null
+                          creation_user: null
+                          modified_date: null
+                          modified_user: null
+                        origin_id: '1456'
+                        origin_container_id: '13'
+                        origin_data_source_id: '9'
+                        origin_import_data_id: null
+                        origin_data_staging_id: null
+                        origin_type_mapping_transformation_id: null
+                        origin_original_data_id: null
+                        origin_metadata: null
+                        origin_created_at: '2022-02-23T20:23:43.883Z'
+                        origin_modified_at: '2022-02-23T20:23:43.743Z'
+                        origin_deleted_at: null
+                        origin_created_by: '1'
+                        origin_modified_by: '1'
+                        origin_metatype_name: Status
+                        edge_id: '15'
+                        edge_container_id: '13'
+                        edge_relationship_pair_id: '56545'
+                        edge_data_source_id: '9'
+                        edge_import_data_id: null
+                        edge_data_staging_id: null
+                        edge_type_mapping_transformation_id: null
+                        edge_metadata: null
+                        edge_created_at: '2022-02-23T20:26:00.459Z'
+                        edge_modified_at: '2022-02-23T20:26:00.442Z'
+                        edge_deleted_at: null
+                        edge_modified_by: '1'
+                        edge_created_by: '1'
+                        destination_id: '1454'
+                        destination_container_id: '13'
+                        destination_data_source_id: '9'
+                        destination_import_data_id: null
+                        destination_data_staging_id: null
+                        destination_type_mapping_transformation_id: null
+                        destination_original_data_id: null
+                        destination_metadata: null
+                        destination_created_at: '2022-02-23T20:22:17.699Z'
+                        destination_modified_at: '2022-02-23T20:22:17.697Z'
+                        destination_deleted_at: null
+                        destination_created_by: '1'
+                        destination_modified_by: '1'
+                        destination_metatype_name: DataItem
+                        lvl: 2
+                        metatype_id:
+                          name: ''
+                          description: ''
+                        destination_metatype_id: ''
+                      - origin_properties:
+                          id: null
+                          name: null
+                          description: null
+                          primary_text: null
+                          creation_date: null
+                          creation_user: null
+                          modified_date: null
+                          modified_user: null
+                        edge_properties: {}
+                        destination_properties:
+                          id: null
+                          name: null
+                          count: null
+                          active: null
+                          message: null
+                          equation: null
+                          in_alarm: null
+                          setpoint: null
+                          description: null
+                          primary_text: null
+                          creation_date: null
+                          creation_user: null
+                          modified_date: null
+                          modified_user: null
+                          comparison_operator: null
+                        origin_id: '1454'
+                        origin_container_id: '13'
+                        origin_data_source_id: '9'
+                        origin_import_data_id: null
+                        origin_data_staging_id: null
+                        origin_type_mapping_transformation_id: null
+                        origin_original_data_id: null
+                        origin_metadata: null
+                        origin_created_at: '2022-02-23T20:22:17.699Z'
+                        origin_modified_at: '2022-02-23T20:22:17.697Z'
+                        origin_deleted_at: null
+                        origin_created_by: '1'
+                        origin_modified_by: '1'
+                        origin_metatype_name: DataItem
+                        edge_id: '13'
+                        edge_container_id: '13'
+                        edge_relationship_pair_id: '54060'
+                        edge_data_source_id: '9'
+                        edge_import_data_id: null
+                        edge_data_staging_id: null
+                        edge_type_mapping_transformation_id: null
+                        edge_metadata: null
+                        edge_created_at: '2022-02-23T20:25:07.848Z'
+                        edge_modified_at: '2022-02-23T20:25:07.798Z'
+                        edge_deleted_at: null
+                        edge_modified_by: '1'
+                        edge_created_by: '1'
+                        destination_id: '1450'
+                        destination_container_id: '13'
+                        destination_data_source_id: '9'
+                        destination_import_data_id: null
+                        destination_data_staging_id: null
+                        destination_type_mapping_transformation_id: null
+                        destination_original_data_id: null
+                        destination_metadata: null
+                        destination_created_at: '2022-02-23T20:21:15.340Z'
+                        destination_modified_at: '2022-02-23T20:21:15.319Z'
+                        destination_deleted_at: null
+                        destination_created_by: '1'
+                        destination_modified_by: '1'
+                        destination_metatype_name: Alarm
+                        lvl: 3
+                        metatype_id:
+                          name: ''
+                          description: ''
+                        destination_metatype_id: ''
+                    isError: false
+                properties:
+                  value:
+                    type: array
+                    uniqueItems: true
+                    minItems: 1
+                    items:
+                      type: object
+                      properties:
+                        origin_properties:
+                          type: object
+                          properties:
+                            id: {}
+                            name: {}
+                        edge_properties:
+                          type: object
+                        destination_properties:
+                          type: object
+                          properties:
+                            id: {}
+                            name: {}
+                        origin_id:
+                          type: string
+                          minLength: 1
+                        origin_container_id:
+                          type: string
+                          minLength: 1
+                        origin_data_source_id:
+                          type: string
+                          minLength: 1
+                        origin_import_data_id: {}
+                        origin_data_staging_id: {}
+                        origin_type_mapping_transformation_id: {}
+                        origin_original_data_id: {}
+                        origin_metadata: {}
+                        origin_created_at:
+                          type: string
+                          minLength: 1
+                        origin_modified_at:
+                          type: string
+                          minLength: 1
+                        origin_deleted_at: {}
+                        origin_created_by:
+                          type: string
+                          minLength: 1
+                        origin_modified_by:
+                          type: string
+                          minLength: 1
+                        origin_metatype_name:
+                          type: string
+                          minLength: 1
+                        edge_id:
+                          type: string
+                          minLength: 1
+                        edge_container_id:
+                          type: string
+                          minLength: 1
+                        edge_relationship_pair_id:
+                          type: string
+                          minLength: 1
+                        edge_data_source_id:
+                          type: string
+                          minLength: 1
+                        edge_import_data_id: {}
+                        edge_data_staging_id: {}
+                        edge_type_mapping_transformation_id: {}
+                        edge_metadata: {}
+                        edge_created_at:
+                          type: string
+                          minLength: 1
+                        edge_modified_at:
+                          type: string
+                          minLength: 1
+                        edge_deleted_at: {}
+                        edge_modified_by:
+                          type: string
+                          minLength: 1
+                        edge_created_by:
+                          type: string
+                          minLength: 1
+                        destination_id:
+                          type: string
+                          minLength: 1
+                        destination_container_id:
+                          type: string
+                          minLength: 1
+                        destination_data_source_id:
+                          type: string
+                          minLength: 1
+                        destination_import_data_id: {}
+                        destination_data_staging_id: {}
+                        destination_type_mapping_transformation_id: {}
+                        destination_original_data_id: {}
+                        destination_metadata: {}
+                        destination_created_at:
+                          type: string
+                          minLength: 1
+                        destination_modified_at:
+                          type: string
+                          minLength: 1
+                        destination_deleted_at: {}
+                        destination_created_by:
+                          type: string
+                          minLength: 1
+                        destination_modified_by:
+                          type: string
+                          minLength: 1
+                        destination_metatype_name:
+                          type: string
+                          minLength: 1
+                        lvl:
+                          type: number
+                        metatype_id:
+                          type: object
+                          properties:
+                            name:
+                              type: string
+                            description:
+                              type: string
+                          required:
+                            - name
+                            - description
+                        destination_metatype_id:
+                          type: string
+                      required:
+                        - origin_id
+                        - origin_container_id
+                        - origin_data_source_id
+                        - origin_created_at
+                        - origin_modified_at
+                        - origin_created_by
+                        - origin_modified_by
+                        - origin_metatype_name
+                        - edge_id
+                        - edge_container_id
+                        - edge_relationship_pair_id
+                        - edge_data_source_id
+                        - edge_created_at
+                        - edge_modified_at
+                        - edge_modified_by
+                        - edge_created_by
+                        - destination_id
+                        - destination_container_id
+                        - destination_data_source_id
+                        - destination_created_at
+                        - destination_modified_at
+                        - destination_created_by
+                        - destination_modified_by
+                        - destination_metatype_name
+                        - lvl
+                        - destination_metatype_id
+                  isError:
+                    type: boolean
+                required:
+                  - value
+                  - isError
+      deprecated: false
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: node_id
+        in: path
+        required: true
   '/containers/{container_id}/graphs/nodes/metatype/{metatype_id}':
     get:
       tags:
@@ -3834,6 +4275,23 @@ paths:
         '200':
           description: OK
       description: Publishes an ontology version
+  '/Core.swagger_collection.yaml/paths//containers/{container_id}/graphs/nodes/{node_id}':
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: node_id
+        in: path
+        required: true
+    get:
+      summary: Nth Node Query
+      tags: []
+      responses: {}
+      operationId: get-Core.swagger_collection.yaml-paths-~1containers~1-container_id-~1graphs~1nodes~1-node_id
 components:
   securitySchemes:
     BearerAuth:
diff --git a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
index 1f2417b5c..0ca373d63 100644
--- a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
@@ -253,15 +253,15 @@ export default class NodeMapper extends Mapper {
     // This should return a node and all connected nodes and connecting edges for n layers.
     private retrieveNthNodesStatement(nodeID: string, depth: string): QueryConfig {
         return {
-            text: `WITH RECURSIVE related (orig_id, orig_container_id, orig_metatype_id, orig_data_source_id, orig_import_data_id,
-                                            orig_data_staging_id, orig_type_mapping_transformation_id, orig_original_data_id, orig_properties,
-                                            orig_metadata, orig_created_at, orig_modified_at, orig_deleted_at, orig_created_by, orig_modified_by,
-                                            orig_metatype_name, edge_id, edge_container_id, edge_relationship_pair_id, edge_data_source_id,
+            text: `WITH RECURSIVE related (origin_id, origin_container_id, origin_metatype_id, origin_data_source_id, origin_import_data_id,
+                                            origin_data_staging_id, origin_type_mapping_transformation_id, origin_original_data_id, origin_properties,
+                                            origin_metadata, origin_created_at, origin_modified_at, origin_deleted_at, origin_created_by, origin_modified_by,
+                                            origin_metatype_name, edge_id, edge_container_id, edge_relationship_pair_id, edge_data_source_id,
                                             edge_import_data_id, edge_data_staging_id, edge_type_mapping_transformation_id, edge_metadata,
                                             edge_created_at, edge_modified_at, edge_deleted_at, edge_properties, edge_modified_by, edge_created_by,
-                                            dest_id, dest_container_id, dest_metatype_id, dest_data_source_id, dest_import_data_id, dest_data_staging_id,
-                                            dest_type_mapping_transformation_id, dest_original_data_id, dest_properties, dest_metadata, dest_created_at,
-                                            dest_modified_at, dest_deleted_at, dest_created_by, dest_modified_by, dest_metatype_name, lvl) AS (
+                                            destination_id, destination_container_id, destination_metatype_id, destination_data_source_id, destination_import_data_id, destination_data_staging_id,
+                                            destination_type_mapping_transformation_id, destination_original_data_id, destination_properties, destination_metadata, destination_created_at,
+                                            destination_modified_at, destination_deleted_at, destination_created_by, destination_modified_by, destination_metatype_name, lvl) AS (
                     SELECT o.id, o.container_id, o.metatype_id, o.data_source_id, o.import_data_id, o.data_staging_id, o.type_mapping_transformation_id,
                     o.original_data_id, o.properties, o.metadata, o.created_at, o.modified_at, o.deleted_at, o.created_by, o.modified_by, o.metatype_name,
                     e.id, e.container_id, e.relationship_pair_id, e.data_source_id, e.import_data_id, e.data_staging_id, e.type_mapping_transformation_id,
@@ -276,19 +276,19 @@ export default class NodeMapper extends Mapper {
                             AND d.id != o.id
                     WHERE o.id = $1
                     UNION ALL
-                    SELECT r.dest_id, r.dest_container_id, r.dest_metatype_id, r.dest_data_source_id, r.dest_import_data_id, r.dest_data_staging_id,
-                    r.dest_type_mapping_transformation_id, r.dest_original_data_id, r.dest_properties, r.dest_metadata, r.dest_created_at, r.dest_modified_at,
-                    r.dest_deleted_at, r.dest_created_by, r.dest_modified_by, r.dest_metatype_name, e.id, e.container_id, e.relationship_pair_id, e.data_source_id,
+                    SELECT r.destination_id, r.destination_container_id, r.destination_metatype_id, r.destination_data_source_id, r.destination_import_data_id, r.destination_data_staging_id,
+                    r.destination_type_mapping_transformation_id, r.destination_original_data_id, r.destination_properties, r.destination_metadata, r.destination_created_at, r.destination_modified_at,
+                    r.destination_deleted_at, r.destination_created_by, r.destination_modified_by, r.destination_metatype_name, e.id, e.container_id, e.relationship_pair_id, e.data_source_id,
                     e.import_data_id, e.data_staging_id, e.type_mapping_transformation_id, e.metadata, e.created_at, e.modified_at, e.deleted_at, e.properties,
                     e.modified_by, e.created_by, d.id, d.container_id, d.metatype_id, d.data_source_id, d.import_data_id, d.data_staging_id,
                     d.type_mapping_transformation_id, d.original_data_id, d.properties, d.metadata, d.created_at, d.modified_at, d.deleted_at, d.created_by,
                     d.modified_by, d.metatype_name, r.lvl+1
                     FROM related r
                         JOIN edges e
-                            ON r.dest_id IN (e.origin_id, e.destination_id)
+                            ON r.destination_id IN (e.origin_id, e.destination_id)
                         JOIN current_nodes d
                             ON d.id IN (e.origin_id, e.destination_id)
-                            AND d.id != r.orig_id AND d.id != r.dest_id
+                            AND d.id != r.origin_id AND d.id != r.destination_id
                     ) SELECT * FROM related WHERE lvl <= $2;`,
             values: [nodeID, depth],
         };

From f9c24b548d778583a70bc28ef96a290e410b25eb Mon Sep 17 00:00:00 2001
From: Jaren Brownlee <jaren.brownlee@inl.gov>
Date: Thu, 24 Feb 2022 14:36:35 -0700
Subject: [PATCH 28/31] updated API documentation

---
 .../Core.swagger_collection.yaml              | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
index 7b5f12487..7dfd5657b 100644
--- a/API Documentation/Core.swagger_collection.yaml	
+++ b/API Documentation/Core.swagger_collection.yaml	
@@ -887,43 +887,18 @@ paths:
                               type: string
                             description:
                               type: string
-                          required:
-                            - name
-                            - description
                         destination_metatype_id:
                           type: string
                       required:
                         - origin_id
                         - origin_container_id
-                        - origin_data_source_id
-                        - origin_created_at
-                        - origin_modified_at
-                        - origin_created_by
-                        - origin_modified_by
-                        - origin_metatype_name
                         - edge_id
                         - edge_container_id
-                        - edge_relationship_pair_id
-                        - edge_data_source_id
-                        - edge_created_at
-                        - edge_modified_at
-                        - edge_modified_by
-                        - edge_created_by
                         - destination_id
                         - destination_container_id
-                        - destination_data_source_id
-                        - destination_created_at
-                        - destination_modified_at
-                        - destination_created_by
-                        - destination_modified_by
-                        - destination_metatype_name
                         - lvl
-                        - destination_metatype_id
                   isError:
                     type: boolean
-                required:
-                  - value
-                  - isError
       deprecated: false
     parameters:
       - schema:

From 114784bf06462a5dddbf3017bd3ac537381322e6 Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Mon, 28 Feb 2022 10:47:14 -0700
Subject: [PATCH 29/31] metatypes completely finished

---
 .../src/components/editMetatypeDialog.vue     | 133 ++++++++++--------
 .../src/components/editMetatypeKeyDialog.vue  |  40 ++++++
 AdminWebApp/src/pages/ContainerSelect.vue     |   2 +
 AdminWebApp/src/store/index.ts                |   2 +
 4 files changed, 119 insertions(+), 58 deletions(-)

diff --git a/AdminWebApp/src/components/editMetatypeDialog.vue b/AdminWebApp/src/components/editMetatypeDialog.vue
index 9e756f491..1cc9d84dd 100644
--- a/AdminWebApp/src/components/editMetatypeDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeDialog.vue
@@ -22,7 +22,7 @@
                   ref="form"
               >
                 <v-text-field
-                    v-model="selectedMetatype.name"
+                    v-model="comparisonMetatype.name"
                     required
                     :disabled="true"
                     class="disabled"
@@ -30,7 +30,7 @@
                   <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
                 </v-text-field>
                 <v-textarea
-                    v-model="selectedMetatype.description"
+                    v-model="comparisonMetatype.description"
                     required
                     :disabled="true"
                     class="disabled"
@@ -44,7 +44,7 @@
               <v-progress-linear v-if="keysLoading" indeterminate></v-progress-linear>
               <v-data-table
                   :headers="headers()"
-                  :items="selectedMetatype.keys"
+                  :items="comparisonMetatype.keys"
                   :items-per-page="100"
                   :footer-props="{
                      'items-per-page-options': [25, 50, 100]
@@ -80,6 +80,7 @@
                     v-model="selectedMetatype.name"
                     :rules="[v => !!v || $t('editMetatype.nameRequired')]"
                     required
+                    :class="(comparisonMetatype && selectedMetatype.name !== comparisonMetatype.name) ? 'edited-field' : ''"
                 >
                   <template v-slot:label>{{$t('editMetatype.name')}} <small style="color:red" >*</small></template>
                 </v-text-field>
@@ -87,6 +88,7 @@
                     v-model="selectedMetatype.description"
                     :rules="[v => !!v || $t('editMetatype.descriptionRequired')]"
                     required
+                    :class="(comparisonMetatype && selectedMetatype.description !== comparisonMetatype.description) ? 'edited-field' : ''"
                 >
                   <template v-slot:label>{{$t('editMetatype.description')}} <small style="color:red" >*</small></template>
                 </v-textarea>
@@ -119,12 +121,13 @@
                   </v-toolbar>
                 </template>
                 <template v-slot:[`item.actions`]="{ item }">
-                  <div v-if="$store.getters.isEditMode && !item.deleted_at">
+                  <div v-if="($store.getters.isEditMode && !item.deleted_at) || !$store.getters.ontologyVersioningEnabled">
+
                     <edit-metatype-key-dialog
                         :metatypeKey="item"
                         :metatype="metatype"
                         :icon="true"
-                        :comparison-metatype-key="comparisonMetatype.keys.find(k => k.name === item.name)"
+                        :comparison-metatype-key="(comparisonMetatype) ? comparisonMetatype.keys.find(k => k.name === item.name) : undefined"
                         @metatypeKeyEdited="loadKeys()"></edit-metatype-key-dialog>
                     <v-icon
                         small
@@ -325,78 +328,92 @@ export default class EditMetatypeDialog extends Vue {
     color: black !important;
   }
 
-  .edited-item {
-    background: #FB8C00;
-    color: white;
-
-    &:hover {
-      background: #FFA726 !important;
-      color: black;
-    }
-
-    .v-icon__svg {
+  .edited-field {
+    input {
+      background: #FB8C00;
       color: white !important;
+      box-shadow: -5px 0 0 #FB8C00;
     }
 
-    .v-icon {
+    textarea {
+      background: #FB8C00;
       color: white !important;
+      box-shadow: -5px 0 0 #FB8C00;
     }
   }
 
-  .created-item {
-    background: #7CB342;
-    color: white;
+    .edited-item {
+      background: #FB8C00;
+      color: white;
 
-    &:hover {
-      background: #9CCC65 !important;
-      color: black;
-    }
+      &:hover {
+        background: #FFA726 !important;
+        color: black;
+      }
 
-    .v-icon__svg {
-      color: white !important;
-    }
+      .v-icon__svg {
+        color: white !important;
+      }
 
-    .v-icon {
-      color: white !important;
+      .v-icon {
+        color: white !important;
+      }
     }
-  }
 
-  .deleted-item {
-    background: #E53935;
-    color: white;
+    .created-item {
+      background: #7CB342;
+      color: white;
 
-    &:hover {
-      background: #EF5350 !important;
-      color: black;
-    }
+      &:hover {
+        background: #9CCC65 !important;
+        color: black;
+      }
 
-    .v-icon__svg {
-      color: white !important;
+      .v-icon__svg {
+        color: white !important;
+      }
+
+      .v-icon {
+        color: white !important;
+      }
     }
 
-    .v-icon {
-      color: white !important;
+    .deleted-item {
+      background: #E53935;
+      color: white;
+
+      &:hover {
+        background: #EF5350 !important;
+        color: black;
+      }
+
+      .v-icon__svg {
+        color: white !important;
+      }
+
+      .v-icon {
+        color: white !important;
+      }
     }
-  }
 
-  .box {
-    float: left;
-    height: 20px;
-    width: 20px;
-    margin-bottom: 15px;
-    margin-left: 15px;
-    clear: both;
-  }
+    .box {
+      float: left;
+      height: 20px;
+      width: 20px;
+      margin-bottom: 15px;
+      margin-left: 15px;
+      clear: both;
+    }
 
-  .created {
-    background-color: #7CB342;
-  }
+    .created {
+      background-color: #7CB342;
+    }
 
-  .edited {
-    background-color: #FB8C00;
-  }
+    .edited {
+      background-color: #FB8C00;
+    }
 
-  .removed {
-    background-color: #E53935;
-  }
+    .removed {
+      background-color: #E53935;
+    }
 </style>
diff --git a/AdminWebApp/src/components/editMetatypeKeyDialog.vue b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
index ef2ad0992..dae197621 100644
--- a/AdminWebApp/src/components/editMetatypeKeyDialog.vue
+++ b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
@@ -138,6 +138,7 @@
               >
                 <v-text-field
                     v-model="selectedMetatypeKey.name"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.name !== comparisonMetatypeKey.name) ? 'edited-field' : ''"
                     :rules="[v => !!v || $t('editMetatypeKey.nameRequired')]"
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.name')}} <small style="color:red" >*</small></template>
@@ -146,6 +147,7 @@
                 <v-text-field
                     v-model="selectedMetatypeKey.property_name"
                     :rules="[v => !!v || $t('editMetatypeKey.propertyNameRequired')]"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.property_name !== comparisonMetatypeKey.property_name) ? 'edited-field' : ''"
                     required
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.propertyName')}} <small style="color:red" >*</small></template>
@@ -156,6 +158,7 @@
                     @change="selectedMetatypeKey.default_value = undefined"
                     :rules="[v => !!v || $t('editMetatypeKey.dataTypeRequired')]"
                     required
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.data_type !== comparisonMetatypeKey.data_type) ? 'edited-field' : ''"
                 >
                   <template v-slot:label>{{$t('editMetatypeKey.dataType')}} <small style="color:red" >*</small></template>
                 </v-select>
@@ -166,6 +169,7 @@
                 </v-checkbox>
                 <v-textarea
                     v-model="selectedMetatypeKey.description"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.description !== comparisonMetatypeKey.description) ? 'edited-field' : ''"
                     :rows="2"
                     :rules="[v => !!v || $t('editMetatypeKey.descriptionRequired')]"
                 >
@@ -175,12 +179,14 @@
                 <h3>{{$t('editMetatypeKey.validation')}}</h3>
                 <v-text-field
                     v-model="selectedMetatypeKey.validation.regex"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.validation.regex !== comparisonMetatypeKey.validation.regex) ? 'edited-field' : ''"
                     :label="$t('editMetatypeKey.regex')"
                 >
                   <template slot="append-outer"> <info-tooltip :message="$t('editMetatypeKey.regexHelp')"></info-tooltip></template>
                 </v-text-field>
                 <v-text-field
                     v-model.number="selectedMetatypeKey.validation.max"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.validation.max !== comparisonMetatypeKey.validation.max) ? 'edited-field' : ''"
                     :disabled="selectedMetatypeKey.validation.regex === ''"
                     type="number"
                     :label="$t('editMetatypeKey.max')"
@@ -189,6 +195,7 @@
                 </v-text-field>
                 <v-text-field
                     v-model.number="selectedMetatypeKey.validation.min"
+                    :class="(comparisonMetatypeKey && selectedMetatypeKey.validation.min !== comparisonMetatypeKey.validation.min) ? 'edited-field' : ''"
                     :disabled="selectedMetatypeKey.validation.regex === ''"
                     type="number"
                     :label="$t('editMetatypeKey.min')"
@@ -213,12 +220,14 @@
                   <v-text-field
                       v-if="selectedMetatypeKey.data_type === 'number'"
                       v-model="selectedMetatypeKey.default_value"
+                      :class="(comparisonMetatypeKey && selectedMetatypeKey.default_value !== comparisonMetatypeKey.default_value) ? 'edited-field' : ''"
                       type="number"
                       :label="$t('editMetatypeKey.defaultValue')"
                   ></v-text-field>
                   <v-select
                       v-else-if="selectedMetatypeKey.data_type === 'boolean'"
                       v-model="selectedMetatypeKey.default_value"
+                      :class="(comparisonMetatypeKey && selectedMetatypeKey.default_value !== comparisonMetatypeKey.default_value) ? 'edited-field' : ''"
                       :label="$t('editMetatypeKey.defaultValue')"
                       :items="booleanOptions"
                       required
@@ -227,6 +236,7 @@
                   <v-text-field
                       v-else
                       v-model="selectedMetatypeKey.default_value"
+                      :class="(comparisonMetatypeKey && selectedMetatypeKey.default_value !== comparisonMetatypeKey.default_value) ? 'edited-field' : ''"
                       :label="$t('editMetatypeKey.defaultValue')"
                   ></v-text-field>
                 </div>
@@ -324,4 +334,34 @@ export default class EditMetatypeKeyDialog extends Vue {
 .disabled textarea {
   color: black !important;
 }
+
+.disabled .v-select__selection{
+  color: black !important;
+}
+
+.edited-field {
+  input {
+    background: #FB8C00;
+    color: white !important;
+    box-shadow: -5px 0 0 #FB8C00;
+  }
+
+  textarea {
+    background: #FB8C00;
+    color: white !important;
+    box-shadow: -5px 0 0 #FB8C00;
+  }
+
+  .v-select__slot {
+    background: #FB8C00;
+    color: white !important;
+    box-shadow: -5px 0 0 #FB8C00;
+  }
+
+  .v-select__selection {
+    background: #FB8C00;
+    color: white !important;
+    box-shadow: -5px 0 0 #FB8C00;
+  }
+}
 </style>
diff --git a/AdminWebApp/src/pages/ContainerSelect.vue b/AdminWebApp/src/pages/ContainerSelect.vue
index dee4df5e8..a4c0ad14d 100644
--- a/AdminWebApp/src/pages/ContainerSelect.vue
+++ b/AdminWebApp/src/pages/ContainerSelect.vue
@@ -102,6 +102,8 @@ export default class ContainerSelection extends Vue {
   containerSelected(container: ContainerT) {
     this.selectedContainer = container
     this.$store.commit('setActiveContainer', container)
+    this.$store.commit('setEditMode', false)
+    this.$store.commit('setPendingOntologyVersion', undefined)
 
     if(this.$store.getters.ontologyVersioningEnabled) {
       this.$client.listOntologyVersions(container.id, {status: 'published'})
diff --git a/AdminWebApp/src/store/index.ts b/AdminWebApp/src/store/index.ts
index ee8d95a54..cbcb20b9a 100644
--- a/AdminWebApp/src/store/index.ts
+++ b/AdminWebApp/src/store/index.ts
@@ -60,6 +60,8 @@ export default new Vuex.Store({
     actions: {
         changeOntologyVersion({commit}, version) {
             commit('setOntologyVersion', version);
+            commit('setEditMode', false);
+            commit('setPendingOntologyVersion', undefined);
         },
 
         changePendingOntologyVersion({commit}, version) {

From 0c8e8bf790984d41284f3b5f1eb90a776bfa71df Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Wed, 2 Mar 2022 09:13:07 -0700
Subject: [PATCH 30/31] corrected ifc viewer, improved

---
 AdminWebApp/src/api/client.ts                 | 18 ++++++----
 AdminWebApp/src/api/types.ts                  |  4 +--
 .../src/components/createEdgeDialog.vue       |  3 +-
 .../src/components/createNodeDialog.vue       |  2 +-
 AdminWebApp/src/components/ifcViewer.vue      | 33 ++++++++++++++++---
 .../src/components/nodeFilesDialog.vue        | 11 +++----
 .../src/components/searchMetatypes.vue        |  2 +-
 AdminWebApp/src/translations.ts               |  4 +++
 AdminWebApp/src/views/DataMapping.vue         |  4 +--
 9 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/AdminWebApp/src/api/client.ts b/AdminWebApp/src/api/client.ts
index 52065de1d..350da1c7b 100644
--- a/AdminWebApp/src/api/client.ts
+++ b/AdminWebApp/src/api/client.ts
@@ -430,12 +430,16 @@ export class Client {
     }
 
     async uploadFile(containerID: string, dataSourceID: string, file: File): Promise<FileT> {
-        const results = await this.postFileRawReturn<ResultT[]>(`/containers/${containerID}/import/datasources/${dataSourceID}/files`, 'import', file);
+        const results = await this.postFileRawReturn<ResultT<ResultT<FileT>[]>>(
+            `/containers/${containerID}/import/datasources/${dataSourceID}/files`,
+            'import',
+            file,
+        );
 
         return new Promise((resolve, reject) => {
-            if (results[0].isError) reject(results[0].error);
+            if (results.value[0].isError) reject(results.value[0].error);
 
-            resolve(new Promise((r) => r(results[0].value as FileT)));
+            resolve(new Promise((r) => r(results.value[0].value as FileT)));
         });
     }
 
@@ -692,15 +696,15 @@ export class Client {
 
     // only use this function when exporting type mappings from one data source to another WITHIN THE SAME DL INSTANCE
     // this will not work for exporting to a separate instance of Deep Lynx
-    exportTypeMappings(containerID: string, dataSourceID: string, targetDataSource: string, ...typeMappings: TypeMappingT[]): Promise<ResultT[]> {
-        return this.postRawReturn<ResultT[]>(`/containers/${containerID}/import/datasources/${dataSourceID}/mappings/export`, {
+    exportTypeMappings(containerID: string, dataSourceID: string, targetDataSource: string, ...typeMappings: TypeMappingT[]): Promise<ResultT<any>[]> {
+        return this.postRawReturn<ResultT<any>[]>(`/containers/${containerID}/import/datasources/${dataSourceID}/mappings/export`, {
             mapping_ids: typeMappings.map((mapping) => mapping.id),
             target_data_source: targetDataSource,
         });
     }
 
-    importTypeMappings(containerID: string, dataSourceID: string, file: File): Promise<ResultT[]> {
-        return this.postFileRawReturn<ResultT[]>(`/containers/${containerID}/import/datasources/${dataSourceID}/mappings/import`, 'mappings', file);
+    importTypeMappings(containerID: string, dataSourceID: string, file: File): Promise<ResultT<any>[]> {
+        return this.postFileRawReturn<ResultT<any>[]>(`/containers/${containerID}/import/datasources/${dataSourceID}/mappings/import`, 'mappings', file);
     }
 
     retrieveTransformations(containerID: string, dataSourceID: string, typeMappingID: string): Promise<TypeMappingTransformationT[]> {
diff --git a/AdminWebApp/src/api/types.ts b/AdminWebApp/src/api/types.ts
index 4191fbd72..f9e3cef85 100644
--- a/AdminWebApp/src/api/types.ts
+++ b/AdminWebApp/src/api/types.ts
@@ -411,8 +411,8 @@ export type ChangelistApprovalT = {
     approved_at?: string;
 };
 
-export type ResultT = {
-    value: any;
+export type ResultT<T> = {
+    value: T;
     isError: boolean;
     error: any;
 };
diff --git a/AdminWebApp/src/components/createEdgeDialog.vue b/AdminWebApp/src/components/createEdgeDialog.vue
index b1fd850be..c442d15d2 100644
--- a/AdminWebApp/src/components/createEdgeDialog.vue
+++ b/AdminWebApp/src/components/createEdgeDialog.vue
@@ -144,7 +144,8 @@ export default class CreateRelationshipPairDialog extends Vue {
     if(this.destinationSelect.metatype && this.originSelect.metatype) {
        this.$client.listMetatypeRelationshipPairs(this.containerID,  {
         destinationID: this.destinationSelect.metatype.id,
-        originID: this.originSelect.metatype.id
+        originID: this.originSelect.metatype.id,
+        ontologyVersion: this.$store.getters.activeOntologyVersionID
       })
         .then((metatypeRelationshipPairs) => {
           this.metatypeRelationshipPairs = metatypeRelationshipPairs as MetatypeRelationshipPairT[]
diff --git a/AdminWebApp/src/components/createNodeDialog.vue b/AdminWebApp/src/components/createNodeDialog.vue
index b06eeb1a4..3b2497d0f 100644
--- a/AdminWebApp/src/components/createNodeDialog.vue
+++ b/AdminWebApp/src/components/createNodeDialog.vue
@@ -105,7 +105,7 @@ export default class CreateNodeDialog extends Vue {
 
   @Watch('originSearch', {immediate: true})
   onOriginSearchChange(newVal: string) {
-    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: true})
+    this.$client.listMetatypes(this.containerID, {name: newVal, loadKeys: true, ontologyVersion: this.$store.getters.activeOntologyVersionID})
         .then((metatypes) => {
           this.originMetatypes = metatypes as MetatypeT[]
           this.metatypesLoading = false
diff --git a/AdminWebApp/src/components/ifcViewer.vue b/AdminWebApp/src/components/ifcViewer.vue
index 4a222a81f..483fd2bc3 100644
--- a/AdminWebApp/src/components/ifcViewer.vue
+++ b/AdminWebApp/src/components/ifcViewer.vue
@@ -1,6 +1,6 @@
 <template>
   <v-dialog
-      v-model="dialog" @click:outside="dialog = false;" width="1080px">
+      v-model="dialog" @click:outside="dialog = false;" width="80%">
     <template v-slot:activator="{ on }">
       <v-icon
           v-if="icon"
@@ -24,8 +24,16 @@
           </v-col>
           <v-col :cols="5">
             <h3 v-if="loaded">{{$t('ifcViewer.Properties')}}</h3>
-            <v-card>
-              <json-view v-if="selected" :data="selected" max-depth="2" style="overflow-y: scroll"></json-view>
+
+            <v-card v-if="loaded && selected">
+              <div style="margin-left: 5px">
+                <h4>{{$t('ifcViewer.name')}}</h4>
+                <p>{{selected.Name.value}}</p>
+                <h4>{{$t('ifcViewer.description')}}</h4>
+                <p>{{selected.Description.value}}</p>
+              </div>
+              <h4 style="margin-left: 5px">{{$t('ifcViewer.rawProperties')}}</h4>
+              <json-view v-if="selected" :max-depth="0" :data="selected" style="overflow-y: scroll"></json-view>
             </v-card>
           </v-col>
         </v-row>
@@ -33,6 +41,7 @@
       <v-card-actions>
         <v-btn v-if="!loaded" @click="load()">{{$t('ifcViewer.loadModel')}}</v-btn>
         <v-btn v-if="loaded" @click="load()">{{$t('ifcViewer.resetModel')}}</v-btn>
+        <v-btn v-if="loaded" @click="dialog = false">{{$t('ifcViewer.close')}}</v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
@@ -64,6 +73,21 @@ import {
 import { IFCLoader } from "web-ifc-three/IFCLoader";
 import {FileT} from "@/api/types";
 
+type SelectedItem = {
+  Name: {
+    type: number;
+    value: string;
+  };
+  Description: {
+    type: number;
+    value: string;
+  };
+  GlobalID: {
+    type: number;
+    value: string;
+  };
+}
+
 @Component
 export default class IfcViewer extends Vue {
   @Prop({required: true})
@@ -73,13 +97,14 @@ export default class IfcViewer extends Vue {
   readonly icon!: boolean
 
   dialog = false
-  selected: any | null = null
+  selected: SelectedItem | null = null
 
   loading = false
   loaded = false
 
   load() {
     this.loading = true
+    this.selected = null
 
     //Creates the Three.js scene
     const scene = new Scene();
diff --git a/AdminWebApp/src/components/nodeFilesDialog.vue b/AdminWebApp/src/components/nodeFilesDialog.vue
index 600e8ace6..628d674c7 100644
--- a/AdminWebApp/src/components/nodeFilesDialog.vue
+++ b/AdminWebApp/src/components/nodeFilesDialog.vue
@@ -19,7 +19,7 @@
 
             <v-dialog
                 v-model="addFileDialog"
-                max-width="500px"
+                width="50%"
             >
               <template v-slot:activator="{ on, attrs }">
                 <v-btn
@@ -111,11 +111,10 @@ export default class NodeFilesDialog extends Vue {
         this.loadFiles()
       })
       .catch(e => this.errorMessage = e)
-    })
-    .catch(e => this.errorMessage = e)
-    .finally(() => {
-      this.addFileDialog = false
-      this.fileLoading = false
+      .finally(() => {
+        this.addFileDialog = false
+        this.fileLoading = false
+      })
     })
   }
 
diff --git a/AdminWebApp/src/components/searchMetatypes.vue b/AdminWebApp/src/components/searchMetatypes.vue
index a45d0582c..6d163ee3b 100644
--- a/AdminWebApp/src/components/searchMetatypes.vue
+++ b/AdminWebApp/src/components/searchMetatypes.vue
@@ -68,7 +68,7 @@ export default class SearchMetatypes extends Vue {
 
   @Watch('search', {immediate: true})
   onSearchChange(newVal: string) {
-    this.$client.listMetatypes(this.containerID, {name: newVal})
+    this.$client.listMetatypes(this.containerID, {name: newVal, ontologyVersion: this.$store.getters.activeOntologyVersionID})
         .then((metatypes) => {
           this.metatypes = metatypes as MetatypeT[]
         })
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index a3df651e3..3d4cac9cd 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -114,6 +114,10 @@ export default {
             selectFile: 'Select File to Upload',
         },
         ifcViewer: {
+            rawProperties: 'Raw Properties',
+            name: 'Name',
+            close: 'Close',
+            description: 'Description',
             loadWarning:
                 'Loading an IFC file into the browser can be a resource and time consuming process. If the file is large, or your connection to Deep Lynx slow, it may take several minutes for the file to load and render. Please be patient.',
             loadModel: 'Load IFC File',
diff --git a/AdminWebApp/src/views/DataMapping.vue b/AdminWebApp/src/views/DataMapping.vue
index db714d10f..0528e1498 100644
--- a/AdminWebApp/src/views/DataMapping.vue
+++ b/AdminWebApp/src/views/DataMapping.vue
@@ -356,7 +356,7 @@ export default class DataMapping extends Vue {
   typeMappings: TypeMappingT[] = []
   typeMappingsNoTransformations: TypeMappingT[] = []
   selectedMappings: [] = []
-  importedMappingResults: ResultT[] = []
+  importedMappingResults: ResultT<any>[] = []
   reviewMappings = false
 
   typeMappingCount = 0
@@ -667,7 +667,7 @@ export default class DataMapping extends Vue {
   }
 
   // allows the user to potentially review imported type mappings
-  mappingsImport(results: ResultT[]) {
+  mappingsImport(results: ResultT<any>[]) {
     this.importedMappingResults = results
     this.loadTypeMappings()
   }

From 1f6ea5a65f8cd14b6f8fda82252230af86442bba Mon Sep 17 00:00:00 2001
From: DARRJW <john.darrington@inl.gov>
Date: Wed, 2 Mar 2022 11:03:47 -0700
Subject: [PATCH 31/31] corrected imports from mappings

---
 .../src/components/searchMetatypes.vue        |  5 +-
 .../migrations/020_fix_trigger.sql            |  9 ++++
 .../etl/type_transformation_repository.ts     | 47 +++++++++++++++----
 3 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 src/data_access_layer/migrations/020_fix_trigger.sql

diff --git a/AdminWebApp/src/components/searchMetatypes.vue b/AdminWebApp/src/components/searchMetatypes.vue
index 6d163ee3b..3a5ba261b 100644
--- a/AdminWebApp/src/components/searchMetatypes.vue
+++ b/AdminWebApp/src/components/searchMetatypes.vue
@@ -62,7 +62,10 @@ export default class SearchMetatypes extends Vue {
       }
 
       this.$client.retrieveMetatype(this.containerID, this.metatypeID as string)
-      .then((result: MetatypeT) => this.selectedMetatype = result)
+      .then((result: MetatypeT) => {
+        this.selectedMetatype = result
+        this.emitSelected(this.selectedMetatype)
+      })
     }
   }
 
diff --git a/src/data_access_layer/migrations/020_fix_trigger.sql b/src/data_access_layer/migrations/020_fix_trigger.sql
new file mode 100644
index 000000000..b97dc3f05
--- /dev/null
+++ b/src/data_access_layer/migrations/020_fix_trigger.sql
@@ -0,0 +1,9 @@
+CREATE OR REPLACE FUNCTION new_ontology_version_insert_trigger() RETURNS TRIGGER AS $$
+DECLARE
+BEGIN
+    INSERT INTO ontology_versions(name, container_id, created_at, created_by,status)
+    VALUES(NEW.name, NEW.id, NOW(), NEW.created_by, 'published');
+
+    RETURN NEW;
+END;
+$$ language plpgsql;
\ No newline at end of file
diff --git a/src/data_access_layer/repositories/data_warehouse/etl/type_transformation_repository.ts b/src/data_access_layer/repositories/data_warehouse/etl/type_transformation_repository.ts
index 359ce4ee6..592e9111d 100644
--- a/src/data_access_layer/repositories/data_warehouse/etl/type_transformation_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/etl/type_transformation_repository.ts
@@ -18,8 +18,7 @@ import MetatypeRepository from '../ontology/metatype_repository';
 import MetatypeRelationshipPairRepository from '../ontology/metatype_relationship_pair_repository';
 import MetatypeRelationshipPair from '../../../../domain_objects/data_warehouse/ontology/metatype_relationship_pair';
 import Metatype from '../../../../domain_objects/data_warehouse/ontology/metatype';
-import NodeRepository from "../data/node_repository";
-import EdgeRepository from "../data/edge_repository";
+import OntologyVersionRepository from "../ontology/versioning/ontology_version_repository";
 
 /*
     TypeTransformationRepository contains methods for persisting and retrieving
@@ -192,8 +191,11 @@ export default class TypeTransformationRepository extends Repository implements
         // much faster to loop through some in-memory classes than it is to make a very large amount of database transactions
         // especially when you consider this is generally called as part of a very large export of mappings and this function
         // has to be run for each mapping in the export
-        const metatypeRepo = new MetatypeRepository();
-        const relationshipPairRepo = new MetatypeRelationshipPairRepository();
+        let metatypeRepo = new MetatypeRepository();
+        let relationshipPairRepo = new MetatypeRelationshipPairRepository();
+        // we must get the latest ontology version so we're importing the mappings to the correct ontology version
+        const ontologyRepository = new OntologyVersionRepository()
+        let ontologyVersion: string | undefined
 
         const metatypeNames: string[] = [];
         const relationshipPairNames: string[] = [];
@@ -201,6 +203,13 @@ export default class TypeTransformationRepository extends Repository implements
         let metatypes: Metatype[] = [];
         let relationshipPairs: MetatypeRelationshipPair[] = [];
 
+        const ontResults = await ontologyRepository.where().containerID('eq', containerID).and().status('eq', 'published').list({sortBy: 'id', sortDesc: true})
+        if(ontResults.isError || ontResults.value.length === 0) {
+            Logger.error('unable to fetch current ontology, or no currently published ontology')
+        } else {
+            ontologyVersion = ontResults.value[0].id
+        }
+
         for (const transformation of transformations) {
             if (transformation.metatype_name && !transformation.metatype_id) metatypeNames.push(transformation.metatype_name);
             if (transformation.metatype_relationship_pair_name && !transformation.metatype_relationship_pair_id)
@@ -210,16 +219,34 @@ export default class TypeTransformationRepository extends Repository implements
         // fetch all metatypes and relationship pairs by name specified, this allows us to minimize DB calls, though it
         // means we will be looping through the data again further down
         if (metatypeNames.length > 0) {
-            const results = await metatypeRepo.where().containerID('eq', containerID).and().name('in', metatypeNames).list();
+            metatypeRepo = metatypeRepo.where()
+                .containerID('eq', containerID)
+                .and().name('in', metatypeNames)
+
+            if(ontologyVersion) {
+                metatypeRepo = metatypeRepo.and().ontologyVersion('eq', ontologyVersion)
+            } else {
+                metatypeRepo = metatypeRepo.and().ontologyVersion('is null')
+            }
+
+            const results = await metatypeRepo.list();
 
             if (results.isError) Logger.error(`unable to fetch metatypes for set of transformations on backfill ${results.error?.error}`);
             else metatypes = results.value;
         }
 
         if (relationshipPairNames.length > 0) {
-            const results = await relationshipPairRepo.where()
-                .containerID('eq', containerID).and()
-                .name('in', relationshipPairNames).list(true); // we want the relationships so we can easily grab the relationship keys
+            relationshipPairRepo = relationshipPairRepo.where()
+                .containerID('eq', containerID)
+                .and().name('in', relationshipPairNames)
+
+            if(ontologyVersion) {
+                relationshipPairRepo = relationshipPairRepo.and().ontologyVersion('eq', ontologyVersion)
+            } else {
+                relationshipPairRepo = relationshipPairRepo.and().ontologyVersion('is null')
+            }
+
+            const results = await relationshipPairRepo.list(true)
 
             if (results.isError) Logger.error(`unable to fetch relationship pairs for set of transformations on backfill ${results.error?.error}`);
             else relationshipPairs = results.value;
@@ -252,6 +279,10 @@ export default class TypeTransformationRepository extends Repository implements
 
                 if (foundPair) {
                     transformations[i].metatype_relationship_pair_id = foundPair.id;
+                    transformations[i].origin_metatype_id = foundPair.origin_metatype_id
+                    transformations[i].destination_metatype_id = foundPair.destination_metatype_id
+                    transformations[i].origin_data_source_id = undefined
+                    transformations[i].destination_data_source_id = undefined
 
                     // now set the id's of all the keys
                     for (const j in transformations[i].keys) {