@firecms/core 3.0.0-canary.41 → 3.0.0-canary.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.41",
+  "version": "3.0.0-canary.42",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/formex": "^3.0.0-canary.41",
-    "@firecms/ui": "^3.0.0-canary.41",
+    "@firecms/formex": "^3.0.0-canary.42",
+    "@firecms/ui": "^3.0.0-canary.42",
     "@fontsource/jetbrains-mono": "^5.0.19",
     "@hello-pangea/dnd": "^16.5.0",
     "@radix-ui/react-portal": "^1.0.4",
@@ -118,7 +118,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "d1ffa185f8930bab4e7b9941ba551c53f947aa1f",
+  "gitHead": "d6a2f28e93d3c532dd6efacfccffb91383d5330e",
   "publishConfig": {
     "access": "public"
   }

package/src/components/HomePage/DefaultHomePage.tsx

@@ -191,7 +191,7 @@ export function DefaultHomePage({
                                         />
                                     </div>
                                 ))}
-                                {AdditionalCards &&
+                                {group?.toLowerCase() !== "admin" && AdditionalCards &&
                                     AdditionalCards.map((AdditionalCard, i) => (
                                         <div key={`nav_${group}_add_${i}`}>
                                             <AdditionalCard {...actionProps} />

package/src/components/VirtualTable/VirtualTable.tsx

@@ -20,7 +20,7 @@ import { VirtualTableContextProps } from "./types";
 import { VirtualTableHeaderRow } from "./VirtualTableHeaderRow";
 import { VirtualTableRow } from "./VirtualTableRow";
 import { VirtualTableCell } from "./VirtualTableCell";
-import { AssignmentIcon, cn, Typography } from "@firecms/ui";
+import { AssignmentIcon, CenteredView, cn, Typography } from "@firecms/ui";
 
 const VirtualListContext = createContext<VirtualTableContextProps<any>>({} as any);
 VirtualListContext.displayName = "VirtualListContext";
@@ -227,19 +227,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             if (onFilterUpdate) onFilterUpdate(newFilterValue);
         }, [checkFilterCombination, currentSort, onFilterUpdate, sortByProperty]);
 
-        const buildErrorView = useCallback(() => (
-            <div
-                className="h-full flex flex-col items-center justify-center sticky left-0">
-
-                <Typography variant={"h6"}>
-                    {"Error fetching data from the data source"}
-                </Typography>
-
-                {error?.message && <SafeLinkRenderer text={error.message}/>}
-
-            </div>
-        ), [error?.message]);
-
         const buildEmptyView = useCallback(() => {
             if (loading)
                 return <CircularProgressCenter/>;
@@ -251,7 +238,18 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         }, [emptyComponent, loading]);
 
         const empty = !loading && (data?.length ?? 0) === 0;
-        const customView = error ? buildErrorView() : (empty ? buildEmptyView() : undefined);
+        const customView = error
+            ? <CenteredView maxWidth={"2xl"}
+                className="flex flex-col gap-2">
+
+                <Typography variant={"h6"}>
+                    {"Error fetching data from the data source"}
+                </Typography>
+
+                {error?.message && <SafeLinkRenderer text={error.message}/>}
+
+            </CenteredView>
+            : (empty ? buildEmptyView() : undefined);
 
         const virtualListController = {
             data,
@@ -406,10 +404,10 @@ const SafeLinkRenderer: React.FC<{
     const urlRegex = /https?:\/\/[^\s]+/g;
     const htmlContent = text.replace(urlRegex, (url) => {
         // For each URL found, replace it with an HTML <a> tag
-        return `<a href="${url}" target="_blank">Link to your console</a>`;
+        return `<a href="${url}" target="_blank">Link</a><br/>`;
     });
 
     return (
-        <div className={"px-4 break-all"} dangerouslySetInnerHTML={{ __html: htmlContent }}/>
+        <div className={"break-all"} dangerouslySetInnerHTML={{ __html: htmlContent }}/>
     );
 };

package/src/hooks/useBuildNavigationController.tsx

@@ -450,14 +450,14 @@ async function resolveCollections(collections: undefined | EntityCollection[] |
         resolvedCollections = collections;
     }
 
-    resolvedCollections = applyPermissionsFunctionIfEmpty(resolvedCollections, collectionPermissions);
-
-    resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
-
     if (injectCollections) {
         resolvedCollections = injectCollections(resolvedCollections ?? []);
     }
 
+    resolvedCollections = applyPermissionsFunctionIfEmpty(resolvedCollections, collectionPermissions);
+
+    resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
+
     return resolvedCollections;
 }