Merge pull request cgwire#1661 from NicoPennec/main

Various fixes
frankrousseau · Jan 15, 2025 · 83cbdf1 · 83cbdf1
2 parents 037be31 + 8dd0cb4
commit 83cbdf1
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@fullcalendar/multimonth": "6.1.15",
     "@fullcalendar/vue3": "6.1.15",
     "@google/model-viewer": "4.0.0",
-    "@sentry/vue": "8.48.0",
+    "@sentry/vue": "8.49.0",
     "@unhead/vue": "1.11.18",
     "@vuepic/vue-datepicker": "11.0.1",
     "async": "3.2.6",
@@ -72,7 +72,7 @@
     "autoprefixer": "10.4.20",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-prettier": "5.2.2",
     "eslint-plugin-vue": "9.32.0",
     "esm": "3.2.25",
     "husky": "9.1.7",

diff --git a/src/components/lists/ProductionTeamList.vue b/src/components/lists/ProductionTeamList.vue
@@ -32,16 +32,14 @@
               {{ person.email }}
             </td>
             <td class="contract" v-if="isCurrentUserManager">
-              {{ $t('people.contract.' + person.contract_type) }}
+              {{ $t(`people.contract.${person.contract_type}`) }}
+            </td>
+            <td class="role">
+              {{ $t(`people.role.${person.role}`) }}
             </td>
-            <td class="role">{{ $t(`people.role.${person.role}`) }}</td>
             <department-names-cell :departments="person.departments" />
             <td class="actions has-text-right" v-if="isCurrentUserManager">
-              <button
-                class="button"
-                @click="removePerson(person)"
-                v-if="isCurrentUserAdmin"
-              >
+              <button class="button" @click="removePerson(person)">
                 {{ $t('main.remove') }}
               </button>
             </td>
@@ -82,7 +80,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['isCurrentUserAdmin', 'isCurrentUserManager']),
+    ...mapGetters(['isCurrentUserManager']),
 
     isEmpty() {
       return !this.entries?.length

diff --git a/src/components/modals/BuildFilterModal.vue b/src/components/modals/BuildFilterModal.vue
@@ -81,7 +81,11 @@
           />
         </div>
         <div class="add-button">
-          <button-simple icon="plus" @click="addTaskTypeFilter" />
+          <button-simple
+            :disabled="!taskTypeList.length"
+            icon="plus"
+            @click="addTaskTypeFilter"
+          />
         </div>
 
         <div class="mt2" v-if="descriptorOptions.length > 0">

diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue
@@ -833,7 +833,10 @@ export default {
     },
 
     resetSequenceOption() {
-      if (this.currentProduction.production_style === 'nft') {
+      if (
+        this.currentProduction.production_style === 'nft' &&
+        this.castingSequencesOptions[1]
+      ) {
         this.sequenceId = this.castingSequencesOptions[1].value
       }
     },

diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
@@ -1624,7 +1624,10 @@ export default {
           setTimeout(() => {
             this.resetTaskIndex()
             this.$nextTick(() => {
-              if (!this.selectedTasks.get(eventData.task_id)) {
+              if (
+                !this.selectedTasks.get(eventData.task_id) &&
+                this.searchField
+              ) {
                 this.onSearchChange(this.searchField.getValue())
               }
             })

diff --git a/src/components/pages/Team.vue b/src/components/pages/Team.vue
@@ -121,29 +121,28 @@ export default {
     return {
       importDepartmentId: null,
       importProductionId: null,
-      person: null,
-      isTeamLoading: false,
-      isTeamLoadingError: false
+      person: null
     }
   },
 
   mounted() {
     if (this.availableProductions.length > 0) {
       this.importProductionId = this.availableProductions[0]?.id
       this.importDepartmentId = this.departments.sort((a, b) =>
-        a.name.localeCompare(b.name)
+        a.name.localeCompare(b.name, undefined, {
+          numeric: true
+        })
       )[0]?.id
     }
   },
 
   computed: {
     ...mapGetters([
+      'activePeople',
       'currentProduction',
       'departments',
-      'departmentMap',
       'isCurrentUserManager',
       'openProductions',
-      'activePeople',
       'personMap',
       'productionMap'
     ]),

diff --git a/src/components/pages/entities/EntityNews.vue b/src/components/pages/entities/EntityNews.vue
@@ -211,6 +211,7 @@ export default {
     margin-right: 3em;
     font-size: 0.8em;
     color: $grey;
+    white-space: nowrap;
   }
 
   .task-type-wrapper {

diff --git a/src/components/previews/PreviewPlayer.vue b/src/components/previews/PreviewPlayer.vue
@@ -105,7 +105,8 @@
           :task="task"
           @comment-added="$emit('comment-added')"
           @time-code-clicked="timeCodeClicked"
-          v-if="!isCommentsHidden"
+          v-show="!isCommentsHidden"
+          v-if="!readOnly"
         />
       </div>
     </div>
@@ -1388,8 +1389,8 @@ export default {
       }
       // fix edge cases on toggling fullscreen
       setTimeout(() => {
-        this.previewViewer.resize()
-        this.comparisonViewer.resize()
+        this.previewViewer?.resize()
+        this.comparisonViewer?.resize()
       }, 500)
     },
 
@@ -2035,8 +2036,8 @@ export default {
         this.isDrawing = false
         this.refreshCanvas()
         setTimeout(() => {
-          this.previewViewer.resize()
-          this.comparisonViewer.resize()
+          this.previewViewer?.resize()
+          this.comparisonViewer?.resize()
         }, 500)
       } else if (this.is3DModel) {
         this.fixCanvasSize({ width: 0, height: 0, left: 0, top: 0 })

diff --git a/src/components/sides/TaskInfo.vue b/src/components/sides/TaskInfo.vue
@@ -1321,9 +1321,7 @@ export default {
     },
 
     refreshPreviewPlay() {
-      if (this.$refs['preview-player']) {
-        this.$refs['preview-player'].previewViewer.resize()
-      }
+      this.$refs['preview-player']?.previewViewer?.resize()
     },
 
     removeTaskFromSelection(task) {

diff --git a/src/components/widgets/TaskTypeName.vue b/src/components/widgets/TaskTypeName.vue
@@ -1,5 +1,10 @@
 <template>
-  <router-link :to="targetRoute" v-if="productionId && !isCurrentUserClient">
+  <router-link
+    :to="targetRoute"
+    v-if="
+      productionId && !isCurrentUserClient && taskType.for_entity !== 'Concept'
+    "
+  >
     <span
       class="tag task-type-name"
       :style="{

diff --git a/vite.config.js b/vite.config.js
@@ -8,7 +8,7 @@ export default defineConfig({
     vue({
       template: {
         compilerOptions: {
-          isCustomElement: tag => ['model-viewer'].includes(tag)
+          isCustomElement: tag => ['drag', 'drop', 'model-viewer'].includes(tag)
         }
       }
     })