merge v0.23.0-rc changes

ui/src/components/settings/ImportPopup.svelte

@@ -73,9 +73,9 @@
                     deletedFieldNames.push(old.name + ".*");
                 } else {
                     // add only deleted fields
-                    const schema = Array.isArray(old.schema) ? old.schema : [];
-                    for (const field of schema) {
-                        if (!CommonHelper.findByKey(imported.schema, "id", field.id)) {
+                    const fields = Array.isArray(old.fields) ? old.fields : [];
+                    for (const field of fields) {
+                        if (!CommonHelper.findByKey(imported.fields, "id", field.id)) {
                             deletedFieldNames.push(`${old.name}.${field.name} (${field.id})`);
                         }
                     }
@@ -86,11 +86,11 @@
         if (deletedFieldNames.length) {
             confirm(
                 `Do you really want to delete the following collection fields and their related records data:\n- ${deletedFieldNames.join(
-                    "\n- "
+                    "\n- ",
                 )}`,
                 () => {
                     submit();
-                }
+                },
             );
         } else {
             submit();