mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 21:37:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

add undo functionality to shopping

Browse Source
This commit is contained in:
vabene1111
2024-01-13 22:58:28 +08:00
parent fd821c30c7
commit 3d6d560c5d
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vue/src/apps/ShoppingListView/ShoppingListView.vue
View File

@@ -2,10 +2,11 @@
<div id="app">
<b-alert :show="!online" dismissible class="small float-up" variant="warning">{{ $t("OfflineAlert") }}</b-alert>
<b-button @click="useShoppingListStore().undoChange()">Undo</b-button>
<div class="row float-top w-100">
<div class="col-auto no-gutter ml-auto">
<b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i></b-button>
<b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
<i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"

2
vue/src/locales/en.json
View File

@@ -97,6 +97,8 @@
"base_amount": "Base Amount",
"Datatype": "Datatype",
"Input": "Input",
"Undo": "Undo",
"NoMoreUndo": "No changes to be undone.",
"Number of Objects": "Number of Objects",
"Add_Step": "Add Step",
"Keywords": "Keywords",

53
vue/src/stores/ShoppingListStore.js
View File

@@ -202,7 +202,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
return apiClient.createShoppingListEntry(object).then((r) => {
Vue.set(this.entries, r.data.id, r.data)
this.registerChange('CREATED', r.data, undefined, undefined)
this.registerChange('CREATED', {[r.data.id]: r.data},)
}).catch((err) => {
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
})
@@ -293,6 +293,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
* @param checked boolean to set checked state of entry to
*/
setEntriesCheckedState(entries, checked) {
this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
for (let i in entries) {
this.entries[i].checked = checked
this.updateObject(this.entries[i])
@@ -306,6 +307,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
let delay = 4 //TODO get delay from settings in an offline friendly way
let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
this.registerChange('DELAY', entries)
for (let i in entries) {
console.log('DELAYING ', i, ' until ', delay_date)
this.entries[i].delay_until = delay_date
@@ -322,35 +325,43 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
}
},
/**
*
* register the change to a set of entries to allow undoing it
* throws an Error if the operation type is not known
* @param type the type of change to register. This determines what undoing the change does. (CREATE->delete object,
* CHECKED->uncheck entry, UNCHECKED->check entry, DELAY->remove delay)
* @param {{}} entries set of entries
*/
registerChange(type, entries, new_value, old_value) {
if (!(type in ['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'])) {
//throw Error('Tried to register unknown change type')
registerChange(type, entries) {
if (!['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'].includes(type)) {
throw Error('Tried to register unknown change type')
}
this.undo_stack.push({'type': type, 'new_value': new_value, 'old_value': old_value, 'entries': entries})
this.undo_stack.push({'type': type, 'entries': entries})
},
/**
*
* takes the last item from the undo stack and reverts it
*/
undoChange() {
let last_item = this.undo_stack.pop()
let type = last_item['type']
let entries = last_item['entries']
if (last_item !== undefined) {
let type = last_item['type']
let entries = last_item['entries']
for (let i in entries) {
let e = entries[i]
if (type === 'CREATED') {
this.deleteObject(e)
} else if (type === 'CHECKED' || type === 'UNCHECKED') {
e.checked = (type === 'UNCHECKED')
this.updateObject(e)
} else if (type === 'DELAY') {
e.delay_until = null
this.updateObject(e)
}
for (let i in entries) {
let e = entries[i]
if (type === 'CREATED') {
this.deleteObject(e)
} else if (type === 'CHECKED' || type === 'UNCHECKED') {
e.checked = (type === 'UNCHECKED')
this.updateObject(e)
} else if (type === 'DELAY'){
e.delay_until = null
this.updateObject(e)
}
} else {
// can use localization in store
//StandardToasts.makeStandardToast(this, this.$t('NoMoreUndo'))
}
}
},