@firecms/core 3.0.0-beta.2 → 3.0.0-canary.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/components/EntityCollectionTable/EntityCollectionRowActions.d.ts +2 -6
  2. package/dist/index.es.js +810 -805
  3. package/dist/index.es.js.map +1 -1
  4. package/dist/index.umd.js +5 -5
  5. package/dist/index.umd.js.map +1 -1
  6. package/package.json +4 -4
  7. package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx +33 -36
  8. package/src/components/EntityCollectionTable/EntityCollectionTable.tsx +36 -38
  9. package/src/components/EntityCollectionView/EntityCollectionView.tsx +9 -9
  10. package/src/hooks/useBuildNavigationController.tsx +26 -6
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@firecms/core",
3
3
  "type": "module",
4
- "version": "3.0.0-beta.2",
4
+ "version": "3.0.0-canary.0",
5
5
  "description": "Awesome Firebase/Firestore-based headless open-source CMS",
6
6
  "funding": {
7
7
  "url": "https://github.com/sponsors/firecmsco"
@@ -38,8 +38,8 @@
38
38
  "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
39
39
  },
40
40
  "dependencies": {
41
- "@firecms/formex": "^3.0.0-beta.2",
42
- "@firecms/ui": "^3.0.0-beta.2",
41
+ "@firecms/formex": "^3.0.0-canary.0",
42
+ "@firecms/ui": "^3.0.0-canary.0",
43
43
  "@fontsource/ibm-plex-mono": "^5.0.8",
44
44
  "@fontsource/roboto": "^5.0.8",
45
45
  "@hello-pangea/dnd": "^16.5.0",
@@ -107,7 +107,7 @@
107
107
  "dist",
108
108
  "src"
109
109
  ],
110
- "gitHead": "9c3561bc09311f2339bb6fa224c88a62d3b19617",
110
+ "gitHead": "165080f8a46d85fef75ce4e4cd3e7f38b80d59d5",
111
111
  "publishConfig": {
112
112
  "access": "public"
113
113
  }
package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx CHANGED
@@ -14,46 +14,43 @@ import { useFireCMSContext, useLargeLayout } from "../../hooks";
14
14
  * @param selectionEnabled
15
15
  * @param size
16
16
  * @param toggleEntitySelection
17
- * @param onCopyClicked
18
- * @param onEditClicked
19
- * @param onDeleteClicked
20
17
  * @param hideId
21
18
  * @constructor
22
19
  *
23
20
  * @group Collection components
24
21
  */
25
- export const EntityCollectionRowActions = React.memo(function EntityCollectionRowActions({
26
- entity,
27
- collection,
28
- fullPath,
29
- width,
30
- frozen,
31
- isSelected,
32
- selectionEnabled,
33
- size,
34
- highlightEntity,
35
- onCollectionChange,
36
- unhighlightEntity,
37
- actions = [],
38
- hideId,
39
- selectionController,
40
- }:
41
- {
42
- entity: Entity<any>,
43
- collection?: EntityCollection<any>,
44
- fullPath?: string,
45
- width: number,
46
- frozen?: boolean,
47
- size: CollectionSize,
48
- isSelected?: boolean,
49
- selectionEnabled?: boolean,
50
- actions?: EntityAction[],
51
- hideId?: boolean,
52
- onCollectionChange?: () => void,
53
- selectionController?: SelectionController;
54
- highlightEntity?: (entity: Entity<any>) => void;
55
- unhighlightEntity?: (entity: Entity<any>) => void;
56
- }) {
22
+ export const EntityCollectionRowActions = function EntityCollectionRowActions({
23
+ entity,
24
+ collection,
25
+ fullPath,
26
+ width,
27
+ frozen,
28
+ isSelected,
29
+ selectionEnabled,
30
+ size,
31
+ highlightEntity,
32
+ onCollectionChange,
33
+ unhighlightEntity,
34
+ actions = [],
35
+ hideId,
36
+ selectionController,
37
+ }:
38
+ {
39
+ entity: Entity<any>,
40
+ collection?: EntityCollection<any>,
41
+ fullPath?: string,
42
+ width: number,
43
+ frozen?: boolean,
44
+ size: CollectionSize,
45
+ isSelected?: boolean,
46
+ selectionEnabled?: boolean,
47
+ actions?: EntityAction[],
48
+ hideId?: boolean,
49
+ onCollectionChange?: () => void,
50
+ selectionController?: SelectionController;
51
+ highlightEntity?: (entity: Entity<any>) => void;
52
+ unhighlightEntity?: (entity: Entity<any>) => void;
53
+ }) {
57
54
 
58
55
  const largeLayout = useLargeLayout();
59
56
 
@@ -171,4 +168,4 @@ export const EntityCollectionRowActions = React.memo(function EntityCollectionRo
171
168
  </div>
172
169
  );
173
170
 
174
- }, equal);
171
+ };
package/src/components/EntityCollectionTable/EntityCollectionTable.tsx CHANGED
@@ -1,4 +1,4 @@
1
- import React, { useCallback, useContext, useMemo, useRef } from "react";
1
+ import React, { useCallback, useMemo, useRef } from "react";
2
2
  import equal from "react-fast-compare";
3
3
  import { AdditionalFieldDelegate, CollectionSize, Entity, FireCMSContext, User } from "../../types";
4
4
  import { PropertyTableCell } from "./PropertyTableCell";
@@ -8,7 +8,6 @@ import { CellRendererParams, VirtualTableColumn } from "../VirtualTable";
8
8
  import { getValueInPath } from "../../util";
9
9
  import { getRowHeight } from "../VirtualTable/common";
10
10
  import { EntityCollectionRowActions } from "./EntityCollectionRowActions";
11
- import { EntityCollectionTableController } from "../common/types";
12
11
  import { CollectionTableToolbar } from "./internal/CollectionTableToolbar";
13
12
  import { EntityCollectionTableProps } from "./EntityCollectionTableProps";
14
13
  import { EntityTableCell } from "./internal/EntityTableCell";
@@ -111,12 +110,12 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
111
110
 
112
111
  const customFieldValidator: CustomFieldValidator | undefined = uniqueFieldValidator;
113
112
 
114
- const propertyCellRenderer = useCallback(({
115
- column,
116
- columnIndex,
117
- rowData,
118
- rowIndex
119
- }: CellRendererParams<any>) => {
113
+ const propertyCellRenderer = ({
114
+ column,
115
+ columnIndex,
116
+ rowData,
117
+ rowIndex
118
+ }: CellRendererParams<any>) => {
120
119
 
121
120
  const entity: Entity<M> = rowData;
122
121
 
@@ -158,7 +157,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
158
157
  }
159
158
  </ErrorBoundary>);
160
159
 
161
- }, [inlineEditing, size, selectedEntityIds]);
160
+ };
162
161
 
163
162
  const additionalCellRenderer = useCallback(({
164
163
  column,
@@ -205,30 +204,29 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
205
204
 
206
205
  }, [size, selectedEntityIds]);
207
206
 
208
- const collectionColumns: VirtualTableColumn[] = useMemo(() => {
209
- const columnsResult: VirtualTableColumn[] = propertiesToColumns({
210
- properties,
211
- sortable,
212
- forceFilter,
213
- disabledFilter: disabledFilterChange,
214
- AdditionalHeaderWidget
215
- });
216
-
217
- const additionalTableColumns: VirtualTableColumn[] = additionalFields
218
- ? additionalFields.map((additionalField) =>
219
- ({
220
- key: additionalField.key,
221
- align: "left",
222
- sortable: false,
223
- title: additionalField.name,
224
- width: additionalField.width ?? 200
225
- }))
226
- : [];
227
- return [...columnsResult, ...additionalTableColumns];
228
- },
229
- [additionalFields, disabledFilterChange, forceFilter, properties, sortable]);
230
-
231
- const idColumn: VirtualTableColumn = useMemo(() => ({
207
+ const collectionColumns: VirtualTableColumn[] = (() => {
208
+ const columnsResult: VirtualTableColumn[] = propertiesToColumns({
209
+ properties,
210
+ sortable,
211
+ forceFilter,
212
+ disabledFilter: disabledFilterChange,
213
+ AdditionalHeaderWidget
214
+ });
215
+
216
+ const additionalTableColumns: VirtualTableColumn[] = additionalFields
217
+ ? additionalFields.map((additionalField) =>
218
+ ({
219
+ key: additionalField.key,
220
+ align: "left",
221
+ sortable: false,
222
+ title: additionalField.name,
223
+ width: additionalField.width ?? 200
224
+ }))
225
+ : [];
226
+ return [...columnsResult, ...additionalTableColumns];
227
+ })();
228
+
229
+ const idColumn: VirtualTableColumn = {
232
230
  key: "id_ewcfedcswdf3",
233
231
  width: getIdColumnWidth?.() ?? (largeLayout ? 160 : 130),
234
232
  title: "ID",
@@ -237,17 +235,17 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
237
235
  headerAlign: "center",
238
236
  align: "center",
239
237
  AdditionalHeaderWidget: () => additionalIDHeaderWidget
240
- }), [getIdColumnWidth, largeLayout])
238
+ }
241
239
 
242
- const columns: VirtualTableColumn[] = useMemo(() => [
240
+ const columns: VirtualTableColumn[] = [
243
241
  idColumn,
244
242
  ...displayedColumnIds
245
243
  .map((p) => {
246
244
  return collectionColumns.find(c => c.key === p.key);
247
245
  }).filter(Boolean) as VirtualTableColumn[]
248
- ], [collectionColumns, displayedColumnIds, idColumn]);
246
+ ];
249
247
 
250
- const cellRenderer = useCallback((props: CellRendererParams<any>) => {
248
+ const cellRenderer = (props: CellRendererParams<any>) => {
251
249
  const column = props.column;
252
250
  const columns = props.columns;
253
251
  const columnKey = column.key;
@@ -287,7 +285,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
287
285
  <ErrorView error={e}/>
288
286
  </EntityTableCell>;
289
287
  }
290
- }, [additionalFieldsMap, tableRowActionsBuilder, size, additionalCellRenderer, propertyCellRenderer])
288
+ }
291
289
 
292
290
  return (
293
291
 
package/src/components/EntityCollectionView/EntityCollectionView.tsx CHANGED
@@ -433,7 +433,7 @@ export const EntityCollectionView = React.memo(
433
433
 
434
434
  const largeLayout = useLargeLayout();
435
435
 
436
- const getActionsForEntity = useCallback(({ entity, customEntityActions }: {
436
+ const getActionsForEntity = ({ entity, customEntityActions }: {
437
437
  entity?: Entity<M>,
438
438
  customEntityActions?: EntityAction[]
439
439
  }): EntityAction[] => {
@@ -446,7 +446,7 @@ export const EntityCollectionView = React.memo(
446
446
  if (customEntityActions)
447
447
  actions.push(...customEntityActions);
448
448
  return actions;
449
- }, [authController, collection, createEnabled, fullPath]);
449
+ };
450
450
 
451
451
  const getIdColumnWidth = useCallback(() => {
452
452
  const entityActions = getActionsForEntity({});
@@ -456,12 +456,12 @@ export const EntityCollectionView = React.memo(
456
456
  return (largeLayout ? (80 + actionsWidth) : (70 + actionsWidth)) + (collapsedActions.length > 0 ? (largeLayout ? 40 : 30) : 0);
457
457
  }, [largeLayout]);
458
458
 
459
- const tableRowActionsBuilder = useCallback(({
460
- entity,
461
- size,
462
- width,
463
- frozen
464
- }: {
459
+ const tableRowActionsBuilder = ({
460
+ entity,
461
+ size,
462
+ width,
463
+ frozen
464
+ }: {
465
465
  entity: Entity<any>,
466
466
  size: CollectionSize,
467
467
  width: number,
@@ -491,7 +491,7 @@ export const EntityCollectionView = React.memo(
491
491
  />
492
492
  );
493
493
 
494
- }, [isEntitySelected, collection, authController, fullPath, selectionEnabled, toggleEntitySelection, createEnabled]);
494
+ };
495
495
 
496
496
  const title = <Popover
497
497
  open={popOverOpen}
package/src/hooks/useBuildNavigationController.tsx CHANGED
@@ -256,7 +256,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
256
256
  */
257
257
  const baseLocation = state && state.base_location ? state.base_location : location;
258
258
 
259
- const getAllParentCollectionsForPath = useCallback((path: string): EntityReference[] => {
259
+ const getAllParentReferencesForPath = useCallback((path: string): EntityReference[] => {
260
260
  return getParentReferencesFromPath({
261
261
  path,
262
262
  collections
@@ -264,8 +264,28 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
264
264
  }, [collections]);
265
265
 
266
266
  const getParentCollectionIds = useCallback((path: string): string[] => {
267
- return getAllParentCollectionsForPath(path).map(r => r.id);
268
- }, [getAllParentCollectionsForPath])
267
+
268
+ const strings = path.split("/");
269
+ const oddPathSegments = strings.filter((_, i) => i % 2 === 0);
270
+ oddPathSegments.pop();
271
+
272
+ const result: string[][] = [];
273
+
274
+ for (let i = 1; i <= oddPathSegments.length; i++) {
275
+ result.push(oddPathSegments.slice(0, i));
276
+ }
277
+
278
+ // for each odd path segment, get the collection
279
+ const parentCollectionIds = result.map(r => getCollectionFromPaths(r)?.id).filter(Boolean) as string[];
280
+
281
+ getCollectionFromPaths(oddPathSegments);
282
+
283
+ // const allParentCollectionsForPath = getAllParentReferencesForPath(path);
284
+ // console.log("allParentCollectionsForPath", allParentCollectionsForPath);
285
+ // const parentCollectionIds = allParentCollectionsForPath.map(r => r.id);
286
+ console.log("getParentCollectionIds", path, parentCollectionIds);
287
+ return parentCollectionIds;
288
+ }, [getAllParentReferencesForPath])
269
289
 
270
290
  const convertIdsToPaths = useCallback((ids: string[]): string[] => {
271
291
  let currentCollections = collections;
@@ -282,7 +302,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
282
302
  }
283
303
  , [getCollectionFromIds]);
284
304
 
285
- return useMemo(() => ({
305
+ return {
286
306
  collections,
287
307
  views,
288
308
  loading: !initialised || navigationLoading,
@@ -303,10 +323,10 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
303
323
  topLevelNavigation,
304
324
  baseLocation,
305
325
  refreshNavigation,
306
- getParentReferencesFromPath: getAllParentCollectionsForPath,
326
+ getParentReferencesFromPath: getAllParentReferencesForPath,
307
327
  getParentCollectionIds,
308
328
  convertIdsToPaths
309
- }), [baseCollectionPath, baseLocation, basePath, buildCMSUrlPath, buildUrlCollectionPath, buildUrlEditCollectionPath, collections, getAllParentCollectionsForPath, getCollection, getCollectionFromPaths, homeUrl, initialised, isUrlCollectionPath, navigationLoading, navigationLoadingError, refreshNavigation, resolveAliasesFrom, topLevelNavigation, urlPathToDataPath, views]);
329
+ };
310
330
  }
311
331
 
312
332
  export function getSidePanelKey(path: string, entityId?: string) {