From 77d5e72065429687b80e678c119af0297326b9c1 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 10:22:32 +0200 Subject: [PATCH 1/8] [projects] avoid focus if hidden search --- src/components/pages/EntitySearch.vue | 4 +--- src/components/pages/OpenProductions.vue | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/pages/EntitySearch.vue b/src/components/pages/EntitySearch.vue index dbed9ee8be..5a03def57f 100644 --- a/src/components/pages/EntitySearch.vue +++ b/src/components/pages/EntitySearch.vue @@ -261,9 +261,7 @@ export default { mounted() { window.addEventListener('keydown', event => { if (event.ctrlKey && event.altKey && event.keyCode === 70) { - if (this.$refs['search-field']) { - this.$refs['search-field'].focus() - } + this.searchField.focus() } else if (event.keyCode === 40) { this.selectNext() } else if (event.keyCode === 38) { diff --git a/src/components/pages/OpenProductions.vue b/src/components/pages/OpenProductions.vue index 7bea037588..2f0f14f811 100644 --- a/src/components/pages/OpenProductions.vue +++ b/src/components/pages/OpenProductions.vue @@ -141,7 +141,7 @@ export default { }, mounted() { - this.$refs['search-field'].focus() + this.$refs['search-field']?.focus() this.filteredProductions = this.openProductions this.productionIndex = buildNameIndex(this.openProductions) }, From 07c46c17f0608f9d2c1ca77c583dd03df4bbf1ab Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 10:46:00 +0200 Subject: [PATCH 2/8] [breakdown] fix silent error on init Due to displayMoreAssets() call on page initilization. --- src/store/modules/assets.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/store/modules/assets.js b/src/store/modules/assets.js index f672c79121..9596be3b50 100644 --- a/src/store/modules/assets.js +++ b/src/store/modules/assets.js @@ -255,7 +255,8 @@ const helpers = { const cache = { assetIndex: {}, assetTypeIndex: {}, - assets: [] + assets: [], + result: [] } const initialState = { @@ -1035,10 +1036,7 @@ const mutations = { } }, - [DISPLAY_MORE_ASSETS]( - state, - { taskTypeMap, taskStatusMap, taskMap, production } - ) { + [DISPLAY_MORE_ASSETS](state) { const assets = cache.result const newLength = state.displayedAssets.length + PAGE_SIZE if (newLength < assets.length + PAGE_SIZE) { @@ -1061,11 +1059,11 @@ const mutations = { } }, - [SET_CURRENT_PRODUCTION](state, production) { + [SET_CURRENT_PRODUCTION](state) { state.assetSearchText = '' }, - [SET_PREVIEW](state, { entityId, taskId, previewId, taskMap }) { + [SET_PREVIEW](state, { entityId, previewId, taskMap }) { const asset = state.assetMap.get(entityId) if (asset) { asset.preview_file_id = previewId From e99fb190340e0dae8cd5d406aa840b4ceed2cd26 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 10:58:50 +0200 Subject: [PATCH 3/8] [qa] fix missing translations --- src/components/pages/Breakdown.vue | 2 +- src/components/pages/TaskTypes.vue | 4 ++-- src/components/widgets/RouteTabs.vue | 16 +++------------- src/locales/en.js | 1 + 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue index c7e2def224..2d70788da7 100644 --- a/src/components/pages/Breakdown.vue +++ b/src/components/pages/Breakdown.vue @@ -45,7 +45,7 @@ class="flexrow-item" icon="grid" :is-on="isBigMode" - :title="$t('breakdown.big_pictures_mode')" + :title="$t('tasks.big_thumbnails')" @click="isBigMode = !isBigMode" />
  • @@ -12,7 +12,7 @@ query: { tab: tab.name } }" > - {{ $t(tab.label) }} + {{ tab.label }}
@@ -23,10 +23,6 @@ export default { name: 'route-tabs', - data() { - return {} - }, - props: { activeTab: { type: String, @@ -40,13 +36,7 @@ export default { type: Array, default: () => [] } - }, - - created() {}, - - mounted() {}, - - methods: {} + } } diff --git a/src/locales/en.js b/src/locales/en.js index 31919d5b79..b3c796ddeb 100644 --- a/src/locales/en.js +++ b/src/locales/en.js @@ -1200,6 +1200,7 @@ export default { count_mode: 'Count', data_mode: 'Data', display_mode: 'Display', + episode_status: 'Episode status', frames: 'Frames', only_running: 'Only running', pie: 'Pie charts', From 4f3d9d49e0b7afa678d5b4f327921caee84bdf8e Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 11:09:53 +0200 Subject: [PATCH 4/8] [qa] bump dependencies --- package-lock.json | 116 +++++++++++++++++++++++----------------------- package.json | 6 +-- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9f38f0bfbc..3a74ba4d08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "superagent": "8.1.2", "textarea-caret": "3.1.0", "thenby": "1.3.4", - "three": "0.156.1", + "three": "0.157.0", "uuid": "9.0.1", "v-autocomplete": "1.8.2", "vue": "2.7.14", @@ -64,12 +64,12 @@ "jsdom": "22.1.0", "lint-staged": "14.0.1", "localStorage": "1.0.4", - "postcss": "8.4.30", + "postcss": "8.4.31", "prettier": "3.0.3", "sass": "1.68.0", "vite": "4.4.9", "vite-plugin-eslint": "1.8.1", - "vitest": "0.34.5", + "vitest": "0.34.6", "vitest-localstorage-mock": "0.0.1", "vue-template-compiler": "2.7.14" }, @@ -831,9 +831,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.7.1.tgz", - "integrity": "sha512-LT+OIXpp2kj4E2S/p91BMe+VgGX2+lfO+XTpfXhh+bCk2LkQtHZSub8ewFBMGP5ClysPjTDFa4sMI8Q3n4T0wg==", + "version": "20.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.0.tgz", + "integrity": "sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==", "dev": true }, "node_modules/@types/trusted-types": { @@ -855,26 +855,26 @@ } }, "node_modules/@vitest/expect": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.5.tgz", - "integrity": "sha512-/3RBIV9XEH+nRpRMqDJBufKIOQaYUH2X6bt0rKSCW0MfKhXFLYsR5ivHifeajRSTsln0FwJbitxLKHSQz/Xwkw==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", + "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==", "dev": true, "dependencies": { - "@vitest/spy": "0.34.5", - "@vitest/utils": "0.34.5", - "chai": "^4.3.7" + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", + "chai": "^4.3.10" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/runner": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.5.tgz", - "integrity": "sha512-RDEE3ViVvl7jFSCbnBRyYuu23XxmvRTSZWW6W4M7eC5dOsK75d5LIf6uhE5Fqf809DQ1+9ICZZNxhIolWHU4og==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz", + "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==", "dev": true, "dependencies": { - "@vitest/utils": "0.34.5", + "@vitest/utils": "0.34.6", "p-limit": "^4.0.0", "pathe": "^1.1.1" }, @@ -910,9 +910,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.5.tgz", - "integrity": "sha512-+ikwSbhu6z2yOdtKmk/aeoDZ9QPm2g/ZO5rXT58RR9Vmu/kB2MamyDSx77dctqdZfP3Diqv4mbc/yw2kPT8rmA==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz", + "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==", "dev": true, "dependencies": { "magic-string": "^0.30.1", @@ -924,9 +924,9 @@ } }, "node_modules/@vitest/spy": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.5.tgz", - "integrity": "sha512-epsicsfhvBjRjCMOC/3k00mP/TBGQy8/P0DxOFiWyLt55gnZ99dqCfCiAsKO17BWVjn4eZRIjKvcqNmSz8gvmg==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz", + "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==", "dev": true, "dependencies": { "tinyspy": "^2.1.1" @@ -936,9 +936,9 @@ } }, "node_modules/@vitest/utils": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.5.tgz", - "integrity": "sha512-ur6CmmYQoeHMwmGb0v+qwkwN3yopZuZyf4xt1DBBSGBed8Hf9Gmbm/5dEWqgpLPdRx6Av6jcWXrjcKfkTzg/pw==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz", + "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==", "dev": true, "dependencies": { "diff-sequences": "^29.4.3", @@ -1340,9 +1340,9 @@ "optional": true }, "node_modules/browserslist": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.0.tgz", - "integrity": "sha512-v+Jcv64L2LbfTC6OnRcaxtqJNJuQAVhZKSJfR/6hn7lhnChUXl4amwVviqN1k411BB+3rRoKMitELRn1CojeRA==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -1359,8 +1359,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001539", - "electron-to-chromium": "^1.4.530", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", "update-browserslist-db": "^1.0.13" }, @@ -1416,9 +1416,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001541", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz", - "integrity": "sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==", + "version": "1.0.30001542", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001542.tgz", + "integrity": "sha512-UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA==", "dev": true, "funding": [ { @@ -2129,9 +2129,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.534", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.534.tgz", - "integrity": "sha512-ikY7wAMtMt3jTnHsHG0YLl4MKJiKz2tgidenGSNgwUX2StBLNZ8VCxflD9tZK/ceTs4j8gDC9+6LQQ6iGkK04g==", + "version": "1.4.537", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.537.tgz", + "integrity": "sha512-W1+g9qs9hviII0HAwOdehGYkr+zt7KKdmCcJcjH0mYg6oL8+ioT3Skjmt7BLoAQqXhjf40AXd+HlR4oAWMlXjA==", "dev": true }, "node_modules/emoji-regex": { @@ -3948,9 +3948,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.3", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", - "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", + "version": "0.30.4", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.4.tgz", + "integrity": "sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -4607,9 +4607,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -5669,9 +5669,9 @@ "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==" }, "node_modules/three": { - "version": "0.156.1", - "resolved": "https://registry.npmjs.org/three/-/three-0.156.1.tgz", - "integrity": "sha512-kP7H0FK9d/k6t/XvQ9FO6i+QrePoDcNhwl0I02+wmUJRNSLCUIDMcfObnzQvxb37/0Uc9TDT0T1HgsRRrO6SYQ==" + "version": "0.157.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.157.0.tgz", + "integrity": "sha512-CeAwQrf4x3z0/e+MC4F+nXLW5t0gh3pw+L6CCBqpHvOq3bGYIgRYub7Pv0j/9wR+d++OiEglyZzWyuSYbwWGOA==" }, "node_modules/tinybench": { "version": "2.5.1", @@ -5941,9 +5941,9 @@ } }, "node_modules/vite-node": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.5.tgz", - "integrity": "sha512-RNZ+DwbCvDoI5CbCSQSyRyzDTfFvFauvMs6Yq4ObJROKlIKuat1KgSX/Ako5rlDMfVCyMcpMRMTkJBxd6z8YRA==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz", + "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -5994,23 +5994,23 @@ } }, "node_modules/vitest": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.5.tgz", - "integrity": "sha512-CPI68mmnr2DThSB3frSuE5RLm9wo5wU4fbDrDwWQQB1CWgq9jQVoQwnQSzYAjdoBOPoH2UtXpOgHVge/uScfZg==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz", + "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==", "dev": true, "dependencies": { "@types/chai": "^4.3.5", "@types/chai-subset": "^1.3.3", "@types/node": "*", - "@vitest/expect": "0.34.5", - "@vitest/runner": "0.34.5", - "@vitest/snapshot": "0.34.5", - "@vitest/spy": "0.34.5", - "@vitest/utils": "0.34.5", + "@vitest/expect": "0.34.6", + "@vitest/runner": "0.34.6", + "@vitest/snapshot": "0.34.6", + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", "acorn": "^8.9.0", "acorn-walk": "^8.2.0", "cac": "^6.7.14", - "chai": "^4.3.7", + "chai": "^4.3.10", "debug": "^4.3.4", "local-pkg": "^0.4.3", "magic-string": "^0.30.1", @@ -6021,7 +6021,7 @@ "tinybench": "^2.5.0", "tinypool": "^0.7.0", "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0", - "vite-node": "0.34.5", + "vite-node": "0.34.6", "why-is-node-running": "^2.2.2" }, "bin": { diff --git a/package.json b/package.json index 25a5efa839..d2b82ebc2f 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "superagent": "8.1.2", "textarea-caret": "3.1.0", "thenby": "1.3.4", - "three": "0.156.1", + "three": "0.157.0", "uuid": "9.0.1", "v-autocomplete": "1.8.2", "vue": "2.7.14", @@ -71,12 +71,12 @@ "jsdom": "22.1.0", "lint-staged": "14.0.1", "localStorage": "1.0.4", - "postcss": "8.4.30", + "postcss": "8.4.31", "prettier": "3.0.3", "sass": "1.68.0", "vite": "4.4.9", "vite-plugin-eslint": "1.8.1", - "vitest": "0.34.5", + "vitest": "0.34.6", "vitest-localstorage-mock": "0.0.1", "vue-template-compiler": "2.7.14" }, From 5923beb5fc70abd5855b415615b33933ef741430 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 11:30:58 +0200 Subject: [PATCH 5/8] [qa] fix typo in props --- src/components/widgets/PeopleAvatarWithMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/widgets/PeopleAvatarWithMenu.vue b/src/components/widgets/PeopleAvatarWithMenu.vue index d1e3b4768d..8d338b1a80 100644 --- a/src/components/widgets/PeopleAvatarWithMenu.vue +++ b/src/components/widgets/PeopleAvatarWithMenu.vue @@ -57,7 +57,7 @@ export default { type: Number, default: 40 }, - fontsize: { + fontSize: { type: Number, default: 18 }, From 75baa03bea0f4e2ba42dc494661dce2c363aef3a Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 11:42:27 +0200 Subject: [PATCH 6/8] =?UTF-8?q?[qa]=C2=A0fix=20Moment=20deprecated=20warni?= =?UTF-8?q?ngs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pages/TaskType.vue | 10 +++++----- src/components/sides/PeopleQuotaInfo.vue | 2 +- src/components/sides/PeopleTimesheetInfo.vue | 2 +- src/store/api/schedule.js | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue index 2acdafc67a..1500690c4c 100644 --- a/src/components/pages/TaskType.vue +++ b/src/components/pages/TaskType.vue @@ -307,7 +307,7 @@ const filters = { }, duepreviousweek(tasks) { - const previousWeek = moment().add('days', -7).isoWeek() + const previousWeek = moment().add(-7, 'days').isoWeek() return tasks.filter(t => { const dueDate = parseDate(t.due_date) return dueDate.isoWeek() === previousWeek @@ -315,7 +315,7 @@ const filters = { }, duenextweek(tasks) { - const nextWeek = moment().add('days', 7).isoWeek() + const nextWeek = moment().add(7, 'days').isoWeek() return tasks.filter(t => { const dueDate = parseDate(t.due_date) return dueDate.isoWeek() === nextWeek @@ -339,7 +339,7 @@ const filters = { }, duepreviousmonth(tasks) { - const previousMonth = moment().add('months', -1).month() + const previousMonth = moment().add(-1, 'months').month() return tasks.filter(t => { const dueDate = parseDate(t.due_date) return dueDate.month() === previousMonth @@ -347,7 +347,7 @@ const filters = { }, duenextmonth(tasks) { - const nextMonth = moment().add('months', 1).month() + const nextMonth = moment().add(1, 'months').month() return tasks.filter(t => { const dueDate = parseDate(t.due_date) return dueDate.month() === nextMonth @@ -1377,7 +1377,7 @@ export default { today.isAfter(moment(this.schedule.taskTypeEndDate)) ) { this.$refs['schedule-widget'].scrollToDate( - moment(this.schedule.taskTypeStartDate).add('days', 20) + moment(this.schedule.taskTypeStartDate).add(20, 'days') ) } else { this.$refs['schedule-widget'].scrollToToday() diff --git a/src/components/sides/PeopleQuotaInfo.vue b/src/components/sides/PeopleQuotaInfo.vue index 18b9f75b39..2be13c695e 100644 --- a/src/components/sides/PeopleQuotaInfo.vue +++ b/src/components/sides/PeopleQuotaInfo.vue @@ -101,7 +101,7 @@ export default { .day('Monday') .year(this.year) .week(this.week) - .add('days', 6) + .add(6, 'days') .date() }, diff --git a/src/components/sides/PeopleTimesheetInfo.vue b/src/components/sides/PeopleTimesheetInfo.vue index 3d0538c553..4ee89ddba1 100644 --- a/src/components/sides/PeopleTimesheetInfo.vue +++ b/src/components/sides/PeopleTimesheetInfo.vue @@ -107,7 +107,7 @@ export default { .day('Monday') .year(this.year) .week(this.week) - .add('days', 6) + .add(6, 'days') .date() }, diff --git a/src/store/api/schedule.js b/src/store/api/schedule.js index 045dc344f6..7212f8cd47 100644 --- a/src/store/api/schedule.js +++ b/src/store/api/schedule.js @@ -52,7 +52,7 @@ export default { createScheduleItem(scheduleItem) { if (!scheduleItem.endDate) { - scheduleItem.endDate = scheduleItem.startDate.add('days', 1).clone() + scheduleItem.endDate = scheduleItem.startDate.add(1, 'days').clone() } const manDays = scheduleItem.man_days const data = { @@ -91,7 +91,7 @@ export default { updateScheduleItem(scheduleItem) { if (!scheduleItem.endDate) { - scheduleItem.endDate = scheduleItem.startDate.add('days', 1).clone() + scheduleItem.endDate = scheduleItem.startDate.add(1, 'days').clone() } const manDays = scheduleItem.man_days const data = { From 3888c27c5f9467f2316348216a9da4a47228dd03 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 2 Oct 2023 12:25:32 +0200 Subject: [PATCH 7/8] [qa] fix style of short date picker --- src/App.vue | 2 +- src/components/pages/MainSchedule.vue | 4 ++-- src/components/pages/TeamSchedule.vue | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.vue b/src/App.vue index 059ebc43ec..51f57448f7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1998,7 +1998,7 @@ th.validation-cell { width: 150px; &.short { - width: 106px; + width: 112px; } } diff --git a/src/components/pages/MainSchedule.vue b/src/components/pages/MainSchedule.vue index 315a2a9643..435ce4f31f 100644 --- a/src/components/pages/MainSchedule.vue +++ b/src/components/pages/MainSchedule.vue @@ -8,7 +8,7 @@ Date: Mon, 2 Oct 2023 12:27:53 +0200 Subject: [PATCH 8/8] [logs] set date field as mandatory --- src/components/pages/logs/Events.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/pages/logs/Events.vue b/src/components/pages/logs/Events.vue index 967efc9831..b025110e94 100644 --- a/src/components/pages/logs/Events.vue +++ b/src/components/pages/logs/Events.vue @@ -3,6 +3,7 @@