@stoker-platform/web-app 0.5.110 → 0.5.112

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.112
+
+### Patch Changes
+
+- fix: fix role group issue
+
+## 0.5.111
+
+### Patch Changes
+
+- fix: hide convert button when target collection create access not granted
+
 ## 0.5.110
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.110",
+    "version": "0.5.112",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "scripts": {

package/src/Breadcrumbs.tsx

@@ -59,7 +59,7 @@ export const Breadcrumbs = ({
                 const titleField = field.titleField
                 if (titleField && field.includeFields?.includes(titleField)) {
                     const relationCollection = schema.collections[field.collection]
-                    if (!record[breadcrumb]) continue
+                    if (!(record[breadcrumb] && Object.values(record[breadcrumb])[0])) continue
                     recordMap[breadcrumb] = {
                         title: (Object.values(record[breadcrumb])[0] as StokerRelation)[titleField],
                         collection: relationCollection,

package/src/Form.tsx

@@ -2477,7 +2477,6 @@ function RecordForm({
     const [showDuplicateModal, setShowDuplicateModal] = useState(false)
     const [duplicateRecordData, setDuplicateRecordData] = useState<Partial<StokerRecord> | undefined>(undefined)
     const [convert, setConvert] = useState<Convert[] | undefined>(undefined)
-    const [convertAllowed, setConvertAllowed] = useState<Record<string, boolean>>({})
     const [showConvertModal, setShowConvertModal] = useState(false)
     const [convertRecordData, setConvertRecordData] = useState<Partial<StokerRecord> | undefined>(undefined)
     const [convertTargetCollection, setConvertTargetCollection] = useState<CollectionSchema | undefined>(undefined)
@@ -2504,6 +2503,21 @@ function RecordForm({
         return collectionAccess("Delete", collectionPermissions)
     }, [collection, permissions])
 
+    const convertMenuItems = useMemo(() => {
+        if (!convert?.length || !permissions?.Role) return []
+        const role = permissions.Role
+        return convert.filter((convertConfig) => {
+            const targetPermissions = permissions.collections?.[convertConfig.collection] as
+                | CollectionPermissions
+                | undefined
+            if (!collectionAccess("Create", targetPermissions as CollectionPermissions)) return false
+            if (convertConfig.roles && convertConfig.roles.length > 0) {
+                return convertConfig.roles.includes(role)
+            }
+            return true
+        })
+    }, [convert, permissions])
+
     const isPending = !!(id && isGlobalLoading.has(id))
     const isPendingServer = !!(id && isGlobalLoading.get(id)?.server)
     const [isAddingServer, setIsAddingServer] = useState(false)
@@ -3624,12 +3638,6 @@ function RecordForm({
                     ...prev,
                     [collection.labels.collection]: collectionTitles?.record || collection.labels.record,
                 }))
-                if (convert && convert.length > 0) {
-                    setConvertAllowed((prev) => ({
-                        ...prev,
-                        [collection.labels.collection]: !disableCreate,
-                    }))
-                }
             })
             permissionTitleResults.forEach(({ collection, titles: collectionTitles }) => {
                 setPermissionsTitles((prev) => ({
@@ -4502,10 +4510,17 @@ function RecordForm({
     const convertRecord = useCallback(
         async (targetCollection: CollectionSchema) => {
             if (!formValues || !originalRecord) return
+            const targetPermissions = permissions?.collections?.[targetCollection.labels.collection] as
+                | CollectionPermissions
+                | undefined
+            if (!collectionAccess("Create", targetPermissions as CollectionPermissions)) return
             const record = cloneDeep(originalRecord) as Partial<StokerRecord>
 
             const convertConfig = convert?.find((convert) => convert.collection === targetCollection.labels.collection)
             if (!convertConfig) return
+            if (convertConfig.roles && convertConfig.roles.length > 0 && permissions?.Role) {
+                if (!convertConfig.roles.includes(permissions.Role)) return
+            }
 
             const convertedRecord = await convertConfig.convert(record as StokerRecord)
 
@@ -4513,7 +4528,7 @@ function RecordForm({
             setConvertTargetCollection(targetCollection)
             setShowConvertModal(true)
         },
-        [formValues, originalRecord, permissions],
+        [formValues, originalRecord, permissions, convert],
     )
 
     const hasBreadcrumbs = useMemo(() => {
@@ -5651,7 +5666,7 @@ function RecordForm({
                                                 Duplicate
                                             </Button>
                                         )}
-                                        {convert && convert.length > 0 && (
+                                        {convertMenuItems.length > 0 && (
                                             <DropdownMenu>
                                                 <DropdownMenuTrigger asChild>
                                                     <Button variant="outline" disabled={isCreateDisabled}>
@@ -5660,36 +5675,19 @@ function RecordForm({
                                                     </Button>
                                                 </DropdownMenuTrigger>
                                                 <DropdownMenuContent align="end">
-                                                    {convert
-                                                        .filter((convertConfig) => {
-                                                            if (!permissions?.Role) return false
-                                                            if (!convertAllowed[convertConfig.collection]) return false
-                                                            if (
-                                                                convertConfig.roles &&
-                                                                convertConfig.roles.length > 0 &&
-                                                                permissions.collections?.[convertConfig.collection] &&
-                                                                collectionAccess(
-                                                                    "Create",
-                                                                    permissions.collections[convertConfig.collection],
-                                                                )
-                                                            ) {
-                                                                return convertConfig.roles.includes(permissions?.Role)
-                                                            }
-                                                            return true
-                                                        })
-                                                        .map((convertConfig) => {
-                                                            const targetCollection =
-                                                                schema.collections[convertConfig.collection]
-                                                            if (!targetCollection) return null
-                                                            return (
-                                                                <DropdownMenuItem
-                                                                    key={convertConfig.collection}
-                                                                    onClick={() => convertRecord(targetCollection)}
-                                                                >
-                                                                    {allRecordTitles[convertConfig.collection]}
-                                                                </DropdownMenuItem>
-                                                            )
-                                                        })}
+                                                    {convertMenuItems.map((convertConfig) => {
+                                                        const targetCollection =
+                                                            schema.collections[convertConfig.collection]
+                                                        if (!targetCollection) return null
+                                                        return (
+                                                            <DropdownMenuItem
+                                                                key={convertConfig.collection}
+                                                                onClick={() => convertRecord(targetCollection)}
+                                                            >
+                                                                {allRecordTitles[convertConfig.collection]}
+                                                            </DropdownMenuItem>
+                                                        )
+                                                    })}
                                                 </DropdownMenuContent>
                                             </DropdownMenu>
                                         )}

package/src/loadRoutes.tsx

@@ -89,7 +89,7 @@ export const loadRoutes = (): RouteObject[] => {
             element: <Dashboard />,
             errorElement: <ErrorPage />,
         })
-    } else if (homePage) {
+    } else if (homePage && collectionAccess("Read", permissions.collections?.[homePage])) {
         routes[0].children.unshift({
             index: true,
             element: <Navigate to={`/${homePage.toLowerCase()}`} replace />,

package/src/utils/getRelationFields.ts

@@ -1,6 +1,7 @@
 import { CollectionSchema } from "@stoker-platform/types"
-import { getFieldCustomization, getRoleGroup, isRelationField, tryFunction } from "@stoker-platform/utils"
+import { getFieldCustomization, isRelationField, tryFunction } from "@stoker-platform/utils"
 import {
+    getAllRoleGroups,
     getCollectionConfigModule,
     getCollectionRefs,
     getCurrentUserPermissions,
@@ -13,14 +14,16 @@ export const getRelationFields = (collection: CollectionSchema) => {
     const permissions = getCurrentUserPermissions()
     if (!permissions?.Role) throw new Error("PERMISSION_DENIED")
     const customization = getCollectionConfigModule(labels.collection)
-    const collectionSchema = schema.collections[labels.collection]
     const relationFields: string[] = []
     for (const field of fields) {
         const fieldCustomization = getFieldCustomization(field, customization)
         if (!isRelationField(field)) continue
         const queryFullRecord = tryFunction(fieldCustomization.admin?.queryFullRecord)
         const condition = tryFunction(fieldCustomization.admin?.condition?.form, ["update"])
-        const roleGroup = getRoleGroup(permissions.Role, collectionSchema, schema)
+        const roleGroups = getAllRoleGroups()
+        const roleGroup = Array.from(roleGroups[labels.collection]).find(
+            (roleGroup) => permissions.Role && roleGroup.roles.includes(permissions.Role),
+        )
         if (!roleGroup) throw new Error("PERMISSION_DENIED")
         if (!schema.collections[field.collection]) continue
         const refs = getCollectionRefs([field.collection], roleGroup)