@firecms/collection_editor 3.0.0-canary.178 → 3.0.0-canary.179

package/dist/ui/collection_editor/CollectionDetailsForm.d.ts

@@ -1,5 +1,6 @@
+import React from "react";
 import { EntityCollection } from "@firecms/core";
-export declare function CollectionDetailsForm({ isNewCollection, reservedGroups, existingPaths, existingIds, groups, parentCollection }: {
+export declare function CollectionDetailsForm({ isNewCollection, reservedGroups, existingPaths, existingIds, groups, parentCollection, children }: {
     isNewCollection: boolean;
     reservedGroups?: string[];
     existingPaths?: string[];
@@ -7,4 +8,5 @@ export declare function CollectionDetailsForm({ isNewCollection, reservedGroups,
     groups: string[] | null;
     parentCollection?: EntityCollection;
     parentCollectionIds?: string[];
+    children?: React.ReactNode;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/utils/collections.d.ts

@@ -3,4 +3,4 @@ import { PersistedCollection } from "../types/persisted_collection";
 /**
  * Function in charge of merging collections defined in code with those stored in the backend.
  */
-export declare const mergeCollections: (baseCollections: EntityCollection[], backendCollections: PersistedCollection[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void) => EntityCollection<any, any>[];
+export declare const mergeCollections: (baseCollections: EntityCollection[], backendCollections?: PersistedCollection[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void) => EntityCollection<any, any>[];

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-canary.178",
+  "version": "3.0.0-canary.179",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_export": "^3.0.0-canary.178",
-    "@firecms/data_import": "^3.0.0-canary.178",
-    "@firecms/data_import_export": "^3.0.0-canary.178",
-    "@firecms/formex": "^3.0.0-canary.178",
-    "@firecms/schema_inference": "^3.0.0-canary.178",
-    "@firecms/ui": "^3.0.0-canary.178",
+    "@firecms/data_export": "^3.0.0-canary.179",
+    "@firecms/data_import": "^3.0.0-canary.179",
+    "@firecms/data_import_export": "^3.0.0-canary.179",
+    "@firecms/formex": "^3.0.0-canary.179",
+    "@firecms/schema_inference": "^3.0.0-canary.179",
+    "@firecms/ui": "^3.0.0-canary.179",
     "@hello-pangea/dnd": "^17.0.0",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.1"
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "87cb7b5b305fbcca1223aa8e3a62d6eee0f3570d"
+  "gitHead": "39125fe4c1a15167d203baee64f2bbd5376eb766"
 }

package/src/ui/collection_editor/CollectionDetailsForm.tsx

@@ -31,7 +31,8 @@ export function CollectionDetailsForm({
                                           existingPaths,
                                           existingIds,
                                           groups,
-                                          parentCollection
+                                          parentCollection,
+                                          children
                                       }: {
     isNewCollection: boolean,
     reservedGroups?: string[];
@@ -40,6 +41,7 @@ export function CollectionDetailsForm({
     groups: string[] | null;
     parentCollection?: EntityCollection;
     parentCollectionIds?: string[];
+    children?: React.ReactNode;
 }) {
 
     const groupRef = React.useRef<HTMLInputElement>(null);
@@ -390,9 +392,13 @@ export function CollectionDetailsForm({
                                         for large collections, as it may incur in performance and cost issues.
                                     </FieldCaption>
                                 </div>
+
+
                             </div>
                         </ExpandablePanel>
 
+                        {children}
+
                     </div>
 
                 </div>

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 import { useEffect, useRef, useState } from "react";
 import {
     CircularProgressCenter,
+    ConfirmationDialog,
     Entity,
     EntityCollection,
     ErrorView,
@@ -37,7 +38,8 @@ import {
     IconButton,
     LoadingButton,
     Tab,
-    Tabs
+    Tabs,
+    Typography
 } from "@firecms/ui";
 import { YupSchema } from "./CollectionYupValidation";
 import { CollectionDetailsForm } from "./CollectionDetailsForm";
@@ -533,8 +535,24 @@ function CollectionEditorInternal<M extends Record<string, any>>({
     };
 
     const editable = collection?.editable === undefined || collection?.editable === true;
+    // @ts-ignore
+    const isMergedCollection = collection?.merged ?? false;
     const collectionEditable = editable || isNewCollection;
 
+    const [deleteRequested, setDeleteRequested] = useState(false);
+
+    const deleteCollection = () => {
+        if (!collection) return;
+        configController?.deleteCollection({ id: collection.id }).then(() => {
+            setDeleteRequested(false);
+            handleCancel();
+            snackbarController.open({
+                message: "Collection deleted",
+                type: "success"
+            });
+        });
+    };
+
     return <DialogContent fullHeight={true}>
         <Formex value={formController}>
 
@@ -614,7 +632,18 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                             groups={groups}
                             parentCollectionIds={parentCollectionIds}
                             parentCollection={parentCollection}
-                            isNewCollection={isNewCollection}/>}
+                            isNewCollection={isNewCollection}>
+                            {!isNewCollection && isMergedCollection && <div className={"flex flex-col gap-4 mt-8"}>
+                                <Typography variant={"body2"} color={"secondary"}>This collection is defined in code.
+                                    The changes done in this editor will override the properties defined in code.
+                                    You can delete the overridden values to revert to the state defined in code.
+                                </Typography>
+                                <Button variant={"neutral"}
+                                        onClick={() => {
+                                            setDeleteRequested(true);
+                                        }}>Reset to code</Button>
+                            </div>}
+                        </CollectionDetailsForm>}
 
                     {currentView === "subcollections" && collection &&
                         <SubcollectionsEditTab
@@ -748,6 +777,15 @@ function CollectionEditorInternal<M extends Record<string, any>>({
 
         </Formex>
 
+        <ConfirmationDialog
+            open={deleteRequested}
+            onAccept={deleteCollection}
+            onCancel={() => setDeleteRequested(false)}
+            title={<>Delete the stored config?</>}
+            body={<> This will <b>not
+                delete any data</b>, only
+                the stored config, and reset to the code state.</>}/>
+
     </DialogContent>
 
 }

package/src/ui/collection_editor/LayoutModeSwitch.tsx

@@ -49,5 +49,6 @@ export function LayoutModeSwitch({
             </Tooltip>
 
         </div>
+        <Typography variant={"caption"} color={"secondary"} className={"ml-3.5"}>Should documents be opened full screen or in an inline side dialog</Typography>
     </div>
 }

package/src/utils/collections.ts

@@ -11,7 +11,7 @@ import { PersistedCollection } from "../types/persisted_collection";
  * Function in charge of merging collections defined in code with those stored in the backend.
  */
 export const mergeCollections = (baseCollections: EntityCollection[],
-                                 backendCollections: PersistedCollection[],
+                                 backendCollections: PersistedCollection[] = [],
                                  modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
 ) => {
 
@@ -19,16 +19,18 @@ export const mergeCollections = (baseCollections: EntityCollection[],
         makePropertiesEditable(c.properties as Properties);
         c.subcollections?.forEach(markAsEditable);
     };
-    const storedCollections = backendCollections ?? [];
-    storedCollections.forEach(markAsEditable);
 
-    console.debug("Collections specified in code:", baseCollections);
-    console.debug("Collections stored in the backend", storedCollections);
-    const result = joinCollectionLists(baseCollections, storedCollections, [], modifyCollection);
+    backendCollections.forEach(markAsEditable);
+
+    const result = joinCollectionLists(baseCollections, backendCollections, [], modifyCollection);
 
     // sort the collections so they are in the same order as the base collections
     result.sort((a, b) => baseCollections.findIndex(c => c.id === a.id) - baseCollections.findIndex(c => c.id === b.id));
+    console.debug("Collections result", {
+        baseCollections,
+        backendCollections,
+        result
+    });
 
-    console.debug("Collections after joining:", result);
     return result;
 }