Merge pull request #1179 from frankrousseau/master

Various improvements
cgwire · Sep 11, 2023 · 7530ab7 · 7530ab7
2 parents a035324 + 9f1b8a2
commit 7530ab7
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 20 deletions.
diff --git a/src/components/cells/MetadataHeader.vue b/src/components/cells/MetadataHeader.vue
@@ -16,6 +16,7 @@
       <span class="flexrow-item descriptor-name">
         {{ descriptor.name }}
       </span>
+
       <span
         class="metadata-menu-button header-icon"
         @click="$emit('show-metadata-header-menu', $event)"

diff --git a/src/components/cells/ValidationHeader.vue b/src/components/cells/ValidationHeader.vue
@@ -32,10 +32,12 @@
         {{ !hiddenColumns[columnId] ? taskTypeMap.get(columnId).name : '' }}
       </span>
 
-      <chevron-down-icon
+      <span
+        class="metadata-menu-button header-icon"
         @click="$emit('show-header-menu', $event)"
-        class="header-icon flexrow-item"
-      />
+      >
+        <chevron-down-icon :size="'12'" />
+      </span>
     </div>
   </th>
 </template>
@@ -136,4 +138,13 @@ th.metadata-descriptor {
   height: 18px;
   padding: 1px;
 }
+
+.metadata-menu-button {
+  background: var(--background);
+  border-radius: 50%;
+  height: 15px;
+  width: 15px;
+  position: absolute;
+  right: 5px;
+}
 </style>
diff --git a/src/components/lists/AssetList.vue b/src/components/lists/AssetList.vue
@@ -62,10 +62,10 @@
               :left="
                 offsets['editor-' + j] ? `${offsets['editor-' + j]}px` : '0'
               "
+              is-stick
               @show-metadata-header-menu="
                 event => showMetadataHeaderMenu(descriptor.id, event)
               "
-              is-stick
               v-for="(descriptor, j) in stickedVisibleMetadataDescriptors"
             />
 
@@ -278,7 +278,7 @@
               class="metadata-descriptor datatable-row-header"
               :title="asset.data ? asset.data[descriptor.field_name] : ''"
               :style="{
-                'z-index': 1000 - i, // Need for combo to be above the next cell
+                'z-index': 1000 - i, // Needed for combo to be above the next cell
                 left: offsets['editor-' + j]
                   ? `${offsets['editor-' + j]}px`
                   : '0'

diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue
@@ -9,7 +9,6 @@
               class="flexrow-item"
               :can-save="true"
               @change="onSearchChange"
-              @enter="saveSearchQuery"
               @save="saveSearchQuery"
               placeholder="ex: props modeling=wip"
             />

diff --git a/src/components/pages/Edits.vue b/src/components/pages/Edits.vue
@@ -9,10 +9,6 @@
               :can-save="true"
               :active="isSearchActive"
               @change="onSearchChange"
-              @enter="
-                query =>
-                  isLongEditList ? applySearch(query) : saveEditSearch(query)
-              "
               @save="saveSearchQuery"
               placeholder="ex: e01 edit=wip"
             />

diff --git a/src/components/pages/Episodes.vue b/src/components/pages/Episodes.vue
@@ -9,7 +9,6 @@
               :can-save="true"
               :active="isSearchActive"
               @change="onSearchChange"
-              @enter="saveSearchQuery"
               @save="saveSearchQuery"
               placeholder="ex: e01 episode=wip"
             />

diff --git a/src/components/pages/Sequences.vue b/src/components/pages/Sequences.vue
@@ -9,7 +9,6 @@
               :can-save="true"
               :active="isSearchActive"
               @change="onSearchChange"
-              @enter="saveSearchQuery"
               @save="saveSearchQuery"
               placeholder="ex: e01 sequence=wip"
             />

diff --git a/src/components/pages/Shots.vue b/src/components/pages/Shots.vue
@@ -9,10 +9,7 @@
               :can-save="true"
               :active="isSearchActive"
               @change="onSearchChange"
-              @enter="
-                query =>
-                  isLongShotList ? applySearch(query) : saveShotSearch(query)
-              "
+              @enter="applySearch(query)"
               @save="saveSearchQuery"
               placeholder="ex: e01 s01 anim=wip"
             />

diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
@@ -504,6 +504,7 @@ export default {
   },
 
   mounted() {
+    this.searchField.setValue(this.$route.query.search || '')
     this.clearSelectedTasks()
     const isAssets = this.$route.path.includes('assets')
     const isShots = this.$route.path.includes('shots')
@@ -763,9 +764,13 @@ export default {
             this.loading.entities = false
             this.resetTasks()
             this.focusSearchField({ preventScroll: true })
-            const searchQuery = this.searchField
-              ? this.searchField.getValue()
-              : ''
+            let searchQuery = this.$route.query.search
+            if (searchQuery.length === 0) {
+              searchQuery =
+                !searchQuery && this.searchField
+                  ? this.searchField.getValue()
+                  : ''
+            }
             if (searchQuery) this.onSearchChange(searchQuery)
             setTimeout(() => {
               this.setSearchFromUrl()
@@ -791,6 +796,14 @@ export default {
         this.setCurrentScheduleItem().then(() => {
           this.resetTaskTypeDates()
           this.loading.entities = false
+          let searchQuery = this.$route.query.search
+          if (searchQuery.length === 0) {
+            searchQuery =
+              !searchQuery && this.searchField
+                ? this.searchField.getValue()
+                : ''
+          }
+          if (searchQuery) this.onSearchChange(searchQuery)
           if (this.isActiveTab('schedule')) {
             this.resetScheduleItems()
             this.resetScheduleScroll()
@@ -981,7 +994,7 @@ export default {
 
     resetTaskIndex() {
       this.$options.taskIndex = buildSupervisorTaskIndex(
-        this.tasks,
+        this.entityTasks,
         this.personMap,
         this.taskStatusMap
       )