diff --git a/foundations/core/packages/core/src/classes.ts b/foundations/core/packages/core/src/classes.ts index f00b9ba387..1e3f3c78a9 100644 --- a/foundations/core/packages/core/src/classes.ts +++ b/foundations/core/packages/core/src/classes.ts @@ -344,6 +344,7 @@ export interface TypeDate extends Type { */ export interface TypeIdentifier extends Type { of: Ref + showInPresenter?: boolean } /** diff --git a/foundations/core/packages/model/src/dsl.ts b/foundations/core/packages/model/src/dsl.ts index dfe0313ae1..fbd5c4e4fc 100644 --- a/foundations/core/packages/model/src/dsl.ts +++ b/foundations/core/packages/model/src/dsl.ts @@ -472,8 +472,8 @@ export function TypeRef (_class: Ref>): RefTo { /** * @public */ -export function TypeIdentifier (of: Ref): TypeIdentifierType { - return { _class: core.class.TypeIdentifier, label: core.string.Id, icon: core.icon.TypeRef, of } +export function TypeIdentifier (of: Ref, showInPresenter: boolean): TypeIdentifierType { + return { _class: core.class.TypeIdentifier, label: core.string.Id, icon: core.icon.TypeRef, of, showInPresenter } } /** diff --git a/packages/ui/src/components/NestedDropdown.svelte b/packages/ui/src/components/NestedDropdown.svelte index 05f4c975a2..f6e466f49d 100644 --- a/packages/ui/src/components/NestedDropdown.svelte +++ b/packages/ui/src/components/NestedDropdown.svelte @@ -34,7 +34,7 @@ export let withIcon: boolean = false export let withSelectIcon: boolean = true export let disableFocusOnMouseover: boolean = false - export let withSearch: boolean = false + export let withSearch: boolean = true let container: HTMLElement let opened: boolean = false diff --git a/plugins/card-resources/src/components/CardAttributes.svelte b/plugins/card-resources/src/components/CardAttributes.svelte index c6c8e97b20..4d59d49106 100644 --- a/plugins/card-resources/src/components/CardAttributes.svelte +++ b/plugins/card-resources/src/components/CardAttributes.svelte @@ -59,7 +59,7 @@ }) function canChange (attr: AnyAttribute, permissionsStore: PermissionsStore): boolean { - return canChangeAttribute(attr, object.space as Ref, permissionsStore) + return canChangeAttribute(attr, object.space as Ref, permissionsStore, _class) } diff --git a/plugins/card-resources/src/components/CardPresenter.svelte b/plugins/card-resources/src/components/CardPresenter.svelte index 1e5de4ed21..e9c1d96f7a 100644 --- a/plugins/card-resources/src/components/CardPresenter.svelte +++ b/plugins/card-resources/src/components/CardPresenter.svelte @@ -14,7 +14,7 @@ --> {#if inline && cardObj} @@ -82,6 +101,7 @@ {/if} + {ids} {cardObj.title} @@ -106,6 +126,7 @@ {/if} + {ids} {cardObj.title} @@ -113,6 +134,7 @@ {/if} {:else} + {ids} {cardObj.title} {/if} diff --git a/plugins/card-resources/src/components/settings/ManageMasterTags.svelte b/plugins/card-resources/src/components/settings/ManageMasterTags.svelte index e6a45b0968..347200b2bc 100644 --- a/plugins/card-resources/src/components/settings/ManageMasterTags.svelte +++ b/plugins/card-resources/src/components/settings/ManageMasterTags.svelte @@ -15,7 +15,7 @@
- + { selectedType = e.detail }} diff --git a/plugins/setting-assets/lang/cs.json b/plugins/setting-assets/lang/cs.json index 7480c6c6e4..d9ad4e9091 100644 --- a/plugins/setting-assets/lang/cs.json +++ b/plugins/setting-assets/lang/cs.json @@ -209,6 +209,7 @@ "DefaultStartWithRecording": "Povolit záznam v nových kancelářích", "ImportDocumentPermission": "Importovat dokumenty", "ImportDocumentDescription": "Umožňuje uživatelům importovat dokumenty do pracovního prostoru", - "SelectUsers": "Vybrat uživatele" + "SelectUsers": "Vybrat uživatele", + "ShowInTitle": "Zobrazit v názvu" } } diff --git a/plugins/setting-assets/lang/de.json b/plugins/setting-assets/lang/de.json index 56c629309e..95cc12ae84 100644 --- a/plugins/setting-assets/lang/de.json +++ b/plugins/setting-assets/lang/de.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Aufnahme in neuen Büroräumen aktivieren", "ImportDocumentPermission": "Dokumente importieren", "ImportDocumentDescription": "Gewährt Benutzern die Möglichkeit, Dokumente in den Arbeitsbereich zu importieren", - "SelectUsers": "Benutzer auswählen" + "SelectUsers": "Benutzer auswählen", + "ShowInTitle": "Im Titel anzeigen" } } diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json index e3e714548b..24f9ef5810 100644 --- a/plugins/setting-assets/lang/en.json +++ b/plugins/setting-assets/lang/en.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Enable recording in new office rooms", "ImportDocumentPermission": "Import documents", "ImportDocumentDescription": "Grants users ability to import documents into the workspace", - "SelectUsers": "Select users" + "SelectUsers": "Select users", + "ShowInTitle": "Show in title" } } diff --git a/plugins/setting-assets/lang/es.json b/plugins/setting-assets/lang/es.json index cd330ea35d..77f7957728 100644 --- a/plugins/setting-assets/lang/es.json +++ b/plugins/setting-assets/lang/es.json @@ -202,6 +202,7 @@ "DefaultStartWithRecording": "Habilitar grabación en nuevas oficinas", "ImportDocumentPermission": "Importar documentos", "ImportDocumentDescription": "Otorga a los usuarios la capacidad de importar documentos al espacio de trabajo", - "SelectUsers": "Seleccionar usuarios" + "SelectUsers": "Seleccionar usuarios", + "ShowInTitle": "Mostrar en el título" } } diff --git a/plugins/setting-assets/lang/fr.json b/plugins/setting-assets/lang/fr.json index e1e4288147..8485e5e599 100644 --- a/plugins/setting-assets/lang/fr.json +++ b/plugins/setting-assets/lang/fr.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Activer l'enregistrement dans les nouveaux bureaux", "ImportDocumentPermission": "Importer des documents", "ImportDocumentDescription": "Accorde aux utilisateurs la possibilité d'importer des documents dans l'espace de travail", - "SelectUsers": "Sélectionner des utilisateurs" + "SelectUsers": "Sélectionner des utilisateurs", + "ShowInTitle": "Afficher dans le titre" } } diff --git a/plugins/setting-assets/lang/it.json b/plugins/setting-assets/lang/it.json index 0959eccc46..5b847c39ef 100644 --- a/plugins/setting-assets/lang/it.json +++ b/plugins/setting-assets/lang/it.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Abilita registrazione nelle nuove stanze dell'ufficio", "ImportDocumentPermission": "Importa documenti", "ImportDocumentDescription": "Concede agli utenti la possibilità di importare documenti nell'area di lavoro", - "SelectUsers": "Seleziona utenti" + "SelectUsers": "Seleziona utenti", + "ShowInTitle": "Mostra nel titolo" } } diff --git a/plugins/setting-assets/lang/ja.json b/plugins/setting-assets/lang/ja.json index 5553e7a45c..b890718834 100644 --- a/plugins/setting-assets/lang/ja.json +++ b/plugins/setting-assets/lang/ja.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "新しいオフィスルームで録画を有効にする", "ImportDocumentPermission": "ドキュメントをインポート", "ImportDocumentDescription": "ユーザーにワークスペースにドキュメントをインポートする機能を付与します", - "SelectUsers": "ユーザーを選択" + "SelectUsers": "ユーザーを選択", + "ShowInTitle": "タイトルに表示" } } diff --git a/plugins/setting-assets/lang/pt.json b/plugins/setting-assets/lang/pt.json index 29477a3ded..44b97a15c6 100644 --- a/plugins/setting-assets/lang/pt.json +++ b/plugins/setting-assets/lang/pt.json @@ -202,6 +202,7 @@ "DefaultStartWithRecording": "Habilitar gravação em novos escritórios", "ImportDocumentPermission": "Importar documentos", "ImportDocumentDescription": "Concede aos usuários a capacidade de importar documentos para o espaço de trabalho", - "SelectUsers": "Selecionar usuários" + "SelectUsers": "Selecionar usuários", + "ShowInTitle": "Mostrar no título" } } diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json index bbfa12b69d..b577f1b8d9 100644 --- a/plugins/setting-assets/lang/ru.json +++ b/plugins/setting-assets/lang/ru.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Включить запись в новых комнатах", "ImportDocumentPermission": "Импорт документов", "ImportDocumentDescription": "Предоставляет пользователям возможность импортировать документы в рабочее пространство", - "SelectUsers": "Выбрать пользователей" + "SelectUsers": "Выбрать пользователей", + "ShowInTitle": "Показывать в заголовке" } } diff --git a/plugins/setting-assets/lang/tr.json b/plugins/setting-assets/lang/tr.json index 5ce37e9b6a..5eae45bf96 100644 --- a/plugins/setting-assets/lang/tr.json +++ b/plugins/setting-assets/lang/tr.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "Yeni ofis odalarında kaydı etkinleştir", "ImportDocumentPermission": "Belgeleri içe aktar", "ImportDocumentDescription": "Kullanıcılara çalışma alanına belge içe aktarma yeteneği verir", - "SelectUsers": "Kullanıcıları seç" + "SelectUsers": "Kullanıcıları seç", + "ShowInTitle": "Başlıkta göster" } } diff --git a/plugins/setting-assets/lang/zh.json b/plugins/setting-assets/lang/zh.json index cd7bc1995d..90ef0b184c 100644 --- a/plugins/setting-assets/lang/zh.json +++ b/plugins/setting-assets/lang/zh.json @@ -211,6 +211,7 @@ "DefaultStartWithRecording": "在新办公室启用录制", "ImportDocumentPermission": "导入文档", "ImportDocumentDescription": "授予用户将文档导入工作区的权限", - "SelectUsers": "选择用户" + "SelectUsers": "选择用户", + "ShowInTitle": "在标题中显示" } } diff --git a/plugins/setting-resources/src/components/CreateRelation.svelte b/plugins/setting-resources/src/components/CreateRelation.svelte index 69ed80212c..966d55b2f6 100644 --- a/plugins/setting-resources/src/components/CreateRelation.svelte +++ b/plugins/setting-resources/src/components/CreateRelation.svelte @@ -162,6 +162,7 @@ {:else} { classARef = e.detail }} @@ -192,6 +193,7 @@
{ classBRef = e.detail }} diff --git a/plugins/setting-resources/src/components/EditAttribute.svelte b/plugins/setting-resources/src/components/EditAttribute.svelte index 491675f924..21a38322c6 100644 --- a/plugins/setting-resources/src/components/EditAttribute.svelte +++ b/plugins/setting-resources/src/components/EditAttribute.svelte @@ -134,6 +134,12 @@ defaultValue = e.detail?.defaultValue } + const onTypePatch = async (type: Type) => { + if (type !== undefined && type._class === attribute.type._class) { + await client.updateDoc(attribute._class, attribute.space, attribute._id, { type }) + } + } + async function remove (evt: MouseEvent): Promise { const impl = await getResource(view.actionImpl.Delete) await impl(attribute, evt, { @@ -165,7 +171,7 @@ return `${attr._id}_${forbidden ? 'forbidden' : 'allowed'}` as Ref } - function changeRestricted (e: CustomEvent): void { + function changeRestricted (): void { showPopup( MessageBox, { @@ -285,7 +291,8 @@ width: '100%', editable: !exist && !disabled, kind: 'regular', - size: 'large' + size: 'large', + onTypePatch }} {disabled} on:change={handleChange} diff --git a/plugins/setting-resources/src/components/typeEditors/IdentifierTypeEditor.svelte b/plugins/setting-resources/src/components/typeEditors/IdentifierTypeEditor.svelte index c61e095d19..3140e63f8b 100644 --- a/plugins/setting-resources/src/components/typeEditors/IdentifierTypeEditor.svelte +++ b/plugins/setting-resources/src/components/typeEditors/IdentifierTypeEditor.svelte @@ -13,15 +13,16 @@ // limitations under the License. --> @@ -77,6 +88,10 @@
{/if}
+ + +