wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-01-24 20:40:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix collection editors in Safari (#973)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2022-02-08 22:40:13 +07:00 committed by GitHub
parent 9c9b2b46d9
commit 250937c175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
plugins/view-resources/src/components/EditDoc.svelte
View File

@ -55,8 +55,7 @@
let prevSelected = selectedClass
let keys: KeyedAttribute[] = []
let collectionKeys: KeyedAttribute[] = []
let collectionEditors: AnyComponent[] = []
let collectionEditors: {key: KeyedAttribute, editor: AnyComponent} [] = []
let mixins: Mixin<Doc>[] = []
@ -93,14 +92,21 @@
let ignoreKeys: string[] = []
function updateKeys (): void {
async function updateKeys (): Promise<void> {
const filtredKeys = getFiltredKeys(
selectedClass ?? object._class,
ignoreKeys,
selectedClass !== objectClass._id ? objectClass._id : undefined
)
keys = collectionsFilter(filtredKeys, false)
collectionKeys = collectionsFilter(filtredKeys, true)
const collectionKeys = collectionsFilter(filtredKeys, true)
const editors: {key: KeyedAttribute, editor: AnyComponent}[] = []
for (const k of collectionKeys) {
const editor = await getCollectionEditor(k)
editors.push({ key: k, editor })
}
collectionEditors = editors
}
function collectionsFilter (keys: KeyedAttribute[], get: boolean): KeyedAttribute[] {
@ -215,16 +221,6 @@
headerLoading = false
})
}
async function updateCollectionEditors (keys: KeyedAttribute[]): Promise<void> {
const editors: AnyComponent[] = []
for (const k of keys) {
editors.push(await getCollectionEditor(k))
}
collectionEditors = editors
}
$: updateCollectionEditors(collectionKeys)
</script>
{#if object !== undefined && title !== undefined}
@ -287,23 +283,19 @@
{/each}
</div>
{/if}
{#if collectionKeys.length !== collectionEditors.length}
<Spinner />
{:else}
{#each collectionKeys as collection, i}
<div class="mt-14">
<Component
is={collectionEditors[i]}
props={{
objectId: object._id,
_class: object._class,
space: object.space,
[collection.key]: getCollectionCounter(object, collection)
}}
/>
</div>
{/each}
{/if}
{#each collectionEditors as collection, i}
<div class="mt-14">
<Component
is={collection.editor}
props={{
objectId: object._id,
_class: object._class,
space: object.space,
[collection.key.key]: getCollectionCounter(object, collection.key)
}}
/>
</div>
{/each}
</Panel>
{/if}