Add lastUpdated sorting to frontend

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>

Author: Chartman123

src/Forms.vue

@@ -103,11 +103,12 @@
 </template>
 
 <script>
-import { emit } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { generateOcsUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
+import moment from '@nextcloud/moment'
 
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
@@ -224,6 +225,14 @@ export default {
 		this.loadForms()
 	},
 
+	mounted() {
+		subscribe('change-last-updated', (id) => this.onLastUpdatedByEventBus(id))
+	},
+
+	unmounted() {
+		unsubscribe('change-last-updated', (id) => this.onLastUpdatedByEventBus(id))
+	},
+
 	methods: {
 		/**
 		 * Closes the App-Navigation on mobile-devices
@@ -349,6 +358,23 @@ export default {
 				this.$router.push({ name: 'root' })
 			}
 		},
+
+		/**
+		 * Update last updated timestamp in given form
+		 *
+		 * @param {number} id the form id
+		 */
+		onLastUpdatedByEventBus(id) {
+			const formIndex = this.forms.findIndex(form => form.id === id)
+			if (formIndex !== -1) {
+				this.forms[formIndex].lastUpdated = moment().unix()
+				this.forms.sort((b, a) => a.lastUpdated - b.lastUpdated)
+			} else {
+				const sharedFormIndex = this.sharedForms.findIndex(form => form.id === id)
+				this.sharedForms[sharedFormIndex].lastUpdated = moment().unix()
+				this.sharedForms.sort((a, b) => a.lastUpdated - b.lastUpdated)
+			}
+		},
 	},
 }
 </script>

src/mixins/QuestionMixin.js

@@ -20,8 +20,9 @@
  *
  */
 import { debounce } from 'debounce'
-import { generateOcsUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
+import { generateOcsUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 
 import logger from '../utils/Logger.js'
@@ -256,6 +257,7 @@ export default {
 						[key]: value,
 					},
 				})
+				emit('change-last-updated', this.$attrs.formId)
 			} catch (error) {
 				logger.error('Error while saving question', { error })
 				showError(t('forms', 'Error while saving question'))

src/mixins/ViewsMixin.js

@@ -22,6 +22,7 @@
 
 import { generateOcsUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
 import axios from '@nextcloud/axios'
 import MarkdownIt from 'markdown-it'
 
@@ -152,6 +153,7 @@ export default {
 						[key]: this.form[key],
 					},
 				})
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error('Error saving form property', { error })
 				showError(t('forms', 'Error while saving form'))

src/views/Create.vue

@@ -129,6 +129,7 @@ import { directive as ClickOutside } from 'v-click-outside'
 import { generateOcsUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
 import axios from '@nextcloud/axios'
 import moment from '@nextcloud/moment'
 import debounce from 'debounce'
@@ -333,6 +334,8 @@ export default {
 					lastQuestion.focus()
 				})
 
+				emit('change-last-updated', this.form.id)
+
 			} catch (error) {
 				logger.error('Error while adding new question', { error })
 				showError(t('forms', 'There was an error while adding the new question'))
@@ -354,6 +357,7 @@ export default {
 				await axios.delete(generateOcsUrl('apps/forms/api/v2/question/{id}', { id }))
 				const index = this.form.questions.findIndex(search => search.id === id)
 				this.form.questions.splice(index, 1)
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error(`Error while removing question ${id}`, { error })
 				showError(t('forms', 'There was an error while removing the question'))
@@ -374,6 +378,7 @@ export default {
 					formId: this.form.id,
 					newOrder,
 				})
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error('Error while saving form', { error })
 				showError(t('forms', 'Error while saving form'))

src/views/Results.vue

@@ -133,6 +133,7 @@
 import { generateOcsUrl } from '@nextcloud/router'
 import { getRequestToken } from '@nextcloud/auth'
 import { getFilePickerBuilder, showError, showSuccess } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
@@ -270,6 +271,7 @@ export default {
 				await axios.delete(generateOcsUrl('apps/forms/api/v2/submission/{id}', { id }))
 				const index = this.form.submissions.findIndex(search => search.id === id)
 				this.form.submissions.splice(index, 1)
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error(`Error while removing response ${id}`, { error })
 				showError(t('forms', 'There was an error while removing this response'))
@@ -287,6 +289,7 @@ export default {
 			try {
 				await axios.delete(generateOcsUrl('apps/forms/api/v2/submissions/{formId}', { formId: this.form.id }))
 				this.form.submissions = []
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error('Error while removing responses', { error })
 				showError(t('forms', 'There was an error while removing responses'))

src/views/Sidebar.vue

@@ -52,6 +52,7 @@
 </template>
 
 <script>
+import { emit } from '@nextcloud/event-bus'
 import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
 import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
 import IconSettings from 'vue-material-design-icons/Cog.vue'
@@ -114,14 +115,17 @@ export default {
 		 */
 		onAddShare(share) {
 			this.form.shares.push(share)
+			emit('change-last-updated', this.form.id)
 		},
 		onRemoveShare(share) {
 			const index = this.form.shares.findIndex(search => search.id === share.id)
 			this.form.shares.splice(index, 1)
+			emit('change-last-updated', this.form.id)
 		},
 		onUpdateShare(share) {
 			const index = this.form.shares.findIndex(search => search.id === share.id)
 			this.form.shares.splice(index, 1, share)
+			emit('change-last-updated', this.form.id)
 		},
 	},
 }

src/views/Submit.vue

@@ -105,6 +105,7 @@
 import { loadState } from '@nextcloud/initial-state'
 import { generateOcsUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
 import axios from '@nextcloud/axios'
 import moment from '@nextcloud/moment'
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
@@ -274,6 +275,7 @@ export default {
 					shareHash: this.shareHash,
 				})
 				this.success = true
+				emit('change-last-updated', this.form.id)
 			} catch (error) {
 				logger.error('Error while submitting the form', { error })
 				showError(t('forms', 'There was an error submitting the form'))