+
{{ hintText }}
@@ -72,6 +72,11 @@ const CMD_NEW_LIST = 'newList'
const CMD_NEW_NAMESPACE = 'newNamespace'
const CMD_NEW_TEAM = 'newTeam'
+const SEARCH_MODE_ALL = 'all'
+const SEARCH_MODE_TASKS = 'tasks'
+const SEARCH_MODE_LISTS = 'lists'
+const SEARCH_MODE_TEAMS = 'teams'
+
export default {
name: 'quick-actions',
data() {
@@ -84,6 +89,7 @@ export default {
taskService: null,
foundTeams: [],
+ teamSearchTimeout: null,
teamService: null,
namespaceService: null,
@@ -99,9 +105,17 @@ export default {
return active
},
results() {
- const lists = (Object.values(this.$store.state.lists).filter(l => {
- return l.title.toLowerCase().includes(this.query.toLowerCase())
- }) ?? [])
+ let lists = []
+ if (this.searchMode === SEARCH_MODE_ALL || this.searchMode === SEARCH_MODE_LISTS) {
+ let query = this.query
+ if (this.searchMode === SEARCH_MODE_LISTS) {
+ query = query.substr(1)
+ }
+
+ lists = (Object.values(this.$store.state.lists).filter(l => {
+ return l.title.toLowerCase().includes(query.toLowerCase())
+ }) ?? [])
+ }
const cmds = this.availableCmds
.filter(a => a.title.toLowerCase().includes(this.query.toLowerCase()))
@@ -167,7 +181,7 @@ export default {
}
}
- return ''
+ return 'You can use # to only seach for tasks, * to only search for lists and @ to only search for teams.'
},
currentList() {
return Object.keys(this.$store.state[CURRENT_LIST]).length === 0 ? null : this.$store.state[CURRENT_LIST]
@@ -196,6 +210,23 @@ export default {
return cmds
},
+ searchMode() {
+ if (this.query === '') {
+ return SEARCH_MODE_ALL
+ }
+
+ if (this.query.startsWith('#')) {
+ return SEARCH_MODE_TASKS
+ }
+ if (this.query.startsWith('*')) {
+ return SEARCH_MODE_LISTS
+ }
+ if (this.query.startsWith('@')) {
+ return SEARCH_MODE_TEAMS
+ }
+
+ return SEARCH_MODE_ALL
+ },
},
created() {
this.taskService = new TaskService()
@@ -206,9 +237,20 @@ export default {
methods: {
search() {
this.searchTasks()
+ this.searchTeams()
},
searchTasks() {
- if (this.query === '' || this.selectedCmd !== null) {
+ if (this.searchMode !== SEARCH_MODE_ALL && this.searchMode !== SEARCH_MODE_TASKS) {
+ this.foundTasks = []
+ return
+ }
+
+ let query = this.query
+ if (this.searchMode === SEARCH_MODE_TASKS) {
+ query = query.substr(1)
+ }
+
+ if (query === '' || this.selectedCmd !== null) {
return
}
@@ -218,7 +260,7 @@ export default {
}
this.taskSearchTimeout = setTimeout(() => {
- this.taskService.getAll({}, {s: this.query})
+ this.taskService.getAll({}, {s: query})
.then(r => {
r = r.map(t => {
t.type = TYPE_TASK
@@ -233,6 +275,37 @@ export default {
})
}, 150)
},
+ searchTeams() {
+ if (this.searchMode !== SEARCH_MODE_ALL && this.searchMode !== SEARCH_MODE_TEAMS) {
+ this.foundTeams = []
+ return
+ }
+
+ let query = this.query
+ if (this.searchMode === SEARCH_MODE_TEAMS) {
+ query = query.substr(1)
+ }
+
+ if (query === '' || this.selectedCmd !== null) {
+ return
+ }
+
+ if (this.teamSearchTimeout !== null) {
+ clearTimeout(this.teamSearchTimeout)
+ this.teamSearchTimeout = null
+ }
+
+ this.teamSearchTimeout = setTimeout(() => {
+ this.teamService.getAll({}, {s: query})
+ .then(r => {
+ r = r.map(t => {
+ t.title = t.name
+ return t
+ })
+ this.$set(this, 'foundTeams', r)
+ })
+ }, 150)
+ },
closeQuickActions() {
this.$store.commit(QUICK_ACTIONS_ACTIVE, false)
},
@@ -321,7 +394,6 @@ export default {
.then(r => {
this.$store.commit('namespaces/addNamespace', r)
this.success({message: 'The namespace was successfully created.'}, this)
- this.$router.back()
this.closeQuickActions()
})
.catch((e) => {
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 922401350..0e4f63939 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -94,14 +94,6 @@ export default {
newTask: TaskModel,
isTaskEdit: false,
taskEditTask: TaskModel,
- flatPickerConfig: {
- altFormat: 'j M Y H:i',
- altInput: true,
- dateFormat: 'Y-m-d H:i',
- enableTime: true,
- onOpen: this.updateLastReminderDate,
- onClose: this.addReminderDate,
- },
}
},
components: {
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index d1ed87887..0f6c0c474 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -40,6 +40,7 @@
-
-
\ No newline at end of file
diff --git a/src/models/userSettings.js b/src/models/userSettings.js
index b936d8b73..71166534c 100644
--- a/src/models/userSettings.js
+++ b/src/models/userSettings.js
@@ -9,6 +9,7 @@ export default class UserSettingsModel extends AbstractModel {
discoverableByName: false,
discoverableByEmail: false,
overdueTasksRemindersEnabled: true,
+ weekStart: 0,
}
}
}
\ No newline at end of file
diff --git a/src/services/abstractService.js b/src/services/abstractService.js
index f08df1aa2..e7501af60 100644
--- a/src/services/abstractService.js
+++ b/src/services/abstractService.js
@@ -129,8 +129,7 @@ export default class AbstractService {
* @param route
* @returns object
*/
- getRouteReplacements(route) {
- let parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}
+ getRouteReplacements(route, parameters = {}) {
let replace$$1 = {}
let pattern = this.getRouteParameterPattern()
pattern = new RegExp(pattern instanceof RegExp ? pattern.source : pattern, 'g')
diff --git a/src/store/index.js b/src/store/index.js
index 260d02705..dbe860673 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,6 +17,7 @@ import kanban from './modules/kanban'
import tasks from './modules/tasks'
import lists from './modules/lists'
import attachments from './modules/attachments'
+import labels from './modules/labels'
import ListService from '../services/list'
import {setTitle} from '@/helpers/setTitle'
@@ -32,6 +33,7 @@ export const store = new Vuex.Store({
tasks,
lists,
attachments,
+ labels,
},
state: {
loading: false,
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index 37d6002f6..1f9aea6b6 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -2,6 +2,13 @@ import {HTTPFactory} from '@/http-common'
import {ERROR_MESSAGE, LOADING} from '../mutation-types'
import UserModel from '../../models/user'
+const defaultSettings = settings => {
+ if (typeof settings.weekStart === 'undefined' || settings.weekStart === '') {
+ settings.weekStart = 0
+ }
+ return settings
+}
+
export default {
namespaced: true,
state: () => ({
@@ -20,12 +27,12 @@ export default {
state.avatarUrl = info.getAvatarUrl()
if (info.settings) {
- state.settings = info.settings
+ state.settings = defaultSettings(info.settings)
}
}
},
setUserSettings(state, settings) {
- state.settings = settings
+ state.settings = defaultSettings(settings)
const info = state.info !== null ? state.info : {}
info.name = settings.name
state.info = info
diff --git a/src/store/modules/labels.js b/src/store/modules/labels.js
new file mode 100644
index 000000000..f8dde6563
--- /dev/null
+++ b/src/store/modules/labels.js
@@ -0,0 +1,100 @@
+import LabelService from '@/services/label'
+import Vue from 'vue'
+import {setLoading} from '@/store/helper'
+
+export default {
+ namespaced: true,
+ // The state is an object which has the label ids as keys.
+ state: () => ({
+ labels: {},
+ loaded: false,
+ }),
+ mutations: {
+ setLabels(state, labels) {
+ labels.forEach(l => {
+ Vue.set(state.labels, l.id, l)
+ })
+ },
+ setLabel(state, label) {
+ Vue.set(state.labels, label.id, label)
+ },
+ removeLabelById(state, label) {
+ Vue.delete(state.labels, label.id)
+ },
+ setLoaded(state, loaded) {
+ state.loaded = loaded
+ },
+ },
+ actions: {
+ loadAllLabels(ctx, {forceLoad} = {}) {
+ if (ctx.state.loaded && !forceLoad) {
+ return Promise.resolve()
+ }
+
+ const cancel = setLoading(ctx, 'labels')
+ const labelService = new LabelService()
+
+ const getAllLabels = (page = 1) => {
+ return labelService.getAll({}, {}, page)
+ .then(labels => {
+ if (page < labelService.totalPages) {
+ return getAllLabels(page + 1)
+ .then(nextLabels => {
+ return labels.concat(nextLabels)
+ })
+ } else {
+ return labels
+ }
+ })
+ .catch(e => {
+ return Promise.reject(e)
+ })
+ }
+
+ return getAllLabels()
+ .then(r => {
+ ctx.commit('setLabels', r)
+ ctx.commit('setLoaded', true)
+ return Promise.resolve(r)
+ })
+ .catch(e => Promise.reject(e))
+ .finally(() => cancel())
+ },
+ deleteLabel(ctx, label) {
+ const cancel = setLoading(ctx, 'labels')
+ const labelService = new LabelService()
+
+ return labelService.delete(label)
+ .then(r => {
+ ctx.commit('removeLabelById', label)
+ return Promise.resolve(r)
+ })
+ .catch(e => Promise.reject(e))
+ .finally(() => cancel())
+ },
+ updateLabel(ctx, label) {
+ const cancel = setLoading(ctx, 'labels')
+ const labelService = new LabelService()
+
+ return labelService.update(label)
+ .then(r => {
+ ctx.commit('setLabel', r)
+ return Promise.resolve(r)
+ })
+ .catch(e => Promise.reject(e))
+ .finally(() => cancel())
+ },
+ createLabel(ctx, label) {
+ const cancel = setLoading(ctx, 'labels')
+ const labelService = new LabelService()
+
+ return labelService.create(label)
+ .then(r => {
+ ctx.commit('setLabel', r)
+ return Promise.resolve(r)
+ })
+ .catch(e => Promise.reject(e))
+ .finally(() => cancel())
+ },
+ },
+}
diff --git a/src/styles/components/list.scss b/src/styles/components/list.scss
index 19b3992e7..17a3d3aa5 100644
--- a/src/styles/components/list.scss
+++ b/src/styles/components/list.scss
@@ -152,23 +152,6 @@ $filter-container-top-link-share-list: -47px;
margin-top: $filter-container-top-default;
}
-.is-archived {
- $notification-height: 1.25rem + 1.25rem + 1.5rem + 1.5rem;
-
- .filter-container {
- margin-top: calc(#{$filter-container-top-default} - #{$notification-height});
- }
-
- .link-share-container .gantt-chart-container .filter-container,
- .gantt-chart-container .filter-container {
- margin-top: calc(#{$filter-container-top-link-share-gantt} - 2rem - #{$notification-height});
- }
-
- .link-share-container .list-view .filter-container {
- margin-top: calc(#{$filter-container-top-link-share-list} - #{$notification-height});
- }
-
- .link-share-container .filter-container {
- margin-top: calc(#{$filter-container-top-default} - #{$notification-height});
- }
+.is-archived .notification.is-warning {
+ margin-bottom: 1rem;
}
diff --git a/src/styles/components/task.scss b/src/styles/components/task.scss
index 97178c790..a403c37c9 100644
--- a/src/styles/components/task.scss
+++ b/src/styles/components/task.scss
@@ -199,6 +199,10 @@
}
}
+.link-share-container:not(.has-background) .task-view {
+ background: transparent;
+}
+
.task-view-container {
padding-bottom: 1rem;
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index 21a5f504a..ddeeca4a8 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -1,5 +1,5 @@
-