fixing metadata import items (#131)

* fixing items * version increment
DigitalSlideArchive · Apr 18, 2024 · d429715 · d429715
1 parent 843ba2a
commit d429715
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 67 deletions.
diff --git a/client/dive-common/components/configurationEditors/TimelineConfiguration.vue b/client/dive-common/components/configurationEditors/TimelineConfiguration.vue
@@ -114,71 +114,73 @@ export default defineComponent({
 <template>
   <v-card>
     <h2>Custom Timeline List</h2>
-    <v-row dense>
-      <v-select
-        v-model="addTimeline"
-        :items="availableTimelines"
-        item-text="name"
-        label="Timeline"
-      >
-        <template #item="{ item }">
-          <span>Name: {{ item.name }} Type: {{ item.type }} </span>
-        </template>
-      </v-select>
-      <v-btn
-        :disabled="!addTimeline"
-        @click="$emit('add-timeline', { name: addTimeline, type: returnTimelineType(addTimeline) })"
-      >
-        Add Timeline
-      </v-btn>
-    </v-row>
-    <v-row dense>
-      <v-text-field
-        v-model.number="baseHeight"
-        type="number"
-        label="Max Timeline Area Height"
-        style="max-width: 150px;"
-        :rules="[v => (v >= 50) || 'Value needs to be 50 or higher']"
-        @change="$emit('update-height', $event)"
-      />
-    </v-row>
-    <v-row
-      v-for="(timeline, index) in timelineConfig.timelines"
-      :key="timeline.name"
-      dense
-    >
-      <v-col cols="3">
-        {{ timeline.name }}
-      </v-col>
-      <v-col>
-        <span>Height:</span>
-        {{ timeline.maxHeight }}
-      </v-col>
-      <v-col>
-        <span>Order:</span>
-        {{ timeline.order }}
-      </v-col>
-      <v-col>
-        <span>Dismissable:</span>
-        {{ timeline.dismissable }}
-      </v-col>
-      <v-col>
-        <span>Type:</span>
-        {{ timeline.type }}
-      </v-col>
-      <v-spacer />
-      <v-col>
-        <v-icon @click="editTimeline(index)">
-          mdi-pencil
-        </v-icon>
-        <v-icon
-          color="error"
-          @click="deleteTimeline(index)"
+    <v-card-text>
+      <v-row dense>
+        <v-select
+          v-model="addTimeline"
+          :items="availableTimelines"
+          item-text="name"
+          label="Timeline"
+        >
+          <template #item="{ item }">
+            <span>Name: {{ item.name }} Type: {{ item.type }} </span>
+          </template>
+        </v-select>
+        <v-btn
+          :disabled="!addTimeline"
+          @click="$emit('add-timeline', { name: addTimeline, type: returnTimelineType(addTimeline) })"
         >
-          mdi-delete
-        </v-icon>
-      </v-col>
-    </v-row>
+          Add Timeline
+        </v-btn>
+      </v-row>
+      <v-row dense>
+        <v-text-field
+          v-model.number="baseHeight"
+          type="number"
+          label="Max Timeline Area Height"
+          style="max-width: 150px;"
+          :rules="[v => (v >= 50) || 'Value needs to be 50 or higher']"
+          @change="$emit('update-height', $event)"
+        />
+      </v-row>
+      <v-row
+        v-for="(timeline, index) in timelineConfig.timelines"
+        :key="timeline.name"
+        dense
+      >
+        <v-col cols="3">
+          {{ timeline.name }}
+        </v-col>
+        <v-col>
+          <span>Height:</span>
+          {{ timeline.maxHeight }}
+        </v-col>
+        <v-col>
+          <span>Order:</span>
+          {{ timeline.order }}
+        </v-col>
+        <v-col>
+          <span>Dismissable:</span>
+          {{ timeline.dismissable }}
+        </v-col>
+        <v-col>
+          <span>Type:</span>
+          {{ timeline.type }}
+        </v-col>
+        <v-spacer />
+        <v-col>
+          <v-icon @click="editTimeline(index)">
+            mdi-pencil
+          </v-icon>
+          <v-icon
+            color="error"
+            @click="deleteTimeline(index)"
+          >
+            mdi-delete
+          </v-icon>
+        </v-col>
+      </v-row>
+    </v-card-text>
     <div v-if="editingTimeline">
       <v-card
         class="pa-3"

diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dive-dsa",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "author": {
     "name": "Kitware, Inc.",
     "email": "Bryon.Lewis@kitware.com"

diff --git a/client/src/ConfigurationManager.ts b/client/src/ConfigurationManager.ts
@@ -451,6 +451,7 @@ export default class ConfigurationManager {
       const { timelines } = this.configuration.value.timelineConfigs;
       if (timelines.length === 1) {
         this.configuration.value.timelineConfigs.timelines = [];
+        this.configuration.value.timelineConfigs.maxHeight = 175;
       } else if (timelines[index]) {
         timelines.splice(index, 1);
       }

diff --git a/client/src/components/AttributeFilter/AttributeKeyFilter.vue b/client/src/components/AttributeFilter/AttributeKeyFilter.vue
@@ -80,7 +80,7 @@ export default defineComponent({
 
 <template>
   <div>
-    <v-row no-gutters>
+    <v-row no-gutters dense>
       <h4>{{ !timeline ? 'Key' : 'Timeline' }} Filter</h4>
       <v-spacer />
       <tooltip-btn
@@ -103,6 +103,7 @@ export default defineComponent({
       <v-row
         no-gutters
         class="align-center"
+        dense
       >
         <v-checkbox
           :input-value="attributeFilter.active"
@@ -117,6 +118,7 @@ export default defineComponent({
       <v-row
         v-for="item in attributeFilter.appliedTo"
         :key="item"
+        dense
       >
         <div
           class="type-color-box"

diff --git a/client/src/components/FilterList.vue b/client/src/components/FilterList.vue
@@ -246,6 +246,7 @@ export default defineComponent({
       <v-row
         class="border-highlight"
         align="center"
+        dense
       >
         <v-col
           id="type-header"
@@ -301,7 +302,7 @@ export default defineComponent({
       v-model="data.filterText"
       type="text"
       placeholder="Search types"
-      class="mx-2 mt-2 shrink input-box"
+      class="mx-2 mt-2 mb-1 shrink input-box"
     >
     <div class="pb-2 overflow-y-hidden">
       <v-virtual-scroll

diff --git a/server/dive_server/views_metadata.py b/server/dive_server/views_metadata.py
@@ -241,7 +241,11 @@ def process_metadata(
                         for rootObj in modified_key_paths:
                             root = rootObj['root']
                             modified_path = rootObj['modified_path']
+                            if modified_path is None:
+                                continue
                             resource_path = remove_before_folder(resource_path, root)
+                            if resource_path is None:
+                                continue
                             resource_path = resource_path.replace(
                                 f'/Video {item[matcher]}', f'/{item[matcher]}'
                             )