Merge branch 'develop'

heseya · Aug 22, 2024 · 24e71ca · 24e71ca
2 parents a633bf5 + b2b20a5
commit 24e71ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "store-admin",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "private": true,
   "description": "Admin panel for Heseya Store API",
   "author": "Heseya",

diff --git a/src/components/AutocompleteInput.vue b/src/components/AutocompleteInput.vue
@@ -108,13 +108,14 @@ export default defineComponent({
     SelectType(): typeof SelectType {
       return SelectType
     },
+    allOptions(): AutocompleteBaseItem[] {
+      return uniqBy([...this.initialValueOptions, ...this.searchedOptions], this.propMode || 'id')
+    },
     singleOptionId: {
       get(): AutocompleteBaseItem | undefined {
         if (isEmpty(this.value)) return undefined
         if (this.propMode)
-          return this.searchedOptions.find(
-            (option) => option[this.propMode] === (this.value as string),
-          )
+          return this.allOptions.find((option) => option[this.propMode] === (this.value as string))
         return (this.value as AutocompleteBaseItem[])?.[0] || this.value
       },
       set(v: AutocompleteBaseItem) {
@@ -124,7 +125,7 @@ export default defineComponent({
     multiOptionsIds: {
       get(): AutocompleteBaseItem[] {
         if (this.propMode)
-          return [...this.initialValueOptions, ...this.searchedOptions].filter((option) =>
+          return this.allOptions.filter((option) =>
             (this.value as string[]).includes(String(option[this.propMode])),
           )
         return this.value as AutocompleteBaseItem[]
@@ -153,18 +154,11 @@ export default defineComponent({
     options(): AutocompleteBaseItem[] {
       if (this.mode === this.SelectType.Multiple) {
         return (
-          uniqBy(
-            [...this.initialValueOptions, ...this.multiOptionsIds, ...this.searchedOptions],
-            this.propMode || 'id',
-          ).filter((item) => !this.bannedSetIds.includes(item.id)) || []
-        )
-      } else
-        return (
-          uniqBy(
-            [...this.initialValueOptions, ...this.searchedOptions],
-            this.propMode || 'id',
-          ).filter((item) => !this.bannedSetIds.includes(item.id)) || []
+          uniqBy([...this.allOptions, ...this.multiOptionsIds], this.propMode || 'id').filter(
+            (item) => !this.bannedSetIds.includes(item.id),
+          ) || []
         )
+      } else return this.allOptions.filter((item) => !this.bannedSetIds.includes(item.id)) || []
     },
   },
   mounted() {
@@ -226,9 +220,8 @@ export default defineComponent({
         } = await api.get<{ data: AutocompleteBaseItem[] }>(`/${this.modelUrl}${query}`)
 
         this.searchedOptions = data
-      } catch (e) {
-        // eslint-disable-next-line no-console
-        console.error(e)
+      } catch (e: any) {
+        this.$toast.warning(`Failed to fetch model "${this.modelUrl}": ${e.message}`)
       }
     },