Remove unneeded reminder code

This commit is contained in:
Jože Fortun
2023-02-28 17:23:08 +01:00
parent bded96c718
commit d9a1e55a89
4 changed files with 16 additions and 59 deletions
@@ -20,7 +20,7 @@
<b-form-group :label="$t('reminder.edit.titleLabel')">
<b-form-input
v-model="title"
v-model="reminder.payload.title"
data-test-id="input-title"
required
:placeholder="$t('reminder.edit.titlePlaceholder')"
@@ -29,7 +29,7 @@
<b-form-group :label="$t('reminder.edit.notesLabel')">
<b-form-textarea
v-model="notes"
v-model="reminder.payload.notes"
data-test-id="textarea-notes"
:placeholder="$t('reminder.edit.notesPlaceholder')"
rows="6"
@@ -133,11 +133,6 @@ export default {
default: () => ({}),
},
myID: {
type: String,
required: true,
},
users: {
type: Array,
required: true,
@@ -151,38 +146,11 @@ export default {
// Do this, so we don't edit the original object
reminder: undefined,
assignees: [{ userID: this.myID }],
assignees: [{ userID: this.$auth.user.userID }],
}
},
computed: {
title: {
get () {
return (this.reminder.payload || {}).title
},
set (v) {
this.updPayload('title', v)
},
},
notes: {
get () {
return (this.reminder.payload || {}).notes
},
set (v) {
this.updPayload('notes', v)
},
},
remindAt: {
get () {
return (this.reminder.payload || {}).remindAt || null
},
set (v) {
this.updPayload('remindAt', v)
},
},
recordViewer () {
const { params } = this.reminder.payload.link || {}
return params ? { name: 'page.record', params } : undefined
@@ -201,14 +169,6 @@ export default {
},
methods: {
// Helper to handle undefined fields
updPayload (f, v) {
if (!this.reminder.payload) {
this.$set(this.reminder, 'payload', {})
}
this.$set(this.reminder.payload, f, v)
},
searchUsers: _.debounce(function (query) {
this.processingUsers = true
@@ -220,7 +180,7 @@ export default {
}, 300),
getUserLabel ({ userID, email, name, username }) {
if (userID === this.myID) {
if (userID === this.$auth.user.userID) {
return this.$t('reminder.edit.assigneePlaceholder')
}
@@ -66,8 +66,7 @@
>
<b-button
v-if="r.payload.link"
:disabled="!recordViewer()"
:to="recordViewer(r.payload.link.params)"
:to="recordViewer(r.payload.link)"
:title="$t('reminder.recordPageLink')"
variant="outline-light"
class="d-flex align-items-center py-2 text-primary border-0"
@@ -150,8 +149,8 @@ export default {
return fmt.fullDateTime(remindAt)
},
recordViewer (params) {
return { name: 'page.record', params }
recordViewer ({ params } = {}) {
return params ? { name: 'page.record', params } : undefined
},
},
}
@@ -12,11 +12,10 @@
<edit
v-else
:edit="edit"
:my-i-d="$auth.user.userID"
:users="users"
class="flex-fill"
@dismiss="onDismiss"
@back="edit = undefined"
@back="onCancel()"
@save="onSave"
/>
</div>
@@ -78,13 +77,12 @@ export default {
onSave (r) {
const endpoint = r.reminderID && r.reminderID !== NoID ? 'reminderUpdate' : 'reminderCreate'
this.$SystemAPI[endpoint](r).then(r => {
this.edit = undefined
this.fetchReminders()
this.$SystemAPI[endpoint](r).then(() => {
return this.fetchReminders()
}).then(() => {
this.onCancel()
this.$Reminder.prefetch()
})
this.onCancel()
},
onCancel () {
@@ -104,8 +102,8 @@ export default {
})
},
fetchReminders () {
this.$SystemAPI.reminderList({
async fetchReminders () {
return this.$SystemAPI.reminderList({
assignedTo: this.$auth.user.userID,
limit: 0,
}).then(({ set: reminders = [] }) => {
@@ -54,7 +54,7 @@ import { getDate, setDate, getTime, setTime } from './lib/index.ts'
export default {
props: {
value: {
type: String,
type: [String, Date],
required: false,
},
@@ -137,7 +137,7 @@ export default {
background-color: white;
}
@media (min-width: 992px) {
@media (min-width: 992px) {
.c-input-date-time {
min-width: 250px;
}