From 589792c20a1da94f485d43f0422e4202b8434726 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 17 Oct 2023 01:14:17 +0200 Subject: [PATCH 1/8] [qa] bump dependencies --- package-lock.json | 93 ++++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index f58476256a..fe958c1a39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "autoprefixer": "10.4.16", "eslint": "8.51.0", "eslint-config-prettier": "9.0.0", - "eslint-plugin-prettier": "5.0.0", + "eslint-plugin-prettier": "5.0.1", "eslint-plugin-vue": "9.17.0", "esm": "3.2.25", "husky": "8.0.3", @@ -66,7 +66,7 @@ "localStorage": "1.0.4", "postcss": "8.4.31", "prettier": "3.0.3", - "sass": "1.69.0", + "sass": "1.69.3", "vite": "4.4.11", "vite-plugin-eslint": "1.8.1", "vitest": "0.34.6", @@ -667,9 +667,9 @@ "dev": true }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz", - "integrity": "sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", + "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" }, "node_modules/@lit/reactive-element": { "version": "1.6.3", @@ -794,9 +794,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==", + "version": "4.3.8", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.8.tgz", + "integrity": "sha512-yW/qTM4mRBBcsA9Xw9FbcImYtFPY7sgr+G/O5RDYVmxiy9a+pE5FyoFUi8JYCZY5nicj8atrr1pcfPiYpeNGOA==", "dev": true }, "node_modules/@types/chai-subset": { @@ -809,9 +809,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.44.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", - "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", + "version": "8.44.4", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.4.tgz", + "integrity": "sha512-lOzjyfY/D9QR4hY9oblZ76B90MYTB3RrQ4z2vBIJKj9ROCRqdkYl2gSUx1x1a4IWPjKJZLL4Aw1Zfay7eMnmnA==", "dev": true, "dependencies": { "@types/estree": "*", @@ -831,9 +831,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.8.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz", - "integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==", + "version": "20.8.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.6.tgz", + "integrity": "sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==", "dev": true, "dependencies": { "undici-types": "~5.25.1" @@ -1419,9 +1419,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001546", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz", - "integrity": "sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==", + "version": "1.0.30001549", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz", + "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==", "dev": true, "funding": [ { @@ -1913,9 +1913,9 @@ } }, "node_modules/define-data-property": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", - "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", "dependencies": { "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", @@ -2132,9 +2132,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.545", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.545.tgz", - "integrity": "sha512-G1HKumUw+y5yxMjewGfKz0XrqG6O+Tb4zrlC/Vs1+9riRXBuFlO0hOEXP3xeI+ltlJkbVUuLkYdmjHYH6Jkiow==", + "version": "1.4.556", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.556.tgz", + "integrity": "sha512-6RPN0hHfzDU8D56E72YkDvnLw5Cj2NMXZGg3UkgyoHxjVhG99KZpsKgBWMmTy0Ei89xwan+rbRsVB9yzATmYzQ==", "dev": true }, "node_modules/emoji-regex": { @@ -2351,9 +2351,9 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", - "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", + "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, "dependencies": { "prettier-linter-helpers": "^1.0.0", @@ -2879,9 +2879,9 @@ } }, "node_modules/fraction.js": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz", - "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", "dev": true, "engines": { "node": "*" @@ -2935,9 +2935,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/functional-red-black-tree": { "version": "1.0.1", @@ -3928,12 +3931,12 @@ } }, "node_modules/loupe": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", - "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/lru-cache": { @@ -3948,9 +3951,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.4", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.4.tgz", - "integrity": "sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==", + "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -4366,9 +4369,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz", + "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5162,9 +5165,9 @@ } }, "node_modules/sass": { - "version": "1.69.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.0.tgz", - "integrity": "sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==", + "version": "1.69.3", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.3.tgz", + "integrity": "sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index e87a528e41..d5b89cf1b9 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "autoprefixer": "10.4.16", "eslint": "8.51.0", "eslint-config-prettier": "9.0.0", - "eslint-plugin-prettier": "5.0.0", + "eslint-plugin-prettier": "5.0.1", "eslint-plugin-vue": "9.17.0", "esm": "3.2.25", "husky": "8.0.3", @@ -73,7 +73,7 @@ "localStorage": "1.0.4", "postcss": "8.4.31", "prettier": "3.0.3", - "sass": "1.69.0", + "sass": "1.69.3", "vite": "4.4.11", "vite-plugin-eslint": "1.8.1", "vitest": "0.34.6", From d974cbf385237a1e3f0d8b828fab02fdf4c10b28 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 17 Oct 2023 01:14:56 +0200 Subject: [PATCH 2/8] [qa] remove invalid css --- src/components/Main.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Main.vue b/src/components/Main.vue index 507e1088d2..b711a28a45 100644 --- a/src/components/Main.vue +++ b/src/components/Main.vue @@ -30,6 +30,5 @@ export default { height: 100%; display: flex; flex-direction: column; - background: $white-grey; } From e754c9e218e8a8e78ada8cacd744087f142144a7 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 17 Oct 2023 01:19:46 +0200 Subject: [PATCH 3/8] [qa] update the default production style to ensure consistency with the backend --- src/components/lists/ProductionList.vue | 8 ++++++-- src/components/modals/EditProductionModal.vue | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/lists/ProductionList.vue b/src/components/lists/ProductionList.vue index c4650e669b..fcd3b2e171 100644 --- a/src/components/lists/ProductionList.vue +++ b/src/components/lists/ProductionList.vue @@ -47,7 +47,9 @@ {{ $t('productions.type.' + (entry.production_type || 'short')) }} - {{ $t('productions.style.' + (entry.production_style || '3d')) }} + {{ + $t('productions.style.' + (entry.production_style || '2d3d')) + }} {{ entry.fps }} @@ -90,7 +92,9 @@ {{ $t('productions.type.' + (entry.production_type || 'short')) }} - {{ $t('productions.style.' + (entry.production_style || '3d')) }} + {{ + $t('productions.style.' + (entry.production_style || '2d3d')) + }} {{ entry.fps }} diff --git a/src/components/modals/EditProductionModal.vue b/src/components/modals/EditProductionModal.vue index 160155726b..b1dd09eacc 100644 --- a/src/components/modals/EditProductionModal.vue +++ b/src/components/modals/EditProductionModal.vue @@ -148,7 +148,7 @@ export default { ratio: this.productionToEdit.ratio, resolution: this.productionToEdit.resolution, production_type: this.productionToEdit.production_type || 'short', - production_style: this.productionToEdit.production_style || '3d' + production_style: this.productionToEdit.production_style || '2d3d' } } else { data.form = { @@ -160,7 +160,7 @@ export default { ratio: '', resolution: '', production_type: 'short', - production_style: '3d' + production_style: '2d3d' } } From f4010c5c5d99e7bc3b1e9849d68da8a246a7d48c Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 17 Oct 2023 10:21:00 +0200 Subject: [PATCH 4/8] [qa] fix vue component names --- .../{TaskStatusName.vue => TaskStatusCell.vue} | 2 +- .../cells/{TaskTypeName.vue => TaskTypeCell.vue} | 0 src/components/lists/DepartmentList.vue | 2 +- src/components/lists/EntityTaskList.vue | 2 +- src/components/lists/EpisodeStatsList.vue | 2 +- src/components/lists/PreviewFileList.vue | 8 ++++---- src/components/lists/StatusAutomationList.vue | 16 ++++++++-------- src/components/lists/TaskStatusList.vue | 6 +++--- src/components/lists/TaskTypeList.vue | 2 +- src/components/lists/TimesheetList.vue | 2 +- src/components/lists/TodosList.vue | 2 +- src/components/modals/AddCommentImageModal.vue | 2 +- src/components/modals/CreateTasksModal.vue | 2 +- src/components/modals/ImportModal.vue | 2 +- src/components/modals/ManageShotsModal.vue | 2 +- src/components/modals/ShortcutModal.vue | 2 +- src/components/pages/Breakdown.vue | 2 +- src/components/pages/EpisodeStats.vue | 2 +- src/components/pages/FirstConnection.vue | 2 +- src/components/pages/MyChecks.vue | 2 +- src/components/pages/Notifications.vue | 2 +- src/components/pages/Playlist.vue | 2 +- src/components/pages/ProductionNewsFeed.vue | 2 +- src/components/pages/ResetChangePassword.vue | 2 +- src/components/pages/Team.vue | 2 +- src/components/pages/Timesheets.vue | 2 +- src/components/pages/departments/Departments.vue | 2 +- .../pages/entities/EntityPreviewFiles.vue | 6 +++--- src/components/pages/entities/EntityTimeLogs.vue | 6 +++--- src/components/pages/logs/Events.vue | 2 +- src/components/pages/logs/PreviewFiles.vue | 2 +- .../pages/production/NewProduction.vue | 2 +- .../pages/production/ProductionTaskType.vue | 2 +- src/components/pages/production/TimelineItem.vue | 2 +- src/components/sides/PeopleQuotaInfo.vue | 2 +- src/components/tops/TopbarEpisodeList.vue | 2 +- src/components/widgets/BooleanField.vue | 2 +- src/components/widgets/ColorField.vue | 2 +- src/components/widgets/ColorPicker.vue | 2 +- src/components/widgets/ComboboxNumber.vue | 2 +- src/components/widgets/ComboboxSimple.vue | 2 +- src/components/widgets/DateField.vue | 2 +- src/components/widgets/InfoQuestionMark.vue | 2 +- src/components/widgets/MetadataField.vue | 2 +- src/components/widgets/PencilPicker.vue | 2 +- src/components/widgets/PreviewRoom.vue | 2 +- src/components/widgets/StatusAutomationItem.vue | 10 +++++----- src/router/routes.js | 4 ++-- src/testrouter/routes.js | 4 ++-- 49 files changed, 70 insertions(+), 70 deletions(-) rename src/components/cells/{TaskStatusName.vue => TaskStatusCell.vue} (97%) rename src/components/cells/{TaskTypeName.vue => TaskTypeCell.vue} (100%) diff --git a/src/components/cells/TaskStatusName.vue b/src/components/cells/TaskStatusCell.vue similarity index 97% rename from src/components/cells/TaskStatusName.vue rename to src/components/cells/TaskStatusCell.vue index 8aca67061e..38ea5c7a11 100644 --- a/src/components/cells/TaskStatusName.vue +++ b/src/components/cells/TaskStatusCell.vue @@ -18,7 +18,7 @@ import { mapGetters, mapActions } from 'vuex' export default { - name: 'task-status-name', + name: 'task-status-cell', components: {}, props: { entry: { diff --git a/src/components/cells/TaskTypeName.vue b/src/components/cells/TaskTypeCell.vue similarity index 100% rename from src/components/cells/TaskTypeName.vue rename to src/components/cells/TaskTypeCell.vue diff --git a/src/components/lists/DepartmentList.vue b/src/components/lists/DepartmentList.vue index 356de25469..b29e9e7f88 100644 --- a/src/components/lists/DepartmentList.vue +++ b/src/components/lists/DepartmentList.vue @@ -42,7 +42,7 @@ import RowActionsCell from '@/components/cells/RowActionsCell' import TableInfo from '@/components/widgets/TableInfo' export default { - name: 'departments-list', + name: 'department-list', props: ['entries', 'isLoading', 'isError'], data() { return {} diff --git a/src/components/lists/EntityTaskList.vue b/src/components/lists/EntityTaskList.vue index 213acaf3ee..2b6fe6e681 100644 --- a/src/components/lists/EntityTaskList.vue +++ b/src/components/lists/EntityTaskList.vue @@ -108,7 +108,7 @@ import { mapGetters, mapActions } from 'vuex' import { formatListMixin } from '@/components/mixins/format' -import TaskTypeCell from '@/components/cells/TaskTypeName' +import TaskTypeCell from '@/components/cells/TaskTypeCell' import TableInfo from '@/components/widgets/TableInfo' import ValidationTag from '@/components/widgets/ValidationTag' import PeopleAvatar from '@/components/widgets/PeopleAvatar' diff --git a/src/components/lists/EpisodeStatsList.vue b/src/components/lists/EpisodeStatsList.vue index 934ddffbe2..1975a8c77f 100644 --- a/src/components/lists/EpisodeStatsList.vue +++ b/src/components/lists/EpisodeStatsList.vue @@ -207,7 +207,7 @@ import StatsCell from '@/components/cells/StatsCell' import TableInfo from '@/components/widgets/TableInfo' export default { - name: 'episode-list', + name: 'episode-stats-list', mixins: [entityListMixin], components: { diff --git a/src/components/lists/PreviewFileList.vue b/src/components/lists/PreviewFileList.vue index 7883b0c725..7ff23bf5f9 100644 --- a/src/components/lists/PreviewFileList.vue +++ b/src/components/lists/PreviewFileList.vue @@ -50,7 +50,7 @@ {{ previewFile.full_entity_name }} - @@ -84,17 +84,17 @@ import { getTaskPath } from '@/lib/path' import ButtonSimple from '@/components/widgets/ButtonSimple' import TableInfo from '@/components/widgets/TableInfo' import ProductionNameCell from '@/components/cells/ProductionNameCell' -import TaskTypeName from '@/components/cells/TaskTypeName' +import TaskTypeCell from '@/components/cells/TaskTypeCell' export default { - name: 'entity-task-list', + name: 'preview-file-list', mixins: [formatListMixin], components: { ButtonSimple, ProductionNameCell, TableInfo, - TaskTypeName + TaskTypeCell }, props: { diff --git a/src/components/lists/StatusAutomationList.vue b/src/components/lists/StatusAutomationList.vue index d364fc4a9c..6bf5b8580c 100644 --- a/src/components/lists/StatusAutomationList.vue +++ b/src/components/lists/StatusAutomationList.vue @@ -45,11 +45,11 @@ - - @@ -60,11 +60,11 @@ : $t('status_automations.change_status') }} - - {{ entry.name }} - + @@ -77,7 +77,7 @@ import { formatListMixin } from '@/components/mixins/format' import BooleanCell from '@/components/cells/BooleanCell' import RowActionsCell from '@/components/cells/RowActionsCell' import TableInfo from '@/components/widgets/TableInfo' -import TaskStatusName from '@/components/cells/TaskStatusName' +import TaskStatusCell from '@/components/cells/TaskStatusCell' export default { name: 'task-status-list', @@ -105,7 +105,7 @@ export default { BooleanCell, RowActionsCell, TableInfo, - TaskStatusName + TaskStatusCell }, computed: { ...mapGetters([]) diff --git a/src/components/lists/TaskTypeList.vue b/src/components/lists/TaskTypeList.vue index 2455c171b9..d3218ec3ac 100644 --- a/src/components/lists/TaskTypeList.vue +++ b/src/components/lists/TaskTypeList.vue @@ -257,7 +257,7 @@ import BooleanRep from '@/components/widgets/BooleanRep' import DepartmentName from '@/components/widgets/DepartmentName.vue' import RowActionsCell from '@/components/cells/RowActionsCell' import TableInfo from '@/components/widgets/TableInfo' -import TaskTypeCell from '@/components/cells/TaskTypeName' +import TaskTypeCell from '@/components/cells/TaskTypeCell' export default { name: 'task-type-list', diff --git a/src/components/lists/TimesheetList.vue b/src/components/lists/TimesheetList.vue index 22e3cabaf2..cb9d476aaa 100644 --- a/src/components/lists/TimesheetList.vue +++ b/src/components/lists/TimesheetList.vue @@ -197,7 +197,7 @@ import EntityThumbnail from '@/components/widgets/EntityThumbnail' import PageSubtitle from '@/components/widgets/PageSubtitle' import ProductionNameCell from '@/components/cells/ProductionNameCell' import TableInfo from '@/components/widgets/TableInfo' -import TaskTypeCell from '@/components/cells/TaskTypeName' +import TaskTypeCell from '@/components/cells/TaskTypeCell' import TimeSliderCell from '@/components/cells/TimeSliderCell' export default { diff --git a/src/components/lists/TodosList.vue b/src/components/lists/TodosList.vue index e7468d57d6..0ff502eb1a 100644 --- a/src/components/lists/TodosList.vue +++ b/src/components/lists/TodosList.vue @@ -272,7 +272,7 @@ import DescriptionCell from '@/components/cells/DescriptionCell' import LastCommentCell from '@/components/cells/LastCommentCell' import ProductionNameCell from '@/components/cells/ProductionNameCell' import PeopleAvatar from '@/components/widgets/PeopleAvatar' -import TaskTypeCell from '@/components/cells/TaskTypeName' +import TaskTypeCell from '@/components/cells/TaskTypeCell' import TableInfo from '@/components/widgets/TableInfo' import ValidationCell from '@/components/cells/ValidationCell' import MetadataHeader from '@/components/cells/MetadataHeader' diff --git a/src/components/modals/AddCommentImageModal.vue b/src/components/modals/AddCommentImageModal.vue index 0b96a7fd64..ecb1207d32 100644 --- a/src/components/modals/AddCommentImageModal.vue +++ b/src/components/modals/AddCommentImageModal.vue @@ -104,7 +104,7 @@ import files from '@/lib/files' import FileUpload from '@/components/widgets/FileUpload.vue' export default { - name: 'add-preview-modal', + name: 'add-comment-image-modal', mixins: [modalMixin], components: { diff --git a/src/components/modals/CreateTasksModal.vue b/src/components/modals/CreateTasksModal.vue index 7faddf4ede..10ce0cbf16 100644 --- a/src/components/modals/CreateTasksModal.vue +++ b/src/components/modals/CreateTasksModal.vue @@ -70,7 +70,7 @@ import ComboboxTaskType from '@/components/widgets/ComboboxTaskType' import PageTitle from '@/components/widgets/PageTitle' export default { - name: 'create-task-modal', + name: 'create-tasks-modal', mixins: [modalMixin], components: { diff --git a/src/components/modals/ImportModal.vue b/src/components/modals/ImportModal.vue index 94251185c2..04c2fd8f39 100644 --- a/src/components/modals/ImportModal.vue +++ b/src/components/modals/ImportModal.vue @@ -83,7 +83,7 @@ import Tabs from '@/components/widgets/Tabs' import Tab from '@/components/widgets/Tab' export default { - name: 'import-people-modal', + name: 'import-modal', mixins: [modalMixin], components: { FileUpload, diff --git a/src/components/modals/ManageShotsModal.vue b/src/components/modals/ManageShotsModal.vue index fd0fdd9568..857862be4c 100644 --- a/src/components/modals/ManageShotsModal.vue +++ b/src/components/modals/ManageShotsModal.vue @@ -162,7 +162,7 @@ import stringHelpers from '@/lib/string' import { sortByName } from '@/lib/sorting' export default { - name: 'manage-shot-modal', + name: 'manage-shots-modal', mixins: [modalMixin], components: { diff --git a/src/components/modals/ShortcutModal.vue b/src/components/modals/ShortcutModal.vue index cb4726a605..2175e8f57c 100644 --- a/src/components/modals/ShortcutModal.vue +++ b/src/components/modals/ShortcutModal.vue @@ -59,7 +59,7 @@ import { mapGetters, mapActions } from 'vuex' import { modalMixin } from '@/components/modals/base_modal' export default { - name: 'shot-history-modal', + name: 'shortcut-modal', mixins: [modalMixin], components: {}, diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue index 2d70788da7..879a1151f6 100644 --- a/src/components/pages/Breakdown.vue +++ b/src/components/pages/Breakdown.vue @@ -340,7 +340,7 @@ import Spinner from '@/components/widgets/Spinner' import DepartmentName from '@/components/widgets/DepartmentName' export default { - name: 'breakdown-page', + name: 'breakdown', mixins: [entityListMixin], components: { AvailableAssetBlock, diff --git a/src/components/pages/EpisodeStats.vue b/src/components/pages/EpisodeStats.vue index a73e586f7e..8749dcb7fc 100644 --- a/src/components/pages/EpisodeStats.vue +++ b/src/components/pages/EpisodeStats.vue @@ -85,7 +85,7 @@ import EpisodeStatsList from '@/components/lists/EpisodeStatsList.vue' import SearchField from '@/components/widgets/SearchField' export default { - name: 'episodes', + name: 'episode-stats', components: { ButtonSimple, diff --git a/src/components/pages/FirstConnection.vue b/src/components/pages/FirstConnection.vue index 5a978f4220..d0aaaf850f 100644 --- a/src/components/pages/FirstConnection.vue +++ b/src/components/pages/FirstConnection.vue @@ -73,7 +73,7 @@ import { mapGetters, mapActions } from 'vuex' import { MailIcon } from 'vue-feather-icons' export default { - name: 'reset-password', + name: 'first-connection', components: { MailIcon diff --git a/src/components/pages/MyChecks.vue b/src/components/pages/MyChecks.vue index 535387633d..89807e62db 100644 --- a/src/components/pages/MyChecks.vue +++ b/src/components/pages/MyChecks.vue @@ -117,7 +117,7 @@ import TodosList from '@/components/lists/TodosList' import ViewPlaylistModal from '@/components/modals/ViewPlaylistModal' export default { - name: 'todos', + name: 'my-checks', components: { ButtonSimple, diff --git a/src/components/pages/Notifications.vue b/src/components/pages/Notifications.vue index f9d3577589..d85769fa22 100644 --- a/src/components/pages/Notifications.vue +++ b/src/components/pages/Notifications.vue @@ -251,7 +251,7 @@ import TaskTypeName from '@/components/widgets/TaskTypeName' import ValidationTag from '@/components/widgets/ValidationTag' export default { - name: 'notification-page', + name: 'notifications', components: { AtSignIcon, ComboboxTaskType, diff --git a/src/components/pages/Playlist.vue b/src/components/pages/Playlist.vue index 47fb6fccb2..ab2e8e9a75 100644 --- a/src/components/pages/Playlist.vue +++ b/src/components/pages/Playlist.vue @@ -460,7 +460,7 @@ import Spinner from '@/components/widgets/Spinner' import TaskTypeName from '@/components/widgets/TaskTypeName' export default { - name: 'productions', + name: 'playlist', components: { BuildFilterModal, diff --git a/src/components/pages/ProductionNewsFeed.vue b/src/components/pages/ProductionNewsFeed.vue index 8817c54d09..fd21e04b63 100644 --- a/src/components/pages/ProductionNewsFeed.vue +++ b/src/components/pages/ProductionNewsFeed.vue @@ -338,7 +338,7 @@ import ValidationTag from '@/components/widgets/ValidationTag' import PreviewPlayer from '@/components/previews/PreviewPlayer' export default { - name: 'news-page', + name: 'production-news-feed', mixins: [timeMixin], components: { Combobox, diff --git a/src/components/pages/ResetChangePassword.vue b/src/components/pages/ResetChangePassword.vue index 0881e0bb2c..05bca8a47b 100644 --- a/src/components/pages/ResetChangePassword.vue +++ b/src/components/pages/ResetChangePassword.vue @@ -83,7 +83,7 @@ import { LockIcon } from 'vue-feather-icons' import auth from '@/lib/auth' export default { - name: 'reset-password', + name: 'reset-change-password', components: { LockIcon diff --git a/src/components/pages/Team.vue b/src/components/pages/Team.vue index f27e4f2ae3..166daf5941 100644 --- a/src/components/pages/Team.vue +++ b/src/components/pages/Team.vue @@ -33,7 +33,7 @@ import ProductionTeamList from '@/components/lists/ProductionTeamList' import PeopleField from '@/components/widgets/PeopleField' export default { - name: 'people', + name: 'team', components: { PeopleField, ProductionTeamList diff --git a/src/components/pages/Timesheets.vue b/src/components/pages/Timesheets.vue index e9fdd92164..585e536ef8 100644 --- a/src/components/pages/Timesheets.vue +++ b/src/components/pages/Timesheets.vue @@ -111,7 +111,7 @@ import PeopleTimesheetInfo from '@/components/sides/PeopleTimesheetInfo' import PageTitle from '@/components/widgets/PageTitle' export default { - name: 'people', + name: 'timesheets', components: { ButtonSimple, ButtonHrefLink, diff --git a/src/components/pages/departments/Departments.vue b/src/components/pages/departments/Departments.vue index d1dc99020b..00731ef3af 100644 --- a/src/components/pages/departments/Departments.vue +++ b/src/components/pages/departments/Departments.vue @@ -43,7 +43,7 @@ import EditDepartmentsModal from '@/components/modals/EditDepartmentsModal' import DeleteModal from '@/components/modals/DeleteModal' export default { - name: 'production-departments', + name: 'departments', components: { DeleteModal, DepartmentList, diff --git a/src/components/pages/entities/EntityPreviewFiles.vue b/src/components/pages/entities/EntityPreviewFiles.vue index 6a59784a66..74b3e1a118 100644 --- a/src/components/pages/entities/EntityPreviewFiles.vue +++ b/src/components/pages/entities/EntityPreviewFiles.vue @@ -50,7 +50,7 @@ /> - - export default { - name: 'colorpicker', + name: 'color-picker', props: { color: { diff --git a/src/components/widgets/ComboboxNumber.vue b/src/components/widgets/ComboboxNumber.vue index 71a3ec9af1..beb87d1a3f 100644 --- a/src/components/widgets/ComboboxNumber.vue +++ b/src/components/widgets/ComboboxNumber.vue @@ -53,7 +53,7 @@