Merge pull request #1640 from NicoPennec/main

Various fixes
cgwire · Dec 30, 2024 · 9ee222f · 9ee222f
2 parents bf2f28d + 6d3aa4f
commit 9ee222f
Show file tree

Hide file tree

Showing 13 changed files with 213 additions and 273 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "vuedraggable": "4.1.0",
     "vuex": "4.1.0",
     "vuex-router-sync": "6.0.0-rc.1",
-    "wavesurfer.js": "7.8.11"
+    "wavesurfer.js": "7.8.14"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.2.1",
@@ -77,7 +77,7 @@
     "esm": "3.2.25",
     "husky": "8.0.3",
     "jsdom": "24.1.3",
-    "lint-staged": "15.2.11",
+    "lint-staged": "15.3.0",
     "localStorage": "1.0.4",
     "prettier": "3.4.2",
     "sass": "1.78.0",

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -1,4 +1,4 @@
 set -e
 git pull --rebase origin main
 npm version patch
-git push origin main --tag
+git push origin main --tags
diff --git a/src/App.vue b/src/App.vue
@@ -985,14 +985,17 @@ label.label {
   text-transform: uppercase;
 }
 
-texarea,
 input.input {
   padding: 1em;
   height: 3em;
 }
 
 .select select {
   border-radius: 10px;
+
+  .datatable & {
+    border-radius: 3px;
+  }
 }
 
 .select select:hover,
@@ -2134,14 +2137,6 @@ th.validation-cell {
   }
 }
 
-.theme .datepicker input {
-  width: 150px;
-
-  &.short {
-    width: 112px;
-  }
-}
-
 .theme .vue-slider-dot-tooltip-inner {
   background: $purple-strong;
   border-color: $purple-strong;
@@ -2277,16 +2272,13 @@ th.validation-cell {
 
 #app .dp__input {
   border-radius: 10px;
-  padding-left: 0;
   height: 40px;
-  padding-inline-start: 0.8em;
-  width: 116px;
+  width: 118px;
 }
 
 #app .datatable .dp__input {
-  border-radius: 2px;
+  border-radius: 3px;
   height: 43px;
-  width: 116px;
 }
 
 @media screen and (max-width: 768px) {

diff --git a/src/components/lists/AssetList.vue b/src/components/lists/AssetList.vue
@@ -565,10 +565,12 @@ import { mapGetters, mapActions } from 'vuex'
 import { descriptorMixin } from '@/components/mixins/descriptors'
 import { entityListMixin } from '@/components/mixins/entity_list'
 import { formatListMixin } from '@/components/mixins/format'
-import { range } from '@/lib/time'
-import { sortTaskTypes } from '@/lib/sorting'
 import { selectionListMixin } from '@/components/mixins/selection'
 
+import preferences from '@/lib/preferences'
+import { sortTaskTypes } from '@/lib/sorting'
+import { range } from '@/lib/time'
+
 import ButtonSimple from '@/components/widgets/ButtonSimple.vue'
 import ComboboxTaskType from '@/components/widgets/ComboboxTaskType.vue'
 import DescriptionCell from '@/components/cells/DescriptionCell.vue'
@@ -936,9 +938,9 @@ export default {
         ...this.stickedColumns,
         [columnId]: sticked
       }
-      localStorage.setItem(
+      preferences.setObjectPreference(
         this.localStorageStickKey,
-        JSON.stringify(this.stickedColumns)
+        this.stickedColumns
       )
     },
 
@@ -1017,7 +1019,7 @@ export default {
 
   mounted() {
     this.stickedColumns =
-      JSON.parse(localStorage.getItem(this.localStorageStickKey)) || {}
+      preferences.getObjectPreference(this.localStorageStickKey) || {}
   }
 }
 </script>

diff --git a/src/components/lists/EditList.vue b/src/components/lists/EditList.vue
@@ -474,7 +474,9 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 
+import preferences from '@/lib/preferences'
 import { range } from '@/lib/time'
+
 import { descriptorMixin } from '@/components/mixins/descriptors'
 import { domMixin } from '@/components/mixins/dom'
 import { entityListMixin } from '@/components/mixins/entity_list'
@@ -761,9 +763,9 @@ export default {
         ...this.stickedColumns,
         [columnId]: sticked
       }
-      localStorage.setItem(
+      preferences.setObjectPreference(
         this.localStorageStickKey,
-        JSON.stringify(this.stickedColumns)
+        this.stickedColumns
       )
     },
 
@@ -831,7 +833,7 @@ export default {
 
   mounted() {
     this.stickedColumns =
-      JSON.parse(localStorage.getItem(this.localStorageStickKey)) || {}
+      preferences.getObjectPreference(this.localStorageStickKey) || {}
   }
 }
 </script>

diff --git a/src/components/lists/ShotList.vue b/src/components/lists/ShotList.vue
@@ -705,7 +705,9 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 
+import preferences from '@/lib/preferences'
 import { range } from '@/lib/time'
+
 import { descriptorMixin } from '@/components/mixins/descriptors'
 import { domMixin } from '@/components/mixins/dom'
 import { entityListMixin } from '@/components/mixins/entity_list'
@@ -822,7 +824,7 @@ export default {
 
   mounted() {
     this.stickedColumns =
-      JSON.parse(localStorage.getItem(this.localStorageStickKey)) || {}
+      preferences.getObjectPreference(this.localStorageStickKey) || {}
     this.addEvents(this.domEvents)
   },
 
@@ -1100,9 +1102,9 @@ export default {
         ...this.stickedColumns,
         [columnId]: sticked
       }
-      localStorage.setItem(
+      preferences.setObjectPreference(
         this.localStorageStickKey,
-        JSON.stringify(this.stickedColumns)
+        this.stickedColumns
       )
     },
 

diff --git a/src/components/mixins/entity_list.js b/src/components/mixins/entity_list.js
@@ -1,4 +1,5 @@
 import colors from '@/lib/colors'
+import preferences from '@/lib/preferences'
 import stringHelpers from '@/lib/string'
 
 import assetStore from '@/store/modules/assets'
@@ -33,7 +34,7 @@ export const entityListMixin = {
     window.addEventListener('keydown', this.onKeyDown, false)
     window.addEventListener('keyup', this.onKeyUp, false)
     this.stickedColumns =
-      JSON.parse(localStorage.getItem(this.localStorageStickKey)) || {}
+      preferences.getObjectPreference(this.localStorageStickKey) || {}
   },
 
   beforeUnmount() {
@@ -474,9 +475,9 @@ export const entityListMixin = {
         ...this.stickedColumns,
         [columnId]: sticked
       }
-      localStorage.setItem(
+      preferences.setObjectPreference(
         this.localStorageStickKey,
-        JSON.stringify(this.stickedColumns)
+        this.stickedColumns
       )
     },
 

diff --git a/src/components/pages/ProductionNewsFeed.vue b/src/components/pages/ProductionNewsFeed.vue
@@ -154,23 +154,20 @@
                       </div>
 
                       <div class="flexrow-item comment-content">
-                        <div>
-                          <div class="news-info flexrow">
-                            <span class="explaination flexrow-item flexrow">
-                              <entity-thumbnail
-                                class="ml1 entity-thumbnail mr1 flexrow-item"
-                                :entity="{
-                                  id: news.task_entity_id,
-                                  preview_file_id: news.entity_preview_file_id
-                                }"
-                                :with-link="false"
-                              />
-
-                              <span class="strong ml05">
-                                {{ news.full_entity_name }}
-                              </span>
+                        <div class="news-info flexrow">
+                          <span class="flexrow-item flexrow">
+                            <entity-thumbnail
+                              class="ml1 entity-thumbnail mr1 flexrow-item"
+                              :entity="{
+                                id: news.task_entity_id,
+                                preview_file_id: news.entity_preview_file_id
+                              }"
+                              :with-link="false"
+                            />
+                            <span class="strong ml05">
+                              {{ news.full_entity_name }}
                             </span>
-                          </div>
+                          </span>
                         </div>
                       </div>
                     </div>
@@ -217,23 +214,21 @@
                       </div>
 
                       <div class="flexrow-item comment-content">
-                        <div>
-                          <div class="news-info flexrow">
-                            <span class="explaination flexrow-item flexrow">
-                              <entity-thumbnail
-                                class="ml1"
-                                :entity="{
-                                  id: news.task_entity_id,
-                                  preview_file_id: news.entity_preview_file_id
-                                }"
-                                :with-link="false"
-                                v-if="news.entity_preview_file_id"
-                              />
-                              <span class="strong ml05 flexrow-item">
-                                {{ news.full_entity_name }}
-                              </span>
+                        <div class="news-info flexrow">
+                          <span class="flexrow-item flexrow">
+                            <entity-thumbnail
+                              class="ml1"
+                              :entity="{
+                                id: news.task_entity_id,
+                                preview_file_id: news.entity_preview_file_id
+                              }"
+                              :with-link="false"
+                              v-if="news.entity_preview_file_id"
+                            />
+                            <span class="strong ml05 flexrow-item">
+                              {{ news.full_entity_name }}
                             </span>
-                          </div>
+                          </span>
                         </div>
                       </div>
                     </div>

diff --git a/src/components/pages/production/NewProduction.vue b/src/components/pages/production/NewProduction.vue
@@ -121,16 +121,18 @@
             </label>
             <div class="date-picker-wrapper">
               <date-field
+                :can-delete="false"
                 :label="$t('main.start_date')"
-                :placeholder="startDatePlaceholder"
                 :max-date="productionToCreate.settings.dateEnd"
+                :placeholder="startDatePlaceholder"
                 v-model="productionToCreate.settings.dateStart"
               />
               <span class="input-separator">-</span>
               <date-field
+                :can-delete="false"
                 :label="$t('main.end_date')"
-                :placeholder="endDatePlaceholder"
                 :min-date="productionToCreate.settings.dateStart"
+                :placeholder="endDatePlaceholder"
                 v-model="productionToCreate.settings.dateEnd"
               />
             </div>
@@ -532,14 +534,12 @@ export default {
       'assetTaskTypes',
       'assetTypeMap',
       'assetTypes',
-      'productions',
       'productionStatus',
       'shotsCsvFormData',
       'shotTaskTypes',
       'taskStatus',
       'taskStatusMap',
-      'taskTypeMap',
-      'user'
+      'taskTypeMap'
     ]),
 
     isTVShow() {