[#7135] merge scaffold collection indexes

ui/src/components/collections/CollectionUpsertPanel.svelte

@@ -6,7 +6,13 @@
     import { confirm } from "@/stores/confirmation";
     import { errors, removeError, setErrors } from "@/stores/errors";
     import { addSuccessToast, removeAllToasts } from "@/stores/toasts";
-    import { addCollection, removeCollection, scaffolds, activeCollection } from "@/stores/collections";
+    import {
+        addCollection,
+        removeCollection,
+        scaffolds,
+        activeCollection,
+        refreshScaffolds,
+    } from "@/stores/collections";
     import tooltip from "@/actions/tooltip";
     import Field from "@/components/base/Field.svelte";
     import OverlayPanel from "@/components/base/OverlayPanel.svelte";
@@ -161,7 +167,7 @@
         isLoadingConfirmation = false;
     }
 
-    function save(hideAfterSave = true) {
+    async function save(hideAfterSave = true) {
         if (isSaving) {
             return;
         }
@@ -171,15 +177,14 @@
         const data = exportFormData();
         const isNew = !collection.id;
 
-        let request;
+        try {
+            let result;
             if (isNew) {
-            request = ApiClient.collections.create(data);
+                result = await ApiClient.collections.create(data);
             } else {
-            request = ApiClient.collections.update(collection.id, data);
+                result = await ApiClient.collections.update(collection.id, data);
             }
 
-        return request
-            .then((result) => {
             removeAllToasts();
 
             addCollection(result);
@@ -202,14 +207,14 @@
 
             if (isNew) {
                 $activeCollection = result;
+
+                await refreshScaffolds();
             }
-            })
-            .catch((err) => {
+        } catch (err) {
             ApiClient.error(err);
-            })
-            .finally(() => {
+        }
+
         isSaving = false;
-            });
     }
 
     function exportFormData() {