@firecms/core 3.0.0-alpha.32 → 3.0.0-alpha.34

package/dist/types/collections.d.ts

@@ -324,7 +324,7 @@ export interface AdditionalFieldDelegate<M extends Record<string, any> = any, Us
      * ID of this column. You can use this id in the `properties` field of the
      * collection in any order you want
      */
-    id: string;
+    key: string;
     /**
      * Header of this column
      */
@@ -346,6 +346,17 @@ export interface AdditionalFieldDelegate<M extends Record<string, any> = any, Us
      * it will be updated in every render.
      */
     dependencies?: Extract<keyof M, string>[];
+    /**
+     * Use this prop to define the value of the column as a string or number.
+     * This is the value that will be used for exporting the collection.
+     * If `Builder` is defined, this prop will be ignored in the collection
+     * view.
+     * @param entity
+     */
+    value?: (props: {
+        entity: Entity<M>;
+        context: FireCMSContext;
+    }) => string | number | Promise<string | number> | undefined;
 }
 /**
  * You can use this builder to render a custom panel in the entity detail view.

package/dist/types/firecms.d.ts

@@ -22,7 +22,7 @@ import { CMSAnalyticsEvent } from "./analytics";
  * APIs directly, or a REST API.
  * @category Models
  */
-export type EntityCollectionsBuilder<EC extends EntityCollection> = (params: {
+export type EntityCollectionsBuilder<EC extends EntityCollection = EntityCollection> = (params: {
     user: User | null;
     authController: AuthController;
     dataSource: DataSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/core",
-  "version": "3.0.0-alpha.32",
+  "version": "3.0.0-alpha.34",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -133,7 +133,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "f545e3572aa7f025222713984025288bf62b0d4c",
+  "gitHead": "97fea385cfd4a0ab9301d45d50e1d145021c1df5",
   "publishConfig": {
     "access": "public"
   }

package/src/core/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -95,7 +95,6 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
                  setFilterValues,
                  sortBy,
                  setSortBy,
-                 searchString,
                  setSearchString,
                  clearFilter,
                  itemCount,
@@ -159,7 +158,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
         const additionalFieldsMap: Record<string, AdditionalFieldDelegate<M, UserType>> = useMemo(() => {
             return (additionalFields
                 ? additionalFields
-                    .map((aC) => ({ [aC.id]: aC as AdditionalFieldDelegate<M, any> }))
+                    .map((aC) => ({ [aC.key]: aC as AdditionalFieldDelegate<M, any> }))
                     .reduce((a, b) => ({ ...a, ...b }), {})
                 : {}) as Record<string, AdditionalFieldDelegate<M, UserType>>;
         }, [additionalFields]);
@@ -252,10 +251,14 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
                 : entity;
 
             const Builder = additionalField.Builder;
-            if (!Builder) {
-                throw new Error("No builder provided for additional field");
+            if (!Builder && !additionalField.value) {
+                throw new Error("When using additional fields you need to provide a Builder or a value");
             }
 
+            const child = Builder
+                ? <Builder entity={entity} context={context}/>
+                : <>{additionalField.value?.({ entity, context })}</>;
+
             return (
                 <EntityTableCell
                     key={`additional_table_cell_${entity.id}_${column.key}`}
@@ -270,8 +273,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
                     disabledTooltip={"This column can't be edited directly"}
                 >
                     <ErrorBoundary>
-                        <Builder entity={entity}
-                                 context={context}/>
+                        {child}
                     </ErrorBoundary>
                 </EntityTableCell>
             );
@@ -311,7 +313,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
                 const additionalTableColumns: VirtualTableColumn[] = additionalFields
                     ? additionalFields.map((additionalField) =>
                         ({
-                            key: additionalField.id,
+                            key: additionalField.key,
                             align: "left",
                             sortable: false,
                             title: additionalField.name,

package/src/core/components/EntityCollectionView/EntityCollectionView.tsx

@@ -353,7 +353,7 @@ export const EntityCollectionView = React.memo(
         const additionalFields = useMemo(() => {
             const subcollectionColumns: AdditionalFieldDelegate<M, any>[] = collection.subcollections?.map((subcollection) => {
                 return {
-                    id: getSubcollectionColumnId(subcollection),
+                    key: getSubcollectionColumnId(subcollection),
                     name: subcollection.name,
                     width: 200,
                     dependencies: [],
@@ -379,7 +379,7 @@ export const EntityCollectionView = React.memo(
 
             const collectionGroupParentCollections: AdditionalFieldDelegate<M, any>[] = collection.collectionGroup
                 ? [{
-                    id: COLLECTION_GROUP_PARENT_ID,
+                    key: COLLECTION_GROUP_PARENT_ID,
                     name: "Parent entities",
                     width: 260,
                     dependencies: [],

package/src/core/components/EntityCollectionView/useColumnsIds.tsx

@@ -31,7 +31,7 @@ function hideAndExpandKeys<M extends Record<string, any>>(collection: ResolvedEn
             }];
         }
 
-        const additionalField = collection.additionalFields?.find(field => field.id === key);
+        const additionalField = collection.additionalFields?.find(field => field.key === key);
         if (additionalField) {
             return [{
                 key,
@@ -68,7 +68,7 @@ function getDefaultColumnKeys<M extends Record<string, any> = any>(collection: R
 
     const columnIds: string[] = [
         ...propertyKeys,
-        ...additionalFields.map((field) => field.id)
+        ...additionalFields.map((field) => field.key)
     ];
 
     if (includeSubCollections) {

package/src/core/util/property_utils.tsx

@@ -126,5 +126,5 @@ export function getPropertiesWithPropertiesOrder<M extends Record<string, any>>(
 
 export function getDefaultPropertiesOrder(collection: EntityCollection<any>): string[] {
     if (collection.propertiesOrder) return collection.propertiesOrder;
-    return [...Object.keys(collection.properties), ...(collection.additionalFields ?? []).map(field => field.id)];
+    return [...Object.keys(collection.properties), ...(collection.additionalFields ?? []).map(field => field.key)];
 }

package/src/types/collections.ts

@@ -387,7 +387,7 @@ export interface AdditionalFieldDelegate<M extends Record<string, any> = any,
      * ID of this column. You can use this id in the `properties` field of the
      * collection in any order you want
      */
-    id: string;
+    key: string;
 
     /**
      * Header of this column
@@ -413,6 +413,15 @@ export interface AdditionalFieldDelegate<M extends Record<string, any> = any,
      * it will be updated in every render.
      */
     dependencies?: Extract<keyof M, string>[];
+
+    /**
+     * Use this prop to define the value of the column as a string or number.
+     * This is the value that will be used for exporting the collection.
+     * If `Builder` is defined, this prop will be ignored in the collection
+     * view.
+     * @param entity
+     */
+    value?: (props: { entity: Entity<M>, context: FireCMSContext }) => string | number | Promise<string | number> | undefined;
 }
 
 /**

package/src/types/firecms.tsx

@@ -23,7 +23,7 @@ import { CMSAnalyticsEvent } from "./analytics";
  * APIs directly, or a REST API.
  * @category Models
  */
-export type EntityCollectionsBuilder<EC extends EntityCollection> = (params: {
+export type EntityCollectionsBuilder<EC extends EntityCollection = EntityCollection> = (params: {
     user: User | null,
     authController: AuthController,
     dataSource: DataSource