@stoker-platform/web-app 0.5.111 → 0.5.113

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.113
+
+### Patch Changes
+
+- feat: prevent file upload button re-click
+
+## 0.5.112
+
+### Patch Changes
+
+- fix: fix role group issue
+
 ## 0.5.111
 
 ### Patch Changes

package/package.json

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

package/src/Files.tsx

@@ -8,7 +8,7 @@ import {
     StorageItem,
     UploadProgress,
 } from "@stoker-platform/types"
-import { useEffect, useState, useCallback } from "react"
+import { useEffect, useState, useCallback, useRef } from "react"
 import { getCachedConfigValue, runHooks, sanitizeDownloadFilename, validateStorageName } from "@stoker-platform/utils"
 import {
     getCollectionConfigModule,
@@ -183,6 +183,7 @@ export const RecordFiles = ({ collection, record }: FilesProps) => {
     const { setIsRouteLoading } = useRouteLoading()
 
     const [showFilenameDialog, setShowFilenameDialog] = useState(false)
+    const uploadLockRef = useRef(false)
     const [pendingUploadFile, setPendingUploadFile] = useState<File | null>(null)
     const [editingFilename, setEditingFilename] = useState("")
 
@@ -528,7 +529,13 @@ export const RecordFiles = ({ collection, record }: FilesProps) => {
             return
         }
         if (shouldSkipPermissionsDialog()) {
-            await uploadFiles([pendingUploadFile], getDefaultPermissions(), trimmedName)
+            if (uploadLockRef.current) return
+            uploadLockRef.current = true
+            try {
+                await uploadFiles([pendingUploadFile], getDefaultPermissions(), trimmedName)
+            } finally {
+                uploadLockRef.current = false
+            }
         } else {
             setShowPermissionsDialog(true)
         }
@@ -1349,6 +1356,7 @@ export const RecordFiles = ({ collection, record }: FilesProps) => {
                                 className="mt-1"
                                 onKeyDown={(e) => {
                                     if (e.key === "Enter") {
+                                        if (!editingFilename.trim()) return
                                         handleConfirmFilename()
                                     } else if (e.key === "Escape") {
                                         handleCancelFilename()

package/src/Form.tsx

@@ -4623,8 +4623,8 @@ function RecordForm({
                                         <FormItem>
                                             <FormDescription className="pb-2">
                                                 {originalRecord?.User_ID
-                                                    ? `Enter a password below to change the password for this ${labels.record}`
-                                                    : `Add system access for this ${labels.record} by entering a password below`}
+                                                    ? `Enter a password below to change the password for this ${recordTitle}`
+                                                    : `Add system access for this ${recordTitle} by entering a password below`}
                                             </FormDescription>
                                             <FormLabel className="text-primary">
                                                 {record?.User_ID ? "New Password" : "Password"}

package/src/loadRoutes.tsx

@@ -89,7 +89,8 @@ export const loadRoutes = (): RouteObject[] => {
             element: <Dashboard />,
             errorElement: <ErrorPage />,
         })
-    } else if (homePage) {
+        // eslint-disable-next-line security/detect-object-injection
+    } 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)