Skip to content

[stable30] fix(fileUpload): don't duplicate file templates in store #13202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 2 commits into from
Sep 2, 2024
Merged

[stable30] fix(fileUpload): don't duplicate file templates in store #13202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e90ce7c
fix(upload): don't create template duplicates in store
Antreesy Sep 2, 2024
293d5d9
fix(upload): don't initiate new server request for templates
Antreesy Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/NewMessage/NewMessageAttachments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default {

computed: {
fileTemplateOptions() {
return this.$store.getters.getFileTemplates()
return this.$store.getters.fileTemplates
},

shareFromNextcloudLabel() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/NewMessage/NewMessageNewFileDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default {

computed: {
fileTemplateOptions() {
return this.$store.getters.getFileTemplates()
return this.$store.getters.fileTemplates
},

fileTemplate() {
Expand Down
21 changes: 12 additions & 9 deletions src/store/fileUploadStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const getters = {
return state.fileTemplatesInitialised
},

getFileTemplates: (state) => () => {
fileTemplates: (state) => {
return state.fileTemplates
},
}
Expand Down Expand Up @@ -199,12 +199,12 @@ const mutations = {
Vue.delete(state.uploads, uploadId)
},

storeFilesTemplates(state, { template }) {
state.fileTemplates.push(template)
storeFilesTemplates(state, templates) {
Vue.set(state, 'fileTemplates', templates)
state.fileTemplatesInitialised = true
},

markFileTemplatesInitialisedForGuests(state) {
markFileTemplatesInitialised(state) {
state.fileTemplatesInitialised = true
},
}
Expand Down Expand Up @@ -547,18 +547,21 @@ const actions = {
},

async getFileTemplates({ commit, getters }) {
if (getters.fileTemplates.length) {
console.debug('Skip file templates setup as already done')
commit('markFileTemplatesInitialised')
return
}

if (getters.getUserId() === null) {
console.debug('Skip file templates setup for participants that are not logged in')
commit('markFileTemplatesInitialisedForGuests')
commit('markFileTemplatesInitialised')
return
}

try {
const response = await getFileTemplates()

response.data.ocs.data.forEach(template => {
commit('storeFilesTemplates', { template })
})
commit('storeFilesTemplates', response.data.ocs.data)
} catch (error) {
console.error('An error happened when trying to load the templates', error)
}
Expand Down