diff --git a/package.json b/package.json index be80935be..49bbd92b9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "vue-shortkey": "3.1.7", "vuedraggable": "2.24.3", "vuex": "3.6.2", - "workbox-precaching": "6.2.4" + "workbox-precaching": "6.3.0" }, "devDependencies": { "@4tw/cypress-drag-drop": "2.0.0", @@ -53,7 +53,7 @@ "babel-eslint": "10.1.0", "cypress": "8.3.1", "cypress-file-upload": "5.0.8", - "esbuild": "0.12.25", + "esbuild": "0.12.26", "eslint": "7.32.0", "eslint-plugin-vue": "7.17.0", "express": "4.17.1", @@ -61,7 +61,7 @@ "jest": "27.1.1", "rollup-plugin-terser": "7.0.2", "rollup-plugin-visualizer": "5.5.2", - "sass": "1.39.0", + "sass": "1.39.2", "ts-jest": "27.0.5", "typescript": "4.4.2", "vite": "2.5.6", @@ -72,7 +72,7 @@ "vue-router": "3.5.2", "vue-template-compiler": "2.6.14", "wait-on": "6.0.0", - "workbox-cli": "6.2.4" + "workbox-cli": "6.3.0" }, "eslintConfig": { "root": true, diff --git a/src/App.vue b/src/App.vue index f11135358..a02b72695 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,11 +23,9 @@ diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js index a3eb9726e..cd67e7ce1 100644 --- a/src/components/tasks/mixins/taskList.js +++ b/src/components/tasks/mixins/taskList.js @@ -2,6 +2,16 @@ import TaskCollectionService from '@/services/taskCollection' import cloneDeep from 'lodash/cloneDeep' import {calculateItemPosition} from '../../../helpers/calculateItemPosition' +// FIXME: merge with DEFAULT_PARAMS in filters.vue +const DEFAULT_PARAMS = { + sort_by: ['position', 'id'], + order_by: ['asc', 'desc'], + filter_by: ['done'], + filter_value: ['false'], + filter_comparator: ['equals'], + filter_concat: 'and', +} + function createPagination(totalPages, currentPage) { const pages = [] for (let i = 0; i < totalPages; i++) { @@ -63,14 +73,7 @@ export default { searchTerm: '', showTaskFilter: false, - params: { - sort_by: ['position', 'id'], - order_by: ['asc', 'desc'], - filter_by: ['done'], - filter_value: ['false'], - filter_comparator: ['equals'], - filter_concat: 'and', - }, + params: DEFAULT_PARAMS, } }, watch: { diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue index d96769559..e211df741 100644 --- a/src/components/tasks/partials/heading.vue +++ b/src/components/tasks/partials/heading.vue @@ -7,16 +7,17 @@

{{ task.title.trim() }}

{{ $t('misc.saving') }} - + {{ $t('misc.saved') }} @@ -25,22 +26,22 @@