@firecms/collection_editor 3.0.0 → 3.0.1

package/dist/types/config_controller.d.ts

@@ -1,5 +1,9 @@
 import { CMSType, NavigationGroupMapping, Property } from "@firecms/core";
 import { PersistedCollection } from "./persisted_collection";
+export interface CollectionsSetupInfo {
+    status: "ongoing" | "complete";
+    error: string | null;
+}
 /**
  * Use this controller to access the configuration that is stored externally,
  * and not defined in code.
@@ -7,6 +11,11 @@ import { PersistedCollection } from "./persisted_collection";
 export interface CollectionsConfigController {
     loading: boolean;
     collections?: PersistedCollection[];
+    /**
+     * Status information about the automatic collections setup process.
+     * Stored in the project config document at `collectionsSetup`.
+     */
+    collectionsSetup?: CollectionsSetupInfo;
     getCollection: (id: string) => PersistedCollection;
     saveCollection: <M extends {
         [Key: string]: CMSType;

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "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",
-    "@firecms/data_import": "^3.0.0",
-    "@firecms/data_import_export": "^3.0.0",
-    "@firecms/formex": "^3.0.0",
-    "@firecms/schema_inference": "^3.0.0",
-    "@firecms/ui": "^3.0.0",
+    "@firecms/data_export": "^3.0.1",
+    "@firecms/data_import": "^3.0.1",
+    "@firecms/data_import_export": "^3.0.1",
+    "@firecms/formex": "^3.0.1",
+    "@firecms/schema_inference": "^3.0.1",
+    "@firecms/ui": "^3.0.1",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.1"
   },
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d106a7fde537c4330ae4ba5471c74d4536dea710"
+  "gitHead": "72d951d01d15ef5a7efcde6c63839f65964d2f7a"
 }

package/src/index.ts

@@ -15,7 +15,7 @@ export {
 export * from "./utils/collections";
 
 export type {
-    CollectionsConfigController, DeleteCollectionParams, SaveCollectionParams, UpdateCollectionParams
+    CollectionsConfigController, DeleteCollectionParams, SaveCollectionParams, UpdateCollectionParams, CollectionsSetupInfo
 } from "./types/config_controller";
 export type {
     CollectionEditorController

package/src/types/config_controller.tsx

@@ -1,6 +1,11 @@
 import { CMSType, NavigationGroupMapping, Property } from "@firecms/core";
 import { PersistedCollection } from "./persisted_collection";
 
+export interface CollectionsSetupInfo {
+    status: "ongoing" | "complete";
+    error: string | null;
+}
+
 /**
  * Use this controller to access the configuration that is stored externally,
  * and not defined in code.
@@ -11,6 +16,12 @@ export interface CollectionsConfigController {
 
     collections?: PersistedCollection[];
 
+    /**
+     * Status information about the automatic collections setup process.
+     * Stored in the project config document at `collectionsSetup`.
+     */
+    collectionsSetup?: CollectionsSetupInfo;
+
     getCollection: (id: string) => PersistedCollection;
 
     saveCollection: <M extends { [Key: string]: CMSType }>(params: SaveCollectionParams<M>) => Promise<void>;

package/src/ui/collection_editor/CollectionDetailsForm.tsx

@@ -165,7 +165,6 @@ export function CollectionDetailsForm({
                         <Field name={"path"}
                                as={DebouncedTextField}
                                label={"Path"}
-                               disabled={!isNewCollection}
                                required
                                error={showErrors && Boolean(errors.path)}/>
 

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -693,32 +693,26 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                         {isNewCollection && includeTemplates && currentView === "import_data_mapping" &&
                             <Button variant={"text"}
                                     type="button"
-                                    color={"primary"}
                                     onClick={() => {
                                         importConfig.setInUse(false);
                                         return setCurrentView("welcome");
                                     }}>
-                                <ArrowBackIcon/>
                                 Back
                             </Button>}
 
                         {isNewCollection && includeTemplates && currentView === "import_data_preview" &&
                             <Button variant={"text"}
                                     type="button"
-                                    color={"primary"}
                                     onClick={() => {
                                         setCurrentView("import_data_mapping");
                                     }}>
-                                <ArrowBackIcon/>
                                 Back
                             </Button>}
 
                         {isNewCollection && includeTemplates && currentView === "details" &&
                             <Button variant={"text"}
-                                    color={"neutral"}
                                     type="button"
                                     onClick={() => setCurrentView("welcome")}>
-                                <ArrowBackIcon/>
                                 Back
                             </Button>}
 

package/src/ui/collection_editor/properties/ReferencePropertyField.tsx

@@ -41,7 +41,7 @@ export function ReferencePropertyField({
                 <Field name={pathPath}
                        pathPath={pathPath}
                        type="select"
-                       disabled={(existing && Boolean(pathValue)) || disabled}
+                       disabled={disabled}
                        value={pathValue}
                        error={pathError}
                        handleChange={handleChange}
@@ -155,10 +155,6 @@ export function CollectionsSelect({
 
             </Select>
 
-            <FieldCaption>
-                You can only edit the reference collection upon field
-                creation.
-            </FieldCaption>
         </>
     );
 }

package/src/ui/collection_editor/properties/StoragePropertyField.tsx

@@ -48,6 +48,7 @@ export function StoragePropertyField({
     const maxSize = `${baseStoragePath}.maxSize`;
     const storagePath = `${baseStoragePath}.storagePath`;
     const storeUrl = `${baseStoragePath}.storeUrl`;
+    const includeBucketUrl = `${baseStoragePath}.includeBucketUrl`;
 
     // Image resize config paths
     const imageResize = `${baseStoragePath}.imageResize`;
@@ -169,6 +170,26 @@ export function StoragePropertyField({
                                 </ul>
                             </Typography>
 
+                            <Field name={includeBucketUrl}
+                                   type="checkbox">
+                                {({
+                                      field,
+                                      form
+                                  }: FormexFieldProps) => {
+                                    return <SwitchControl
+                                        label={"Include bucket URL (gs://...) in saved value"}
+                                        disabled={existing || disabled}
+                                        form={form}
+                                        field={field}/>;
+                                }}
+                            </Field>
+
+                            <Typography variant={"caption"} className={"ml-3.5 mt-1 mb-2"}>
+                                Turn this setting on if you want to save a fully-qualified storage URL
+                                (e.g. <code>gs://my-bucket/path/to/file</code>) instead of just the storage path.
+                                You can only change this prop upon creation.
+                            </Typography>
+
                             <Field name={storeUrl}
                                    type="checkbox">
                                 {({
@@ -179,7 +200,7 @@ export function StoragePropertyField({
                                         label={"Save URL instead of storage path"}
                                         disabled={existing || disabled}
                                         form={form}
-                                        field={field}/>
+                                        field={field}/>;
                                 }}
                             </Field>