@stoker-platform/web-app 0.5.43 → 0.5.45

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @stoker-platform/web-app
 
+## 0.5.45
+
+### Patch Changes
+
+- feat: add record filter to calendar
+    - @stoker-platform/node-client@0.5.29
+    - @stoker-platform/utils@0.5.23
+    - @stoker-platform/web-client@0.5.25
+
+## 0.5.44
+
+### Patch Changes
+
+- feat: add additionalFields option to calendar
+    - @stoker-platform/node-client@0.5.28
+    - @stoker-platform/utils@0.5.22
+    - @stoker-platform/web-client@0.5.24
+
 ## 0.5.43
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.43",
+    "version": "0.5.45",
     "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.38.0",
-        "@stoker-platform/node-client": "0.5.27",
-        "@stoker-platform/utils": "0.5.21",
-        "@stoker-platform/web-client": "0.5.23",
+        "@stoker-platform/node-client": "0.5.29",
+        "@stoker-platform/utils": "0.5.23",
+        "@stoker-platform/web-client": "0.5.25",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/Calendar.tsx

@@ -28,7 +28,14 @@ import { ScrollArea } from "./components/ui/scroll-area"
 import { useOptimistic } from "./providers/OptimisticProvider"
 import { isServerUpdate } from "./utils/isServerWrite"
 import { isOfflineDisabled as isOfflineDisabledSync } from "./utils/isOfflineDisabled"
-import { canUpdateField, getField, getSystemFieldsSchema, isRelationField, tryFunction } from "@stoker-platform/utils"
+import {
+    canUpdateField,
+    getField,
+    getFieldCustomization,
+    getSystemFieldsSchema,
+    isRelationField,
+    tryFunction,
+} from "@stoker-platform/utils"
 import cloneDeep from "lodash/cloneDeep.js"
 import { useGlobalLoading } from "./providers/LoadingProvider"
 import { useToast } from "./hooks/use-toast"
@@ -622,8 +629,12 @@ export function Calendar({
                 updatedList.push(optimisticRecord)
             }
         })
-        return updatedList
-            .filter((record) => record[calendarConfig.startField])
+        const mainEvents = updatedList
+            .filter(
+                (record) =>
+                    record[calendarConfig.startField] &&
+                    (!calendarConfig.filterRecords || calendarConfig.filterRecords(record)),
+            )
             .map((record) => {
                 const isPendingServer = isGlobalLoading.get(record.id)?.server
 
@@ -663,6 +674,39 @@ export function Calendar({
                 }
                 return event
             })
+
+        const additionalEvents: EventInput[] = []
+        if (calendarConfig?.additionalFields) {
+            calendarConfig.additionalFields.forEach((additionalField) => {
+                updatedList
+                    // eslint-disable-next-line security/detect-object-injection
+                    .filter(
+                        (record) =>
+                            record[additionalField] &&
+                            (!calendarConfig.filterRecords || calendarConfig.filterRecords(record)),
+                    )
+                    .forEach((record) => {
+                        const additionalFieldSchema = getField(fields, additionalField)
+                        const additionalFieldCustomization = getFieldCustomization(additionalFieldSchema, customization)
+                        const label = tryFunction(additionalFieldCustomization.admin?.label) || additionalField
+                        const title =
+                            // eslint-disable-next-line security/detect-object-injection
+                            tryFunction(calendarConfig.eventTitle, [record]) || record[recordTitleField] || record.id
+
+                        const event: EventInput = {
+                            id: `${record.id}-${additionalField}`,
+                            title: `${label}- ${title}`,
+                            // eslint-disable-next-line security/detect-object-injection
+                            start: record[additionalField].toDate(),
+                            editable: false,
+                            allDay: true,
+                            color: "#6b7280",
+                        }
+                        additionalEvents.push(event)
+                    })
+            })
+        }
+        return mainEvents.concat(additionalEvents)
     }, [
         calendarConfig,
         list,
@@ -956,7 +1000,7 @@ export function Calendar({
         selectable: canAddRecords && !isCreateDisabled && !!calendarConfig?.endField,
         droppable: hasStartUpdateAccess,
         eventClick(info: EventClickArg) {
-            const record = list?.find((record) => record.id === info.event.id) as StokerRecord
+            const record = list?.find((record) => record.id === info.event.id.split("-")[0]) as StokerRecord
             goToRecord(collection, record)
         },
         eventDrop(info: EventDropArg) {