Merge branch 'develop'

Hectruendo · Hectruendo · commit 6c1fde0f87ce · 2024-03-06T02:30:53.000+01:00
diff --git a/admin/components/generic/InputSelect.vue b/admin/components/generic/InputSelect.vue
@@ -124,7 +124,7 @@ function remoteSearch(query) {
         ref = true
     }
     if (ref) {
-        itemsStore.retrieveItems($axios, url, {search: query, limit: 0, offset: 0, ordering: undefined}).then((items) => {
+        itemsStore.retrieveItems($axios, url, {search: query, limit: 0, offset: 0, ordering: undefined}, false).then((items) => {
             items = JSON.parse(JSON.stringify(items))
             items.results = items.results.map((item) => {
                 return {
diff --git a/admin/store/items.js b/admin/store/items.js
@@ -28,13 +28,9 @@ export const useItemsStore = defineStore('items', {
         ordering: undefined,
     }),
     actions: {
-        async retrieveItems($axios, apiUrl = undefined, params = {}) {
+        async retrieveItems($axios, apiUrl = undefined, params = {}, cache= true) {
             const cacheName = apiCacheName(apiUrl, params)
             // Would be nice to amke ordering dynamic as a parameter, perhaps one day
-            // let ordering = "-updated_date"
-            // if (apiUrl.indexOf("/people/") !== -1)
-            //     ordering = "first_name"
-            // check if params has "limit", "order" or "offset" and use them instead of the default ones
             if (!("limit" in params))
                 params.limit = this.pageSize
             if (!("offset" in params))
@@ -49,10 +45,14 @@ export const useItemsStore = defineStore('items', {
             }
             apiUrl += "?" + new URLSearchParams(params).toString()
 
-            this.items[cacheName] = (await $axios.get(apiUrl, {'headers': authHeaders()})).data
-            if (Array.isArray(this.items[cacheName])) { // When the endpoint is not paginated
-                this.items[cacheName] = {results: this.items[cacheName]}
+            let res = (await $axios.get(apiUrl, {'headers': authHeaders()})).data
+            if (Array.isArray(res)) { // When the endpoint is not paginated
+                res = {results: res}
             }
+            if (!cache)
+                return res
+
+            this.items[cacheName] = res
             return this.items[cacheName]
         },
         async deleteItem($axios, apiUrl, id) {

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ function remoteSearch(query) {`
`124`	`124`	`ref = true`
`125`	`125`	`}`
`126`	`126`	`if (ref) {`
`127`		`- itemsStore.retrieveItems($axios, url, {search: query, limit: 0, offset: 0, ordering: undefined}).then((items) => {`
	`127`	`+ itemsStore.retrieveItems($axios, url, {search: query, limit: 0, offset: 0, ordering: undefined}, false).then((items) => {`
`128`	`128`	`items = JSON.parse(JSON.stringify(items))`
`129`	`129`	`items.results = items.results.map((item) => {`
`130`	`130`	`return {`