@firecms/collection_editor 3.0.0-canary.29 → 3.0.0-canary.290

package/src/utils/collections.ts

@@ -0,0 +1,45 @@
+import {
+    EntityCollection,
+    joinCollectionLists,
+    makePropertiesEditable,
+    ModifyCollectionProps,
+    Properties
+} from "@firecms/core";
+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[] = [],
+                                 modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
+) => {
+
+    const markAsEditable = (c: PersistedCollection) => {
+        makePropertiesEditable(c.properties as Properties);
+        c.subcollections?.forEach(markAsEditable);
+    };
+
+    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) => {
+        const indexA = baseCollections.findIndex(c => c.id === a.id);
+        const indexB = baseCollections.findIndex(c => c.id === b.id);
+
+        if (indexA === -1 && indexB === -1) {
+            return 0; // Keep original order for items not in baseCollections
+        }
+        if (indexA === -1) {
+            return 1; // a is not in base, so it goes to the end
+        }
+        if (indexB === -1) {
+            return -1; // b is not in base, so it goes to the end
+        }
+        return indexA - indexB;
+    });
+
+    return result;
+}

package/src/utils/entities.ts

@@ -1,17 +1,14 @@
 import { isPropertyBuilder, Properties, PropertiesOrBuilders, Property, PropertyOrBuilder } from "@firecms/core";
 
-export function editableProperty(property: PropertyOrBuilder | PropertyOrBuilder): boolean {
-    if (isPropertyBuilder(property))
+export function editableProperty(property: PropertyOrBuilder): boolean {
+    if (isPropertyBuilder(property)) {
         return false;
-    if (isPropertyBuilder(property as PropertyOrBuilder))
-        return false;
-    else {
-        const eProperty = property as Property;
-        if (eProperty.dataType === "array" && typeof eProperty.of === "function")
+    } else {
+        if (property.dataType === "array" && typeof property.of === "function")
             return false;
-        else if (eProperty.dataType === "array" && Array.isArray(eProperty.of))
+        else if (property.dataType === "array" && Array.isArray(property.of))
             return false;
-        return Boolean(eProperty.editable);
+        return property.editable === undefined ? true : Boolean(property.editable);
     }
 }
 

package/dist/ui/RootCollectionSuggestions.d.ts

@@ -1,3 +0,0 @@
-export declare function RootCollectionSuggestions({ introMode }: {
-    introMode?: "new_project" | "existing_project";
-}): import("react/jsx-runtime").JSX.Element;

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

@@ -1,8 +0,0 @@
-import { PropertyConfig } from "@firecms/core";
-export interface PropertySelectItemProps {
-    value: string;
-    optionDisabled: boolean;
-    propertyConfig: PropertyConfig;
-    existing: boolean;
-}
-export declare function PropertySelectItem({ value, optionDisabled, propertyConfig, existing }: PropertySelectItemProps): import("react/jsx-runtime").JSX.Element;

package/src/ui/RootCollectionSuggestions.tsx

@@ -1,63 +0,0 @@
-import { unslugify, useAuthController, useNavigationController } from "@firecms/core";
-import { AddIcon, Chip, CircularProgress, Collapse, Typography, } from "@firecms/ui";
-import { useCollectionEditorController } from "../useCollectionEditorController";
-import React from "react";
-
-export function RootCollectionSuggestions({ introMode }: { introMode?: "new_project" | "existing_project" }) {
-
-    const authController = useAuthController();
-    const navigationController = useNavigationController();
-
-    const collectionEditorController = useCollectionEditorController();
-    const canCreateCollections = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user
-        }).createCollections
-        : true;
-
-    const rootPathSuggestions = collectionEditorController.rootPathSuggestions;
-
-    const showSuggestions = (rootPathSuggestions ?? []).length > 3 || ((navigationController.collections ?? []).length === 0 && (rootPathSuggestions ?? []).length > 0);
-    const forceShowSuggestions = introMode === "existing_project";
-    return <Collapse
-        in={forceShowSuggestions || showSuggestions}>
-
-        <div
-            className={"flex flex-col gap-1 p-2 my-4"}>
-
-            {!introMode && <Typography variant={"body2"} color={"secondary"}>
-                Create a collection <b>automatically</b> from your data:
-            </Typography>}
-
-            {introMode === "existing_project" && <Typography>
-                You will see your <b>database collections</b> here, a few seconds after project creation
-            </Typography>}
-
-            <div
-                className={"flex flex-row gap-1 overflow-scroll no-scrollbar "}>
-                {(rootPathSuggestions ?? []).map((path) => {
-                    return (
-                        <div key={path}>
-                            <Chip
-                                icon={<AddIcon size={"small"}/>}
-                                colorScheme={"cyanLighter"}
-                                onClick={collectionEditorController && canCreateCollections
-                                    ? () => collectionEditorController.createCollection({
-                                        initialValues: { path, name: unslugify(path) },
-                                        parentCollectionIds: [],
-                                        redirect: true,
-                                        sourceClick: "root_collection_suggestion"
-                                    })
-                                    : undefined}
-                                size="small">
-                                {path}
-                            </Chip>
-                        </div>
-                    );
-                })}
-                {rootPathSuggestions === undefined && <CircularProgress size={"small"}/>}
-                {rootPathSuggestions?.length === 0 && <Typography variant={"caption"}>No suggestions</Typography>}
-            </div>
-        </div>
-    </Collapse>
-}

package/src/ui/collection_editor/PropertySelectItem.tsx

@@ -1,32 +0,0 @@
-import { PropertyConfigBadge, PropertyConfig } from "@firecms/core";
-import { cn, SelectItem, Typography } from "@firecms/ui";
-
-export interface PropertySelectItemProps {
-    value: string;
-    optionDisabled: boolean;
-    propertyConfig: PropertyConfig;
-    existing: boolean;
-}
-
-export function PropertySelectItem({ value, optionDisabled, propertyConfig, existing }: PropertySelectItemProps) {
-    return <SelectItem value={value}
-                       disabled={optionDisabled}
-                       className={"flex flex-row items-center"}>
-        <div
-            className={cn(
-                "flex flex-row items-center text-base min-h-[52px]",
-                optionDisabled ? "w-full" : "")}>
-            <div className={"mr-8"}>
-                <PropertyConfigBadge propertyConfig={propertyConfig}/>
-            </div>
-            <div>
-                <div>{propertyConfig.name}</div>
-                <Typography variant={"caption"}
-                            color={"disabled"}
-                            className={"max-w-sm"}>
-                    {existing && optionDisabled ? "You can only switch to widgets that use the same data type" : propertyConfig.description}
-                </Typography>
-            </div>
-        </div>
-    </SelectItem>
-}