From 536b0fd7d5a09a22869888946fd9332c5bc5f7fd Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:14:58 +0200
Subject: [PATCH] feat: constants

---
 src/components/home/TheNavigation.vue            |  2 +-
 src/components/notifications/notifications.vue   |  2 +-
 src/components/sharing/linkSharing.vue           |  2 +-
 src/components/sharing/userTeam.vue              |  2 +-
 src/components/tasks/gantt-component.vue         |  4 ++--
 src/components/tasks/partials/priorityLabel.vue  |  2 +-
 src/components/tasks/partials/prioritySelect.vue | 14 +++++++-------
 src/components/tasks/partials/relatedTasks.vue   |  5 ++---
 src/components/tasks/partials/repeatAfter.vue    | 14 +++++++-------
 src/models/abstractModel.ts                      |  3 ++-
 src/models/constants/notificationNames.json      |  7 -------
 src/models/constants/priorities.json             |  8 --------
 src/models/constants/priorities.ts               |  8 ++++++++
 src/models/constants/relationKinds.json          | 12 ------------
 src/models/constants/rights.json                 |  5 -----
 src/models/constants/rights.ts                   |  7 +++++++
 src/models/constants/taskRepeatModes.json        |  5 -----
 src/models/linkShare.ts                          |  3 ++-
 src/models/team.ts                               |  3 ++-
 src/models/teamShareBase.ts                      |  3 ++-
 src/models/userShareBase.ts                      |  3 ++-
 src/modules/parseTaskText.test.ts                |  8 ++++----
 src/modules/parseTaskText.ts                     | 13 ++-----------
 src/views/list/ListKanban.vue                    |  2 +-
 src/views/list/ListList.vue                      |  2 +-
 src/views/tasks/TaskDetailView.vue               |  5 ++---
 src/views/teams/EditTeam.vue                     |  2 +-
 27 files changed, 59 insertions(+), 87 deletions(-)
 delete mode 100644 src/models/constants/notificationNames.json
 delete mode 100644 src/models/constants/priorities.json
 create mode 100644 src/models/constants/priorities.ts
 delete mode 100644 src/models/constants/relationKinds.json
 delete mode 100644 src/models/constants/rights.json
 create mode 100644 src/models/constants/rights.ts
 delete mode 100644 src/models/constants/taskRepeatModes.json

diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index 1c68e05e9..070e574d2 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -98,7 +98,7 @@ import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
 
 import {QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
-import Rights from '@/models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 
 import Update from '@/components/home/update.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 78a51e6f7..2cb36b6b6 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -51,7 +51,7 @@ import {computed, onMounted, onUnmounted, ref} from 'vue'
 
 import NotificationService from '@/services/notification'
 import User from '@/components/misc/user.vue'
-import names from '@/models/constants/notificationNames.json'
+import NotificationModel, { NOTIFICATION_NAMES as names} from '@/models/notification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index e0b454e6a..74cae27ac 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -180,7 +180,7 @@ import {ref, watch, computed, shallowReactive} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
-import RIGHTS from '@/models/constants/rights.json'
+import {RIGHTS} from '@/models/constants/rights'
 import LinkShareModel from '@/models/linkShare'
 
 import LinkShareService from '@/services/linkShare'
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 56ea03dc6..6920102ca 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -158,7 +158,7 @@ import TeamListService from '@/services/teamList'
 import TeamService from '@/services/team'
 import TeamModel from '@/models/team'
 
-import RIGHTS from '@/models/constants/rights.json'
+import {RIGHTS} from '@/models/constants/rights'
 import Multiselect from '@/components/input/multiselect.vue'
 import Nothing from '@/components/misc/nothing.vue'
 import {success} from '@/message'
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 694c49e42..574f355c8 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -178,11 +178,11 @@ import EditTask from './edit-task.vue'
 
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
-import priorities from '../../models/constants/priorities'
+import {PRIORITIES as priorities} from '@/models/constants/priorities'
 import PriorityLabel from './partials/priorityLabel.vue'
 import TaskCollectionService from '../../services/taskCollection'
 import {mapState} from 'vuex'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
diff --git a/src/components/tasks/partials/priorityLabel.vue b/src/components/tasks/partials/priorityLabel.vue
index f56dfde58..380d711b4 100644
--- a/src/components/tasks/partials/priorityLabel.vue
+++ b/src/components/tasks/partials/priorityLabel.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import priorities from '@/models/constants/priorities'
+import {PRIORITIES as priorities} from '@/models/constants/priorities'
 	
 defineProps({
 	priority: {
diff --git a/src/components/tasks/partials/prioritySelect.vue b/src/components/tasks/partials/prioritySelect.vue
index 300cb60b9..def7b37f3 100644
--- a/src/components/tasks/partials/prioritySelect.vue
+++ b/src/components/tasks/partials/prioritySelect.vue
@@ -5,19 +5,19 @@
 			@change="updateData"
 			:disabled="disabled || undefined"
 		>
-			<option :value="priorities.UNSET">{{ $t('task.priority.unset') }}</option>
-			<option :value="priorities.LOW">{{ $t('task.priority.low') }}</option>
-			<option :value="priorities.MEDIUM">{{ $t('task.priority.medium') }}</option>
-			<option :value="priorities.HIGH">{{ $t('task.priority.high') }}</option>
-			<option :value="priorities.URGENT">{{ $t('task.priority.urgent') }}</option>
-			<option :value="priorities.DO_NOW">{{ $t('task.priority.doNow') }}</option>
+			<option :value="PRIORITIES.UNSET">{{ $t('task.priority.unset') }}</option>
+			<option :value="PRIORITIES.LOW">{{ $t('task.priority.low') }}</option>
+			<option :value="PRIORITIES.MEDIUM">{{ $t('task.priority.medium') }}</option>
+			<option :value="PRIORITIES.HIGH">{{ $t('task.priority.high') }}</option>
+			<option :value="PRIORITIES.URGENT">{{ $t('task.priority.urgent') }}</option>
+			<option :value="PRIORITIES.DO_NOW">{{ $t('task.priority.doNow') }}</option>
 		</select>
 	</div>
 </template>
 
 <script setup lang="ts">
 import {ref, watch} from 'vue'
-import priorities from '@/models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities'
 
 const priority = ref(0)
 
diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
index 5129eeadc..3709b17dd 100644
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@@ -142,8 +142,7 @@ import {defineComponent} from 'vue'
 import TaskService from '../../../services/task'
 import TaskModel from '../../../models/task'
 import TaskRelationService from '../../../services/taskRelation'
-import relationKinds from '../../../models/constants/relationKinds'
-import TaskRelationModel from '../../../models/taskRelation'
+import TaskRelationModel, {RELATION_KINDS} from '@/models/taskRelation'
 
 import Multiselect from '@/components/input/multiselect.vue'
 
@@ -154,7 +153,7 @@ export default defineComponent({
 			relatedTasks: {},
 			taskService: new TaskService(),
 			foundTasks: [],
-			relationKinds: relationKinds,
+			relationKinds: RELATION_KINDS,
 			newTaskRelationTask: new TaskModel(),
 			newTaskRelationKind: 'related',
 			taskRelationService: new TaskRelationService(),
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index fe0300173..a4fa76cb0 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -12,14 +12,14 @@
 			<div class="control">
 				<div class="select">
 					<select @change="updateData" v-model="task.repeatMode" id="repeatMode">
-						<option :value="repeatModes.REPEAT_MODE_DEFAULT">{{ $t('misc.default') }}</option>
-						<option :value="repeatModes.REPEAT_MODE_MONTH">{{ $t('task.repeat.monthly') }}</option>
-						<option :value="repeatModes.REPEAT_MODE_FROM_CURRENT_DATE">{{ $t('task.repeat.fromCurrentDate') }}</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT">{{ $t('misc.default') }}</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_MONTH">{{ $t('task.repeat.monthly') }}</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_FROM_CURRENT_DATE">{{ $t('task.repeat.fromCurrentDate') }}</option>
 					</select>
 				</div>
 			</div>
 		</div>
-		<div class="is-flex" v-if="task.repeatMode !== repeatModes.REPEAT_MODE_MONTH">
+		<div class="is-flex" v-if="task.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_MONTH">
 			<p class="pr-4">
 				{{ $t('task.repeat.each') }}
 			</p>
@@ -56,8 +56,8 @@
 
 <script setup lang="ts">
 import {ref, reactive, watch} from 'vue'
-import repeatModes from '@/models/constants/taskRepeatModes'
 import TaskModel from '@/models/task'
+import {TASK_REPEAT_MODES, type RepeatAfter} from '@/models/task'
 
 const props = defineProps({
 	modelValue: {
@@ -90,7 +90,7 @@ watch(
 )
 
 function updateData() {
-	if (task.value.repeatMode !== repeatModes.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
+	if (!task.value || task.value.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
 		return
 	}
 	
@@ -99,7 +99,7 @@ function updateData() {
 	emit('change')
 }
 
-function setRepeatAfter(amount: number, type) {
+function setRepeatAfter(amount: number, type: RepeatAfter['type']) {
 	Object.assign(repeatAfter, { amount, type})
 	updateData()
 }
diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index fbf074e29..7507265b6 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -1,12 +1,13 @@
 import {objectToCamelCase} from '@/helpers/case'
 import {omitBy, isNil} from '@/helpers/utils'
+import type {Right} from '@/models/constants/rights'
 
 export default class AbstractModel {
 
 	/**
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
 	 */
-	maxRight: number | null = null
+	maxRight: Right | null = null
 
 	/**
 	 * The abstract constructor takes an object and merges its data with the default data of this model.
diff --git a/src/models/constants/notificationNames.json b/src/models/constants/notificationNames.json
deleted file mode 100644
index 62260fe34..000000000
--- a/src/models/constants/notificationNames.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "TASK_COMMENT": "task.comment",
-  "TASK_ASSIGNED": "task.assigned",
-  "TASK_DELETED": "task.deleted",
-  "LIST_CREATED": "list.created",
-  "TEAM_MEMBER_ADDED": "team.member.added"
-}
\ No newline at end of file
diff --git a/src/models/constants/priorities.json b/src/models/constants/priorities.json
deleted file mode 100644
index c38b195d9..000000000
--- a/src/models/constants/priorities.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"UNSET": 0,
-"LOW": 1,
-"MEDIUM": 2,
-"HIGH": 3,
-"URGENT": 4,
-"DO_NOW": 5
-}
\ No newline at end of file
diff --git a/src/models/constants/priorities.ts b/src/models/constants/priorities.ts
new file mode 100644
index 000000000..b3cf85cb3
--- /dev/null
+++ b/src/models/constants/priorities.ts
@@ -0,0 +1,8 @@
+export const PRIORITIES = {
+	'UNSET': 0,
+	'LOW': 1,
+	'MEDIUM': 2,
+	'HIGH': 3,
+	'URGENT': 4,
+	'DO_NOW': 5,
+} as const
\ No newline at end of file
diff --git a/src/models/constants/relationKinds.json b/src/models/constants/relationKinds.json
deleted file mode 100644
index 4b3c2e519..000000000
--- a/src/models/constants/relationKinds.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  "subtask",
-  "parenttask",
-  "related",
-  "duplicates",
-  "blocking",
-  "blocked",
-  "precedes",
-  "follows",
-  "copiedfrom",
-  "copiedto"
-]
\ No newline at end of file
diff --git a/src/models/constants/rights.json b/src/models/constants/rights.json
deleted file mode 100644
index 61e6b145c..000000000
--- a/src/models/constants/rights.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "READ": 0,
-  "READ_WRITE": 1,
-  "ADMIN": 2
-}
\ No newline at end of file
diff --git a/src/models/constants/rights.ts b/src/models/constants/rights.ts
new file mode 100644
index 000000000..1c2aeb70d
--- /dev/null
+++ b/src/models/constants/rights.ts
@@ -0,0 +1,7 @@
+export const RIGHTS = {
+  'READ': 0,
+  'READ_WRITE': 1,
+  'ADMIN': 2,
+} as const
+
+export type Right = typeof RIGHTS[keyof typeof RIGHTS]
\ No newline at end of file
diff --git a/src/models/constants/taskRepeatModes.json b/src/models/constants/taskRepeatModes.json
deleted file mode 100644
index 7d172950b..000000000
--- a/src/models/constants/taskRepeatModes.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "REPEAT_MODE_DEFAULT": 0,
-  "REPEAT_MODE_MONTH": 1,
-  "REPEAT_MODE_FROM_CURRENT_DATE": 2
-}
\ No newline at end of file
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 852cd8b7b..bb54034c8 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,5 +1,6 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class LinkShareModel extends AbstractModel {
 
@@ -18,7 +19,7 @@ export default class LinkShareModel extends AbstractModel {
 		return {
 			id: 0,
 			hash: '',
-			right: 0,
+			right: RIGHTS.READ,
 			sharedBy: UserModel,
 			sharingType: 0,
 			listId: 0,
diff --git a/src/models/team.ts b/src/models/team.ts
index d9217926f..164e82835 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,6 +1,7 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
 import TeamMemberModel from './teamMember'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class TeamModel extends AbstractModel {
 	constructor(data) {
@@ -22,7 +23,7 @@ export default class TeamModel extends AbstractModel {
 			name: '',
 			description: '',
 			members: [],
-			right: 0,
+			right: RIGHTS.READ,
 
 			createdBy: {},
 			created: null,
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 08b3dc80f..b48ba6cf2 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,4 +1,5 @@
 import AbstractModel from './abstractModel'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 /**
  * This class is a base class for common team sharing model.
@@ -14,7 +15,7 @@ export default class TeamShareBaseModel extends AbstractModel {
 	defaults() {
 		return {
 			teamId: 0,
-			right: 0,
+			right: RIGHTS.READ,
 
 			created: null,
 			updated: null,
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 171643a06..5211b459a 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,4 +1,5 @@
 import AbstractModel from './abstractModel'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class UserShareBaseModel extends AbstractModel {
 	constructor(data) {
@@ -10,7 +11,7 @@ export default class UserShareBaseModel extends AbstractModel {
 	defaults() {
 		return {
 			userId: '',
-			right: 0,
+			right: RIGHTS.READ,
 
 			created: null,
 			updated: null,
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index 30e5743c4..a2131aae6 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -3,7 +3,7 @@ import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
 import {parseTaskText} from './parseTaskText'
 import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
 import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
-import priorities from '../models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities.ts'
 
 describe('Parse Task Text', () => {
 	beforeEach(() => {
@@ -490,12 +490,12 @@ describe('Parse Task Text', () => {
 	})
 
 	describe('Priority', () => {
-		for (const p in priorities) {
+		for (const p in PRIORITIES) {
 			it(`should parse priority ${p}`, () => {
-				const result = parseTaskText(`Lorem Ipsum !${priorities[p]}`)
+				const result = parseTaskText(`Lorem Ipsum !${PRIORITIES[p]}`)
 
 				expect(result.text).toBe('Lorem Ipsum')
-				expect(result.priority).toBe(priorities[p])
+				expect(result.priority).toBe(PRIORITIES[p])
 			})
 		}
 		it(`should not parse an invalid priority`, () => {
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index 80c33e3da..c3c8ad7d4 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -1,5 +1,5 @@
 import {parseDate} from '../helpers/time/parseDate'
-import _priorities from '../models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities'
 
 const VIKUNJA_PREFIXES: Prefixes = {
 	label: '*',
@@ -27,16 +27,7 @@ export const PREFIXES = {
 	[PrefixMode.Todoist]: TODOIST_PREFIXES,
 }
 
-const priorities: Priorites = _priorities
-
-interface Priorites {
-	UNSET: number,
-	LOW: number,
-	MEDIUM: number,
-	HIGH: number,
-	URGENT: number,
-	DO_NOW: number,
-}
+const priorities = PRIORITIES
 
 enum RepeatType {
 	Hours = 'hours',
diff --git a/src/views/list/ListKanban.vue b/src/views/list/ListKanban.vue
index 78361989c..cb6392aa8 100644
--- a/src/views/list/ListKanban.vue
+++ b/src/views/list/ListKanban.vue
@@ -233,7 +233,7 @@ import cloneDeep from 'lodash.clonedeep'
 
 import BucketModel from '../../models/bucket'
 import {mapState} from 'vuex'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import ListWrapper from './ListWrapper.vue'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index 369273643..8ff42b5b4 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -139,7 +139,7 @@ import EditTask from '@/components/tasks/edit-task.vue'
 import AddTask from '@/components/tasks/add-task.vue'
 import SingleTaskInList from '@/components/tasks/partials/singleTaskInList.vue'
 import { useTaskList } from '@/composables/taskList'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import {HAS_TASKS} from '@/store/mutation-types'
 import Nothing from '@/components/misc/nothing.vue'
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index f58eefe0a..74ee10de8 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -419,8 +419,8 @@ import {defineComponent} from 'vue'
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
 
-import priorites from '../../models/constants/priorities.json'
-import rights from '../../models/constants/rights.json'
+import { PRIORITIES as priorites } from '@/models/constants/priorities'
+import {RIGHTS as rights} from '@/models/constants/rights'
 
 import PrioritySelect from '../../components/tasks/partials/prioritySelect.vue'
 import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect.vue'
@@ -512,7 +512,6 @@ export default defineComponent({
 			// Used to avoid flashing of empty elements if the task content is not yet loaded.
 			visible: false,
 
-			priorities: priorites,
 			activeFields: {
 				assignees: false,
 				priority: false,
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index b5ccd7295..8496d2f5e 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -172,7 +172,7 @@ import TeamMemberService from '../../services/teamMember'
 import type TeamMemberModel from '../../models/teamMember'
 import type UserModel from '../../models/user'
 import UserService from '../../services/user'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 
 import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'