From defcd0eefd93662e3a727eeddda09d2f14f65afa Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Sat, 3 Jan 2026 17:44:40 +0500 Subject: [PATCH] Fix card spaces table (#10352) Signed-off-by: Denis Bykhov --- .vscode/launch.json | 2 +- models/card/src/index.ts | 3 --- .../src/components/navigator/CreateSpace.svelte | 9 +++++++++ plugins/card-resources/src/utils.ts | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index d7fb313dce..0293949e6f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -97,7 +97,7 @@ "MODEL_JSON": "${workspaceRoot}/models/all/bundle/model.json", // "SERVER_PROVIDER":"uweb" "SERVER_PROVIDER": "ws", - "MODEL_VERSION": "0.7.326", + "MODEL_VERSION": "0.7.331", // "version": "0.7.0", "COMMUNICATION_API_ENABLED": "true", "ELASTIC_INDEX_NAME": "local_storage_index", diff --git a/models/card/src/index.ts b/models/card/src/index.ts index aed246190f..2b031d7a67 100644 --- a/models/card/src/index.ts +++ b/models/card/src/index.ts @@ -437,9 +437,6 @@ export function createModel (builder: Builder): void { hiddenKeys: ['name', 'description'], sortable: true }, - baseQuery: { - isLatest: true - }, config: ['', 'members', 'private', 'archived'], viewOptions: { groupBy: [], diff --git a/plugins/card-resources/src/components/navigator/CreateSpace.svelte b/plugins/card-resources/src/components/navigator/CreateSpace.svelte index 3e1235e649..fdb776ddfb 100644 --- a/plugins/card-resources/src/components/navigator/CreateSpace.svelte +++ b/plugins/card-resources/src/components/navigator/CreateSpace.svelte @@ -152,6 +152,15 @@ } function handleMembersChanged (newMembers: AccountUuid[]): void { + const newMembersSet = new Set(newMembers) + const removedMembersSet = new Set(members.filter((m) => !newMembersSet.has(m))) + + if (removedMembersSet.size > 0 && rolesAssignment !== undefined) { + for (const [key, value] of Object.entries(rolesAssignment)) { + rolesAssignment[key as Ref] = value != null ? value.filter((m) => !removedMembersSet.has(m)) : undefined + } + } + members = newMembers } diff --git a/plugins/card-resources/src/utils.ts b/plugins/card-resources/src/utils.ts index b57b37aede..86e4172791 100644 --- a/plugins/card-resources/src/utils.ts +++ b/plugins/card-resources/src/utils.ts @@ -112,7 +112,7 @@ async function cloneCard ( : [core.class.TypeCollaborativeDoc, core.class.TypeIdentifier] for (const [key, attr] of attrs) { - if (attr.readonly !== true && attr.hidden !== true) { + if (attr.hidden !== true) { if (attr.type._class === core.class.Collection) { ;(props as any)[key] = 0 } else if (!skipClasses.includes(attr.type._class)) {