@stoker-platform/web-app 0.5.234 → 0.5.236

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @stoker-platform/web-app
 
+## 0.5.236
+
+### Patch Changes
+
+- Updated dependencies
+    - @stoker-platform/node-client@0.5.95
+
+## 0.5.235
+
+### Patch Changes
+
+- fix: fix non-auth-field updates in auth collections
+- Updated dependencies
+    - @stoker-platform/node-client@0.5.94
+    - @stoker-platform/web-client@0.5.99
+
 ## 0.5.234
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.234",
+    "version": "0.5.236",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "scripts": {
@@ -51,9 +51,9 @@
         "@radix-ui/react-tooltip": "^1.2.8",
         "@react-google-maps/api": "^2.20.8",
         "@sentry/react": "^10.56.0",
-        "@stoker-platform/node-client": "0.5.93",
+        "@stoker-platform/node-client": "0.5.95",
         "@stoker-platform/utils": "0.5.82",
-        "@stoker-platform/web-client": "0.5.98",
+        "@stoker-platform/web-client": "0.5.99",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/Calendar.tsx

@@ -1106,7 +1106,7 @@ export function Calendar({
                 return
             }
 
-            const serverWrite = isServerUpdate(eventCollectionSchema, record)
+            const serverWrite = isServerUpdate(eventCollectionSchema, updatedFields, undefined, record)
             const isServerReadOnly = serverReadOnly(eventCollectionSchema)
 
             setGlobalLoading("+", record.id, serverWrite, !(serverWrite || isServerReadOnly))

package/src/Cards.tsx

@@ -603,14 +603,18 @@ function DropZone({
                     return
                 }
 
-                const serverWrite = isServerUpdate(collection, record)
+                const updatedFields =
+                    "values" in statusField && statusField.values
+                        ? { [statusField.name]: statusValue }
+                        : { [statusField.name]: statusValue === statusValues[0] }
+
+                const serverWrite = isServerUpdate(collection, updatedFields, undefined, record)
 
                 setSettingOptimistic(true)
 
                 const optimisticUpdate = {
                     ...record,
-                    [statusField.name]:
-                        "values" in statusField && statusField.values ? statusValue : statusValue === statusValues[0],
+                    ...updatedFields,
                 }
                 setOptimisticUpdate(labels.collection, optimisticUpdate)
 
@@ -625,12 +629,7 @@ function DropZone({
                 }
 
                 if ("values" in statusField && statusField.values) {
-                    updateRecord(
-                        record.Collection_Path,
-                        record.id,
-                        { [statusField.name]: statusValue },
-                        { originalRecord },
-                    )
+                    updateRecord(record.Collection_Path, record.id, updatedFields, { originalRecord })
                         .then(() => {
                             if (serverWrite || isServerReadOnly) {
                                 toast({
@@ -658,14 +657,7 @@ function DropZone({
                             setGlobalLoading("-", record.id, undefined, !(serverWrite || isServerReadOnly))
                         })
                 } else if (statusField.type === "Boolean") {
-                    updateRecord(
-                        record.Collection_Path,
-                        record.id,
-                        {
-                            [statusField.name]: statusValue === statusValues[0],
-                        },
-                        { originalRecord },
-                    )
+                    updateRecord(record.Collection_Path, record.id, updatedFields, { originalRecord })
                         .then(() => {
                             if (serverWrite || isServerReadOnly) {
                                 toast({

package/src/Collection.tsx

@@ -1987,7 +1987,6 @@ function Collection({
         async (record: StokerRecord) => {
             if (!relationList || !relationParent) return
             const relationCollection = schema.collections[relationList.collection]
-            const isRelationServerWrite = isServerUpdate(relationCollection, record)
             const isRelationServerReadOnly = serverReadOnly(relationCollection)
             const relationField = getField(relationCollection.fields, relationList.field) as RelationField
 
@@ -2004,6 +2003,7 @@ function Collection({
                     updatedFields[relationList.field][relationParent.id][includeField] = relationParent[includeField]
                 }
             }
+            const isRelationServerWrite = isServerUpdate(relationCollection, updatedFields, undefined, record)
 
             const optimisticUpdate = {
                 ...record,

package/src/Form.tsx

@@ -4224,17 +4224,6 @@ function RecordForm({
             delete values.password
             delete values.passwordConfirm
 
-            const offlineDisabled = await isOfflineDisabledSync(
-                operation === "update-many" ? "update" : operation,
-                collection,
-                values,
-                userData,
-            )
-            if (offlineDisabled) {
-                alert(`You are offline and cannot ${operation} this record.`)
-                return
-            }
-
             const recordToSave = cloneDeep(values) as Partial<StokerRecord>
             const prevStateToSave = cloneDeep(prevState)
             for (const key in recordToSave) {
@@ -4248,6 +4237,19 @@ function RecordForm({
                 }
             }
 
+            const offlineDisabled = await isOfflineDisabledSync(
+                operation === "update-many" ? "update" : operation,
+                collection,
+                operation === "update" || operation === "update-many"
+                    ? { ...recordToSave, User_ID: originalRecord?.User_ID ?? values.User_ID }
+                    : values,
+                userData,
+            )
+            if (offlineDisabled) {
+                alert(`You are offline and cannot ${operation} this record.`)
+                return
+            }
+
             if (operation === "create") {
                 const serverWrite = isServerCreate(collection, userData)
                 const docId = doc(dbCollection(db, "tenants", tenantId, labels.collection)).id
@@ -4352,7 +4354,7 @@ function RecordForm({
                     setError("No ID provided for update operation")
                     return
                 }
-                const serverWrite = isServerUpdate(collection, { ...recordToSave, id }, userData)
+                const serverWrite = isServerUpdate(collection, recordToSave, userData, originalRecord)
                 const optimisticUpdate = {
                     ...(originalRecord ?? record),
                     ...cloneDeep(recordToSave),
@@ -4434,10 +4436,7 @@ function RecordForm({
                     for (let i = 0; i < recordsToUpdate.length; i += BATCH_SIZE) {
                         const batch = recordsToUpdate.slice(i, i + BATCH_SIZE)
                         const batchPromises = batch.map((selectedRecord) => {
-                            const serverWrite = isServerUpdate(collection, {
-                                ...recordToSave,
-                                id: selectedRecord.id,
-                            })
+                            const serverWrite = isServerUpdate(collection, recordToSave, undefined, selectedRecord)
                             setGlobalLoading("+", selectedRecord.id, serverWrite, !(serverWrite || isServerReadOnly))
 
                             return updateRecord(path, selectedRecord.id, recordToSave, {
@@ -4475,7 +4474,7 @@ function RecordForm({
                 }
 
                 rowSelection.forEach((selectedRecord) => {
-                    const serverWrite = isServerUpdate(collection, { ...recordToSave, id: selectedRecord.id })
+                    const serverWrite = isServerUpdate(collection, recordToSave, undefined, selectedRecord)
                     if (!serverWrite && !isServerReadOnly) {
                         if (selectedRecord.id) {
                             removeCacheOptimistic(collection, {

package/src/Map.tsx

@@ -475,7 +475,7 @@ export function Map({
                 return
             }
 
-            const serverWrite = isServerUpdate(collection, record)
+            const serverWrite = isServerUpdate(collection, updatedFields, undefined, record)
 
             const optimisticUpdate = {
                 ...record,

package/src/utils/isOfflineDisabled.ts

@@ -56,17 +56,20 @@ export const isOfflineDisabled = async (
     if (operation === "update") {
         const createUserRequest = auth && userData?.operation === "create"
         const deleteUserRequest = auth && userData?.operation === "delete"
+        const tokenFields = collection.fields.filter((field) => field.saveToAuthToken)
         const updateUserRequest =
             record &&
             collection.auth &&
             !createUserRequest &&
             !deleteUserRequest &&
             (userData?.operation === "update" ||
-                record.Role ||
-                record.Enabled !== undefined ||
-                record.Name ||
-                record.Email ||
-                record.Photo_URL)
+                (record.User_ID &&
+                    (record.Role ||
+                        record.Enabled !== undefined ||
+                        record.Name ||
+                        record.Email ||
+                        record.Photo_URL ||
+                        tokenFields.some((field) => record[field.name] !== undefined))))
         if (createUserRequest || updateUserRequest || deleteUserRequest) {
             return offline
         }

package/src/utils/isServerWrite.ts

@@ -6,7 +6,12 @@ export const isServerCreate = (collection: CollectionSchema, user?: UserData) =>
     return !!(serverWriteOnly || (auth && user?.operation === "create"))
 }
 
-export const isServerUpdate = (collection: CollectionSchema, record: Partial<StokerRecord>, user?: UserData) => {
+export const isServerUpdate = (
+    collection: CollectionSchema,
+    record: Partial<StokerRecord>,
+    user?: UserData,
+    originalRecord?: StokerRecord,
+) => {
     const { auth, access, fields } = collection
     const { serverWriteOnly } = access
     const tokenFields = fields.filter((field) => field.saveToAuthToken)
@@ -14,12 +19,13 @@ export const isServerUpdate = (collection: CollectionSchema, record: Partial<Sto
         serverWriteOnly ||
         (auth &&
             (user?.operation ||
-                record.Role ||
-                record.Enabled !== undefined ||
-                record.Name ||
-                record.Email ||
-                record.Photo_URL ||
-                tokenFields.some((field) => record[field.name] !== undefined)))
+                (originalRecord?.User_ID &&
+                    (record.Role ||
+                        record.Enabled !== undefined ||
+                        record.Name ||
+                        record.Email ||
+                        record.Photo_URL ||
+                        tokenFields.some((field) => record[field.name] !== undefined)))))
     )
 }