@stoker-platform/web-app 0.5.190 → 0.5.192

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.192
+
+### Patch Changes
+
+- feat: remove image field images from image carousel
+
+## 0.5.191
+
+### Patch Changes
+
+- fix: fix image field upload spinner
+
 ## 0.5.190
 
 ### Patch Changes

package/package.json

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

package/src/Form.tsx

@@ -2714,7 +2714,7 @@ function RecordForm({
         async (
             selectedPermissions: FilePermissions,
             contextOverride?: "files" | "image-create" | "image-update",
-            imageUpdateOverrides?: { pendingImage: { fieldName: string; file: File }; resolver: () => void },
+            imageUpdateOverrides?: { pendingImage: { fieldName: string; file: File }; resolver?: () => void },
         ) => {
             const context = contextOverride ?? permissionsContext
             if (context === "files") {
@@ -2840,6 +2840,10 @@ function RecordForm({
                                 description: `Failed to upload ${filename}`,
                                 variant: "destructive",
                             })
+                            resolve()
+                            if (effectiveResolver) {
+                                effectiveResolver()
+                            }
                         },
                         async () => {
                             try {
@@ -2912,20 +2916,21 @@ function RecordForm({
 
     const uploadImageForUpdate = useCallback(
         async (fieldName: string, file: File) => {
-            return await new Promise<void>((resolve) => {
-                setPermissionsContext("image-update")
-                setPendingImageForUpdate({ fieldName, file })
-                setEditingFilename(file.name)
-                setIsMultipleFileUpload(false)
+            setPermissionsContext("image-update")
+            setPendingImageForUpdate({ fieldName, file })
+            setEditingFilename(file.name)
+            setIsMultipleFileUpload(false)
+
+            if (shouldSkipPermissionsDialog()) {
+                await handlePermissionsConfirm(getDefaultPermissions(), "image-update", {
+                    pendingImage: { fieldName, file },
+                })
+                return
+            }
+
+            await new Promise<void>((resolve) => {
                 setImageUpdateResolver(() => resolve)
-                if (shouldSkipPermissionsDialog()) {
-                    handlePermissionsConfirm(getDefaultPermissions(), "image-update", {
-                        pendingImage: { fieldName, file },
-                        resolver: resolve,
-                    })
-                } else {
-                    setShowPermissionsDialog(true)
-                }
+                setShowPermissionsDialog(true)
             })
         },
         [shouldSkipPermissionsDialog, getDefaultPermissions, handlePermissionsConfirm],
@@ -3708,6 +3713,15 @@ function RecordForm({
     useEffect(() => {
         const loadImages = async () => {
             if (!formImagesEnabled || operation !== "update" || !record || isOffline) return
+            const imageFieldUrls = fields
+                .filter((field) => {
+                    if (field.type !== "String") return false
+                    const fieldCustomization = getFieldCustomization(field, customization)
+                    return tryFunction(fieldCustomization.admin?.image)
+                })
+                .map((field) => {
+                    return record?.[field.name]
+                })
             try {
                 const items = await getFiles("", record)
                 const imageItems = items.filter((item) => {
@@ -3719,7 +3733,7 @@ function RecordForm({
                         return url
                     }),
                 )
-                setCarouselImages(urls)
+                setCarouselImages(urls.filter((url) => !imageFieldUrls.includes(url)))
             } finally {
                 setCarouselLoading(false)
             }