From e04cda0628a0f1d6968585e15e9ce2983231dad4 Mon Sep 17 00:00:00 2001 From: Nicolas PENNEC <493223+NicoPennec@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:42:27 +0200 Subject: [PATCH] Revert "Various fixes (#1473)" This reverts commit 5c041b66ef3c1852b6906c1711886f14ce538525. --- package-lock.json | 136 +++++++++--------- package.json | 6 +- src/components/lists/TaskStatusList.vue | 12 +- src/components/lists/TaskTypeList.vue | 32 ++--- src/components/modals/EditAssetModal.vue | 1 + src/components/modals/EditAssetTypeModal.vue | 19 +-- src/components/modals/EditProductionModal.vue | 3 + src/components/modals/EditShotModal.vue | 1 + src/components/modals/EditTaskTypeModal.vue | 25 ++-- src/components/pages/TaskStatus.vue | 31 ++-- src/store/modules/tasks.js | 11 ++ 11 files changed, 132 insertions(+), 145 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07e3787c69..6442efe2eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fullcalendar/multimonth": "6.1.14", "@fullcalendar/vue": "6.1.14", "@google/model-viewer": "3.5.0", - "@sentry/vue": "8.13.0", + "@sentry/vue": "8.11.0", "async": "3.2.5", "bowser": "2.11.0", "chart.js": "2.9.4", @@ -64,7 +64,7 @@ "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.27.0", + "eslint-plugin-vue": "9.26.0", "esm": "3.2.25", "husky": "8.0.3", "jsdom": "24.1.0", @@ -72,7 +72,7 @@ "localStorage": "1.0.4", "prettier": "3.3.2", "sass": "1.77.6", - "vite": "5.3.2", + "vite": "5.3.1", "vitest": "0.34.6", "vitest-localstorage-mock": "0.1.2", "vue-template-compiler": "2.7.16" @@ -1221,125 +1221,125 @@ ] }, "node_modules/@sentry-internal/browser-utils": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.13.0.tgz", - "integrity": "sha512-lqq8BYbbs9KTlDuyB5NjdZB6P/llqQs32KUgaCQ/k5DFB4Zf56+BFHXObnMHxwx375X1uixtnEphagWZa+nsLQ==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.11.0.tgz", + "integrity": "sha512-PCnmzeLm7eTdMleVWa1jbdNcB6M5R17CSX8oQF6A/5a2w9qW6HbjEwK6X4yc9MzsFXFaTNekvPQLMRhIE1MgpA==", "license": "MIT", "dependencies": { - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/feedback": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.13.0.tgz", - "integrity": "sha512-YyJ6SzpTonixvguAg0H9vkEp7Jq8ZeVY8M4n47ClR0+TtaAUp04ZhcJpHKF7PwBIAzc7DRr2XP112tmWgiVEcg==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.11.0.tgz", + "integrity": "sha512-cMiFAuHP4jXCqWD7/UA5cvl0ee3hN5klAWTDVCZutnZ30pbUurg+nIggYBcaxdtLlqW6BCwyVs2nb/OB75CCSQ==", "license": "MIT", "dependencies": { - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.13.0.tgz", - "integrity": "sha512-DJ1jF/Pab0FH4SeCvSGCnGAu/s0wJvhBWM5VjQp7Jjmcfunp+R3vJibqU8gAVZU1nYRLaqprLdIXrSyP2Km8nQ==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.11.0.tgz", + "integrity": "sha512-NyuHW1Ds2GGW6PjN7nnRl/XoM31Y/BUnOhhLbNmbxWj5mgWuUP/7tOlz2PhP0YqZxVteZ99QIssfSRgtYOeQlg==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.13.0", - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry-internal/browser-utils": "8.11.0", + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.13.0.tgz", - "integrity": "sha512-lPlfWVIHX+gW4S8a/UOVutuqMyQhlkNUAay0W21MVhZJT5Mtj0p21D/Cz7nrOQRDIiLNq90KAGK2tLxx5NkiWA==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.11.0.tgz", + "integrity": "sha512-SrBFI0vwyeyUjibCbYfxzCNMd07QMDNoi+0SYzhBagp6ALbU8r/pa02JRsnr//qhZt2NOM6S2kks9e2VHr6hYg==", "license": "MIT", "dependencies": { - "@sentry-internal/replay": "8.13.0", - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry-internal/replay": "8.11.0", + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/browser": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.13.0.tgz", - "integrity": "sha512-/tp7HZ5qjwDLtwooPMoexdAi2PG7gMNY0bHeMlwy20hs8mclC8RW8ZiJA6czXHfgnbmvxfrHaY53IJyz//JnlA==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.11.0.tgz", + "integrity": "sha512-++5IrBpzkaAptNjAYnGTnQ2lCjmU6nlu/ABFjUTgi7Vu+ZNiY8qYKEUw65mSxD3EoFLt8IwtjvfAwSMVTB2q8w==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.13.0", - "@sentry-internal/feedback": "8.13.0", - "@sentry-internal/replay": "8.13.0", - "@sentry-internal/replay-canvas": "8.13.0", - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry-internal/browser-utils": "8.11.0", + "@sentry-internal/feedback": "8.11.0", + "@sentry-internal/replay": "8.11.0", + "@sentry-internal/replay-canvas": "8.11.0", + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/core": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.13.0.tgz", - "integrity": "sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.11.0.tgz", + "integrity": "sha512-rZaM55j5Fw0IGb8lNXOTVoq7WR6JmUzm9x5cURGsjL9gzAurGl817oK3iyOvYQ3JZnfijjh0QF0SQr4NZHKbIg==", "license": "MIT", "dependencies": { - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/types": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.13.0.tgz", - "integrity": "sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.11.0.tgz", + "integrity": "sha512-kz9/d2uw7wEXcK8DnCrCuMI75hZnpVAjYr8mq1uatltOx+2JOYPNdaK6ispxXlhb5KXOnVWNgfVDbGlLp0w+Gg==", "license": "MIT", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.13.0.tgz", - "integrity": "sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.11.0.tgz", + "integrity": "sha512-iDt5YVMYNgT151bPYVGo8XlpM0MHWy8DH+czmAiAlFTV7ns7lAeHGF6tsFYo7wOZOPDHxtF6F2CM7AvuYnOZGw==", "license": "MIT", "dependencies": { - "@sentry/types": "8.13.0" + "@sentry/types": "8.11.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/vue": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-8.13.0.tgz", - "integrity": "sha512-1CTInl9jeh9dDyrL2dOUUiLN9KvvdEibBPXxqz/nGIignT/sVO8ZJzFPctsyh9COF63FN3zfy65xBE4U/Ad6oA==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-8.11.0.tgz", + "integrity": "sha512-KGXhKRdtg2cIAkNCNu0ZacttH3pjogpAD9DC+huCzAdBIcEfhQqqSjDwjaDKkoEdKadWpoa6gmY3WWSkdDMLkQ==", "license": "MIT", "dependencies": { - "@sentry/browser": "8.13.0", - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/browser": "8.11.0", + "@sentry/core": "8.11.0", + "@sentry/types": "8.11.0", + "@sentry/utils": "8.11.0" }, "engines": { "node": ">=14.18" @@ -3067,9 +3067,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz", - "integrity": "sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==", + "version": "9.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.26.0.tgz", + "integrity": "sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3079,7 +3079,7 @@ "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.15", "semver": "^7.6.0", - "vue-eslint-parser": "^9.4.3", + "vue-eslint-parser": "^9.4.2", "xml-name-validator": "^4.0.0" }, "engines": { @@ -7038,9 +7038,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz", - "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz", + "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7251,9 +7251,9 @@ } }, "node_modules/vue-eslint-parser": { - "version": "9.4.3", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz", - "integrity": "sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==", + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz", + "integrity": "sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 54fc58c786..13d23a57f9 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@fullcalendar/multimonth": "6.1.14", "@fullcalendar/vue": "6.1.14", "@google/model-viewer": "3.5.0", - "@sentry/vue": "8.13.0", + "@sentry/vue": "8.11.0", "async": "3.2.5", "bowser": "2.11.0", "chart.js": "2.9.4", @@ -73,7 +73,7 @@ "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.27.0", + "eslint-plugin-vue": "9.26.0", "esm": "3.2.25", "husky": "8.0.3", "jsdom": "24.1.0", @@ -81,7 +81,7 @@ "localStorage": "1.0.4", "prettier": "3.3.2", "sass": "1.77.6", - "vite": "5.3.2", + "vite": "5.3.1", "vitest": "0.34.6", "vitest-localstorage-mock": "0.1.2", "vue-template-compiler": "2.7.16" diff --git a/src/components/lists/TaskStatusList.vue b/src/components/lists/TaskStatusList.vue index af3e3b861c..87ab7f287d 100644 --- a/src/components/lists/TaskStatusList.vue +++ b/src/components/lists/TaskStatusList.vue @@ -71,7 +71,7 @@ /> @@ -94,10 +94,10 @@ import { HelpCircleIcon } from 'vue-feather-icons' import { formatListMixin } from '@/components/mixins/format' -import BooleanCell from '@/components/cells/BooleanCell.vue' -import RowActionsCell from '@/components/cells/RowActionsCell.vue' -import TableInfo from '@/components/widgets/TableInfo.vue' -import TaskStatusCell from '@/components/cells/TaskStatusCell.vue' +import BooleanCell from '@/components/cells/BooleanCell' +import RowActionsCell from '@/components/cells/RowActionsCell' +import TableInfo from '@/components/widgets/TableInfo' +import TaskStatusCell from '@/components/cells/TaskStatusCell' export default { name: 'task-status-list', @@ -120,9 +120,9 @@ export default { }, components: { + HelpCircleIcon, BooleanCell, draggable, - HelpCircleIcon, RowActionsCell, TableInfo, TaskStatusCell diff --git a/src/components/lists/TaskTypeList.vue b/src/components/lists/TaskTypeList.vue index 38d134048b..d018cec627 100644 --- a/src/components/lists/TaskTypeList.vue +++ b/src/components/lists/TaskTypeList.vue @@ -32,7 +32,7 @@ v-model="assetsItems" > - + {{ $t('assets.title') }} @@ -66,7 +66,7 @@ /> - + {{ $t('task_types.no_task_types') }} @@ -83,7 +83,7 @@ @end="updatePriorityShots" > - + {{ $t('shots.title') }} @@ -107,9 +107,6 @@ - - {{ taskType.description }} - - + {{ $t('task_types.no_task_types') }} @@ -134,7 +131,7 @@ @end="updatePriorityEdits" > - + {{ $t('edits.title') }} @@ -158,9 +155,6 @@ - - {{ taskType.description }} - - + {{ $t('task_types.no_task_types') }} @@ -185,7 +179,7 @@ @end="updatePrioritySequences" > - + {{ $t('sequences.title') }} @@ -209,9 +203,6 @@ - - {{ taskType.description }} - - + {{ $t('task_types.no_task_types') }} @@ -236,7 +227,7 @@ @end="updatePriorityEpisodes" > - + {{ $t('episodes.title') }} @@ -260,9 +251,6 @@ - - {{ taskType.description }} - - + {{ $t('task_types.no_task_types') }} diff --git a/src/components/modals/EditAssetModal.vue b/src/components/modals/EditAssetModal.vue index d3b1cbfd65..b14f0e8696 100644 --- a/src/components/modals/EditAssetModal.vue +++ b/src/components/modals/EditAssetModal.vue @@ -39,6 +39,7 @@ ref="descriptionField" :label="$t('assets.fields.description')" v-model="form.description" + v-focus />
diff --git a/src/components/modals/EditShotModal.vue b/src/components/modals/EditShotModal.vue index 8893874ca2..3c8a8992be 100644 --- a/src/components/modals/EditShotModal.vue +++ b/src/components/modals/EditShotModal.vue @@ -42,6 +42,7 @@ type="number" v-model="form.nb_frames" @enter="runConfirmation" + v-focus />