@stoker-platform/web-app 0.2.12 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @stoker-platform/web-app
 
+## 0.3.1
+
+### Patch Changes
+
+- feat!: restructure user permissions
+- Updated dependencies
+    - @stoker-platform/node-client@0.3.2
+    - @stoker-platform/web-client@0.3.1
+    - @stoker-platform/utils@0.3.1
+
+## 0.3.0
+
+### Minor Changes
+
+- feat!: restructure projects / tenants
+
+### Patch Changes
+
+- Updated dependencies
+    - @stoker-platform/web-client@0.3.0
+    - @stoker-platform/utils@0.3.0
+    - @stoker-platform/node-client@0.3.1
+
 ## 0.2.12
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.2.12",
+    "version": "0.3.1",
     "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.7",
         "@sentry/react": "^10.29.0",
-        "@stoker-platform/node-client": "0.2.8",
-        "@stoker-platform/utils": "0.2.7",
-        "@stoker-platform/web-client": "0.2.9",
+        "@stoker-platform/node-client": "0.3.2",
+        "@stoker-platform/utils": "0.3.1",
+        "@stoker-platform/web-client": "0.3.1",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/Calendar.tsx

@@ -486,6 +486,7 @@ export function Calendar({
         ) {
             const subscribe = async () => {
                 const constraints = constraintsWithoutRangeFilter(filters)
+                // TODO: subcollection support
                 const result = await subscribeMany(
                     [labels.collection],
                     [...(constraints as QueryConstraint[]), where(calendarConfig.startField, "==", null)],

package/src/Cards.tsx

@@ -873,6 +873,7 @@ function DropZone({
                         ))
                 )
                     return
+                // TODO: subcollection support
                 subscribeOne([labels.collection], id, (record) => {
                     if (
                         record &&

package/src/Collection.tsx

@@ -555,6 +555,7 @@ function Collection({
                             }
                         }
 
+                        // TODO: subcollection support
                         const result = await subscribeMany(
                             [labels.collection],
                             [
@@ -604,6 +605,7 @@ function Collection({
                 const getServerData = async () => {
                     const options = cloneDeep(query.queries[0].options)
                     delete options.pagination
+                    // TODO: subcollection support
                     const data = await getSome(
                         [labels.collection],
                         [
@@ -668,6 +670,7 @@ function Collection({
 
         const getSingleton = async () => {
             if (collection.singleton) {
+                // TODO: subcollection support
                 const records = await getSome([labels.collection])
 
                 if (records.docs.length > 0) {
@@ -1254,6 +1257,7 @@ function Collection({
                     ) || []),
                 ]
             }
+            // TODO: subcollection support
             const serverData = await getSome(
                 [labels.collection],
                 finalConstraints,
@@ -1407,6 +1411,7 @@ function Collection({
                     }
                 }
 
+                // TODO: subcollection support
                 const data = await getSome(
                     [labels.collection],
                     (isServerReadOnly ? serverConstraints : webConstraints) as

package/src/Files.tsx

@@ -15,6 +15,7 @@ import {
     deleteFolder,
     getCurrentUserPermissions,
     getGlobalConfigModule,
+    getTenant,
 } from "@stoker-platform/web-client"
 import {
     getStorage,
@@ -74,6 +75,7 @@ interface FilesProps {
 }
 
 export const RecordFiles = ({ collection, record }: FilesProps) => {
+    const tenantId = getTenant()
     const { labels } = collection
     const customization = getCollectionConfigModule(labels.collection)
     const { toast } = useToast()
@@ -127,7 +129,7 @@ export const RecordFiles = ({ collection, record }: FilesProps) => {
         }, 150)
     }, [])
 
-    const basePath = record ? `${record.Collection_Path.join("/")}/${record.id}` : ""
+    const basePath = record ? `${tenantId}/${record.Collection_Path.join("/")}/${record.id}` : ""
 
     const totalPages = Math.ceil(items.length / itemsPerPage)
     const startIndex = (currentPage - 1) * itemsPerPage

package/src/Filters.tsx

@@ -126,6 +126,7 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
                             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                             [filter.field]: filter.value!,
                         }))
+                        // TODO: subcollection support
                         getOne([field.collection], filter.value).then((record) => {
                             setDisplay((prev) => ({
                                 ...prev,
@@ -282,6 +283,7 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
                 }
             }
 
+            // TODO: subcollection support
             getSome([collection], newConstraints as QueryConstraint[] | [string, WhereFilterOp, unknown][], {
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
                 pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },

package/src/Form.tsx

@@ -54,6 +54,7 @@ import {
     removeTimezone,
     serializeTimestamps,
     getFiles,
+    getTenant,
 } from "@stoker-platform/web-client"
 import { createElement, forwardRef, startTransition, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { useNavigate, useParams } from "react-router"
@@ -1753,6 +1754,7 @@ function RelationField({
                 }
             }
 
+            // TODO: subcollection support
             getSome([labels.collection], newConstraints, {
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
                 pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },
@@ -1813,6 +1815,7 @@ function RelationField({
             if (["ManyToOne", "ManyToMany"].includes(field.type)) {
                 let relation = data?.find((record) => record.id === inputValue)
                 if (!relation) {
+                    // TODO: subcollection support
                     relation = await getOne([relationCollection.labels.collection], inputValue, {
                         noEmbeddingFields: true,
                     })
@@ -2113,6 +2116,7 @@ function RecordForm({
     fromRelationList,
 }: FormProps) {
     const { labels, access, fields, auth, recordTitleField, softDelete, relationLists } = collection
+    const tenantId = getTenant()
     const schema = getSchema()
     const softDeleteField = softDelete?.archivedField
     const softDeleteTimestampField = softDelete?.timestampField
@@ -2917,7 +2921,7 @@ function RecordForm({
                 unsubscribe.current?.()
                 permissionsLoaded.current = true
                 const unsubscribePermissions = onSnapshot(
-                    doc(db, "system_user_permissions", record.User_ID),
+                    doc(db, "tenants", tenantId, "system_user_permissions", record.User_ID),
                     { includeMetadataChanges: true },
                     (doc) => {
                         if (doc.metadata.fromCache) return
@@ -2997,6 +3001,7 @@ function RecordForm({
                                                     return
                                                 }
                                                 const relationFields = getRelationFields(collection)
+                                                // TODO: subcollection support
                                                 const record = await getOne([collection.labels.collection], entity, {
                                                     noEmbeddingFields: true,
                                                     relations: { fields: relationFields, depth: 1 },
@@ -3056,6 +3061,7 @@ function RecordForm({
                                                 const relationCollection =
                                                     schema.collections[collectionField.collection]
                                                 const relationFields = getRelationFields(relationCollection)
+                                                // TODO: subcollection support
                                                 const record = await getOne([collectionField.collection], entity, {
                                                     noEmbeddingFields: true,
                                                     relations: { fields: relationFields, depth: 1 },
@@ -3718,7 +3724,7 @@ function RecordForm({
 
             if (operation === "create") {
                 const serverWrite = isServerCreate(collection, userData)
-                const docId = doc(dbCollection(db, labels.collection)).id
+                const docId = doc(dbCollection(db, "tenants", tenantId, labels.collection)).id
 
                 setGlobalLoading("+", docId, serverWrite, !(serverWrite || isServerReadOnly))
                 if (isServerReadOnly) {

package/src/Images.tsx

@@ -500,6 +500,7 @@ export const Images = memo(
                 const removedIds = Array.from(prevIds.difference(newIds))
                 removedIds.forEach((id) => {
                     let unsubscribeOne: () => void
+                    // TODO: subcollection support
                     subscribeOne([labels.collection], id, (record) => {
                         if (
                             record &&

package/src/PermissionPicker.tsx

@@ -123,6 +123,7 @@ export const PermissionPicker = ({
                 }
             }
 
+            // TODO: subcollection support
             getSome([labels.collection], newConstraints, {
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
                 pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },
@@ -168,6 +169,7 @@ export const PermissionPicker = ({
     const handleChange = useCallback(async () => {
         let relation = data?.find((record) => record.id === inputValue)
         if (!relation) {
+            // TODO: subcollection support
             relation = await getOne([labels.collection], inputValue, { noEmbeddingFields: true })
         }
         form.setValue(`accessible-${mainCollection.labels.collection}-${collection.labels.collection}`, {
@@ -190,6 +192,7 @@ export const PermissionPicker = ({
 
         let relation = data?.find((record) => record.id === inputValue)
         if (!relation) {
+            // TODO: subcollection support
             relation = await getOne([labels.collection], inputValue, { noEmbeddingFields: true })
         }
 

package/src/utils/getData.ts

@@ -48,6 +48,7 @@ export const getData = async (
                     }
                 }
 
+                // TODO: subcollection support
                 const result = await subscribeMany(
                     [labels.collection],
                     currentQuery.constraints as QueryConstraint[],
@@ -80,6 +81,7 @@ export const getData = async (
         }
 
         const getServerData = async () => {
+            // TODO: subcollection support
             const data = await getSome(
                 [labels.collection],
                 query.queries[0].constraints as [string, WhereFilterOp, unknown][],