Merge pull request #1238 from NicoPennec/fix/various

Various fixes

.gitignore

@@ -53,3 +53,6 @@ tests/test-bundle.js
 # Custom
 TODO
 QA
+
+# Cache
+.eslintcache

package.json

@@ -5,6 +5,7 @@
   "author": "Frank Rousseau <frank@cg-wire.com>",
   "repository": "https://github.com/cgwire/kitsu",
   "license": "AGPL-3.0",
+  "private": true,
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -18,7 +19,7 @@
   "dependencies": {
     "@animxyz/vue": "0.6.7",
     "@google/model-viewer": "3.3.0",
-    "async": "3.2.4",
+    "async": "3.2.5",
     "bowser": "2.11.0",
     "chart.js": "2.9.4",
     "color-hash": "2.0.2",
@@ -62,18 +63,18 @@
     "@vue/compiler-sfc": "2.7.15",
     "@vue/test-utils": "1.3.6",
     "autoprefixer": "10.4.16",
-    "eslint": "8.52.0",
+    "eslint": "8.53.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "5.0.1",
-    "eslint-plugin-vue": "9.18.0",
+    "eslint-plugin-vue": "9.18.1",
     "esm": "3.2.25",
     "husky": "8.0.3",
     "jsdom": "22.1.0",
     "lint-staged": "14.0.1",
     "localStorage": "1.0.4",
     "postcss": "8.4.31",
     "prettier": "3.0.3",
-    "sass": "1.69.4",
+    "sass": "1.69.5",
     "vite": "4.5.0",
     "vite-plugin-eslint": "1.8.1",
     "vitest": "0.34.6",

src/App.vue

@@ -76,15 +76,6 @@ export default {
     this.setMainConfig()
   },
 
-  metaInfo: {
-    link: [
-      {
-        rel: 'icon',
-        href: '/static/favicon.ico'
-      }
-    ]
-  },
-
   methods: {
     ...mapActions([
       'getOrganisation',

src/components/modals/EditPlaylistModal.vue

@@ -21,7 +21,7 @@
             ref="nameField"
             :label="$t('playlists.fields.name')"
             @enter="runConfirmation"
-            v-model="form.name"
+            v-model.trim="form.name"
             v-focus
           />
           <combobox-simple
@@ -177,6 +177,10 @@ export default {
 
   methods: {
     runConfirmation() {
+      if (!this.form.name) {
+        this.$refs.nameField.focus()
+        return
+      }
       this.form.for_client = this.forClient === 'true'
       this.$emit('confirm', this.form)
     },

src/components/modals/EditTaskStatusModal.vue

@@ -233,7 +233,7 @@ export default {
       if (this.active) {
         this.resetForm()
         setTimeout(() => {
-          this.$refs.nameField.focus()
+          this.$refs.nameField?.focus()
         }, 100)
       }
     }

src/components/pages/TaskStatus.vue

@@ -63,7 +63,7 @@ export default {
 
   data() {
     return {
-      activeTab: 'actived',
+      activeTab: 'active',
       taskStatusToDelete: null,
       taskStatusToEdit: { color: '#000000' },
       modals: {
@@ -98,7 +98,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['taskStatus', 'archivedTaskStatus', 'taskStatusMap']),
+    ...mapGetters(['archivedTaskStatus', 'taskStatus']),
 
     taskStatusList() {
       return this.activeTab === 'active'
@@ -121,7 +121,7 @@ export default {
       }
 
       this.loading.edit = true
-      this.loading.del = false
+      this.errors.edit = false
       this.$store
         .dispatch(action, form)
         .then(() => {
@@ -177,7 +177,7 @@ export default {
 
   watch: {
     $route() {
-      this.activeTab = this.$route.query.tab || 'actived'
+      this.activeTab = this.$route.query.tab || 'active'
     }
   },
 

src/router/routes.js

@@ -73,16 +73,17 @@ const ADMIN_PAGES = [
   'asset-types',
   'backgrounds',
   'custom-actions',
-  'status-automations',
   'departments',
   'logs',
   'main-schedule',
   'people',
+  'newsfeed',
   'productions',
   'task-status',
   'task-types',
-  'main-schedule',
-  'settings'
+  'team-schedule',
+  'settings',
+  'status-automations'
 ]
 
 export const routes = [