@firecms/collection_editor 3.0.0-beta.2-pre.2 → 3.0.0-beta.2-pre.4

package/src/ui/collection_editor/properties/validation/StringPropertyValidation.tsx

@@ -1,10 +1,11 @@
 import React from "react";
 
-import { FastField, getIn, useFormikContext } from "formik";
-import { isValidRegExp, serializeRegExp, SwitchControl } from "@firecms/core";
+import { Field, FormexFieldProps, getIn, useFormex } from "@firecms/formex";
+import { serializeRegExp } from "@firecms/core";
 import { DebouncedTextField, } from "@firecms/ui";
 import { GeneralPropertyValidation } from "./GeneralPropertyValidation";
 import { FieldHelperView } from "../FieldHelperView";
+import { SwitchControl } from "../../SwitchControl";
 
 export function StringPropertyValidation({
                                              length,
@@ -32,7 +33,7 @@ export function StringPropertyValidation({
         values,
         handleChange,
         errors
-    } = useFormikContext();
+    } = useFormex();
 
     const validationLength = "validation.length";
     const validationMin = "validation.min";
@@ -47,86 +48,104 @@ export function StringPropertyValidation({
     const matchesValue = getIn(values, validationMatches);
     const matchesStringValue = typeof matchesValue === "string" ? matchesValue : serializeRegExp(matchesValue);
     return (
-            <div className={"grid grid-cols-12 gap-2"}>
-
-                <GeneralPropertyValidation disabled={disabled}/>
-
-                <div className={"grid grid-cols-12 gap-2 col-span-12"}>
-                    {lowercase && <div className={"col-span-4"}>
-                        <FastField type="checkbox"
-                                   name={validationLowercase}
-                                   label={"Lowercase"}
-                                   disabled={disabled}
-                                   component={SwitchControl}/>
-                    </div>}
-                    {uppercase && <div className={"col-span-4"}>
-                        <FastField type="checkbox"
-                                   name={validationUppercase}
-                                   label={"Uppercase"}
-                                   disabled={disabled}
-                                   component={SwitchControl}/>
-                    </div>}
-                    {trim && <div className={"col-span-4"}>
-                        <FastField type="checkbox"
-                                   name={validationTrim}
-                                   label={"Trim"}
-                                   disabled={disabled}
-                                   component={SwitchControl}/>
-                    </div>}
-                </div>
-
-                <div className={"grid grid-cols-12 gap-2 col-span-12"}>
-                    {length && <div className={"col-span-4"}>
-                        <DebouncedTextField
-                            value={getIn(values, validationLength)}
-                            label={"Exact length"}
-                            name={validationLength}
-                            type="number"
-                            size="small"
-
-                            disabled={disabled}
-                            onChange={handleChange}/>
-                    </div>}
-
-                    {min && <div className={"col-span-4"}>
-                        <DebouncedTextField value={getIn(values, validationMin)}
-                                            label={"Min length"}
-                                            name={validationMin}
-                                            type="number"
-                                            size="small"
-
-                                            disabled={disabled}
-                                            onChange={handleChange}/>
-                    </div>}
-
-                    {max && <div className={"col-span-4"}>
-                        <DebouncedTextField value={getIn(values, validationMax)}
-                                            label={"Max length"}
-                                            name={validationMax}
-                                            type="number"
-                                            size="small"
-
-                                            disabled={disabled}
-                                            onChange={handleChange}/>
-                    </div>}
-
-                </div>
-
-                {matches && <div className={"col-span-12"}>
-                    <FastField name={validationMatches}
-                               as={DebouncedTextField}
-                               validate={(value: string) => value && !isValidRegExp(value)}
-                               label={"Matches regex"}
-                               size="small"
-                               disabled={disabled}
-                               value={matchesStringValue}
-                               error={Boolean(matchesError)}/>
-                    <FieldHelperView error={Boolean(matchesError)}>
-                        {matchesError ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only"}
-                    </FieldHelperView>
+        <div className={"grid grid-cols-12 gap-2"}>
+
+            <GeneralPropertyValidation disabled={disabled}/>
+
+            <div className={"grid grid-cols-12 gap-2 col-span-12"}>
+
+                {lowercase && <div className={"col-span-4"}>
+                    <Field name={validationLowercase}
+                           type="checkbox">
+                        {({ field, form }: FormexFieldProps) => {
+                            return <SwitchControl
+                                label={"Lowercase"}
+                                disabled={disabled}
+                                form={form}
+                                field={field}/>
+                        }}
+                    </Field>
+                </div>}
+
+                {uppercase && <div className={"col-span-4"}>
+                    <Field name={validationUppercase}
+                           type="checkbox">
+                        {({ field, form }: FormexFieldProps) => {
+                            return <SwitchControl
+                                label={"Uppercase"}
+                                disabled={disabled}
+                                form={form}
+                                field={field}/>
+                        }}
+                    </Field>
+                </div>}
+
+                {trim && <div className={"col-span-4"}>
+                    <Field name={validationTrim}
+                           type="checkbox">
+                        {({ field, form }: FormexFieldProps) => {
+                            return <SwitchControl
+                                label={"Trim"}
+                                disabled={disabled}
+                                form={form}
+                                field={field}/>
+                        }}
+                    </Field>
                 </div>}
 
             </div>
+
+            <div className={"grid grid-cols-12 gap-2 col-span-12"}>
+                {length && <div className={"col-span-4"}>
+                    <DebouncedTextField
+                        value={getIn(values, validationLength)}
+                        label={"Exact length"}
+                        name={validationLength}
+                        type="number"
+                        size="small"
+
+                        disabled={disabled}
+                        onChange={handleChange}/>
+                </div>}
+
+                {min && <div className={"col-span-4"}>
+                    <DebouncedTextField value={getIn(values, validationMin)}
+                                        label={"Min length"}
+                                        name={validationMin}
+                                        type="number"
+                                        size="small"
+
+                                        disabled={disabled}
+                                        onChange={handleChange}/>
+                </div>}
+
+                {max && <div className={"col-span-4"}>
+                    <DebouncedTextField value={getIn(values, validationMax)}
+                                        label={"Max length"}
+                                        name={validationMax}
+                                        type="number"
+                                        size="small"
+
+                                        disabled={disabled}
+                                        onChange={handleChange}/>
+                </div>}
+
+            </div>
+
+            {matches && <div className={"col-span-12"}>
+                <Field name={validationMatches}
+                       as={DebouncedTextField}
+                       label={"Matches regex"}
+                       size="small"
+                       disabled={disabled}
+                       value={matchesStringValue}
+                       error={Boolean(matchesError)}/>
+                <FieldHelperView error={Boolean(matchesError)}>
+                    {matchesError ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only"}
+                </FieldHelperView>
+            </div>}
+
+        </div>
     );
 
 }

package/src/ui/collection_editor/util.ts

@@ -19,3 +19,10 @@ export function getFullId(propertyKey: string, propertyNamespace?: string): stri
         ? `${propertyNamespace}.${propertyKey}`
         : propertyKey;
 }
+
+export function getFullIdPath(propertyKey: string, propertyNamespace?: string): string {
+    const keyWithNamespace = propertyNamespace
+        ? `${propertyNamespace}.${propertyKey}`
+        : propertyKey;
+    return idToPropertiesPath(keyWithNamespace);
+}

package/src/ui/collection_editor/utils/strings.ts

@@ -1,6 +1,7 @@
 export function camelCase(str: string): string {
+    if (!str) return "";
     return (str.slice(0, 1).toLowerCase() + str.slice(1))
-        .replace(/([-_ ]){1,}/g, ' ')
+        .replace(/([-_ ]){1,}/g, " ")
         .split(/[-_ ]/)
         .reduce((cur, acc) => {
             return cur + acc[0].toUpperCase() + acc.substring(1);

package/src/useCollectionEditorPlugin.tsx

@@ -86,27 +86,12 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
      onAnalyticsEvent
  }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection> {
 
-    const injectCollections = (baseCollections: EntityCollection[]) => {
-
-        const markAsEditable = (c: PersistedCollection) => {
-            makePropertiesEditable(c.properties as Properties);
-            c.subcollections?.forEach(markAsEditable);
-        };
-        const storedCollections = collectionConfigController.collections ?? [];
-        storedCollections.forEach(markAsEditable);
-
-        console.debug("Collections specified in code:", baseCollections);
-        console.debug("Collections stored in the backend", storedCollections);
-        const result = joinCollectionLists(baseCollections, storedCollections, [], modifyCollection);
-        console.debug("Collections after joining:", result);
-        return result;
-    };
+
 
     return {
         name: "Collection Editor",
         loading: collectionConfigController.loading,
         collections: {
-            injectCollections,
             CollectionActions: EditorCollectionAction
         },
         provider: {