From 96a68ea04f5f8462fc89cad2e8b4e71f06641dd2 Mon Sep 17 00:00:00 2001 From: Alexey Zinoviev Date: Fri, 31 Oct 2025 12:37:38 +0400 Subject: [PATCH 1/4] eqms-1650: fix history message Signed-off-by: Alexey Zinoviev --- plugins/controlled-documents-assets/lang/cs.json | 1 + plugins/controlled-documents-assets/lang/de.json | 3 ++- plugins/controlled-documents-assets/lang/en.json | 1 + plugins/controlled-documents-assets/lang/fr.json | 1 + plugins/controlled-documents-assets/lang/it.json | 1 + plugins/controlled-documents-assets/lang/ja.json | 1 + plugins/controlled-documents-assets/lang/pt.json | 2 ++ plugins/controlled-documents-assets/lang/ru.json | 5 +++-- plugins/controlled-documents-assets/lang/tr.json | 1 + plugins/controlled-documents-assets/lang/zh.json | 3 ++- .../src/components/document/DocumentHistory.svelte | 6 +++++- plugins/controlled-documents-resources/src/plugin.ts | 1 + 12 files changed, 21 insertions(+), 5 deletions(-) diff --git a/plugins/controlled-documents-assets/lang/cs.json b/plugins/controlled-documents-assets/lang/cs.json index aa5522e1f7b..2cb5613fdcd 100644 --- a/plugins/controlled-documents-assets/lang/cs.json +++ b/plugins/controlled-documents-assets/lang/cs.json @@ -231,6 +231,7 @@ "DocumentInHierarchy": "Dokument v hierarchii", "FirstDraftVersion": "Toto je první konceptová verze dokumentu. Historie zatím není k dispozici.", + "FirstOrNotAvailable": "Toto je první dostupná verze dokumentu. Historie zatím není k dispozici nebo není dostupná.", "EffectiveDocumentLifecycle": "Životní cyklus účinného dokumentu", "ReasonAndImpact": "Důvod a dopad", "ImpactAnalysis": "Analýza dopadu", diff --git a/plugins/controlled-documents-assets/lang/de.json b/plugins/controlled-documents-assets/lang/de.json index 85646f9278c..d0e0bb39c6e 100644 --- a/plugins/controlled-documents-assets/lang/de.json +++ b/plugins/controlled-documents-assets/lang/de.json @@ -230,8 +230,9 @@ "DocumentInHierarchy": "Dokument in Hierarchie", "FirstDraftVersion": "Dies ist die erste Entwurfsversion des Dokuments. Es gibt noch keine Historie.", + "FirstOrNotAvailable": "Dies ist die erste verfügbare Version des Dokuments. Es gibt noch keine Versionshistorie oder sie ist nicht verfügbar.", - "EffectiveDocumentLifecycle": "Lebenszyklus des gültigen Dokuments", + "EffectiveDocumentLifecycle": "Effektiver Dokumentenlebenszyklus", "ReasonAndImpact": "Grund & Auswirkung", "ImpactAnalysis": "Auswirkungsanalyse", diff --git a/plugins/controlled-documents-assets/lang/en.json b/plugins/controlled-documents-assets/lang/en.json index 7151e33f3a7..c50e8c5774c 100644 --- a/plugins/controlled-documents-assets/lang/en.json +++ b/plugins/controlled-documents-assets/lang/en.json @@ -237,6 +237,7 @@ "DocumentInHierarchy": "Document in hierarchy", "FirstDraftVersion": "This is the first draft version of the document. There's no history yet.", + "FirstOrNotAvailable": "This is the first available version of the document. There's no history yet or it's not available.", "EffectiveDocumentLifecycle": "Effective document lifecycle", diff --git a/plugins/controlled-documents-assets/lang/fr.json b/plugins/controlled-documents-assets/lang/fr.json index f1464559867..388b4d7ac7f 100644 --- a/plugins/controlled-documents-assets/lang/fr.json +++ b/plugins/controlled-documents-assets/lang/fr.json @@ -199,6 +199,7 @@ "ArchiveDocsConfirm": "Voulez-vous vraiment archiver les documents suivants : {titles} ?", "DocumentInHierarchy": "Document dans la hiérarchie", "FirstDraftVersion": "Ceci est la première version brouillon du document. Il n'y a pas encore d'historique.", + "FirstOrNotAvailable": "Ceci est la première version disponible du document. Il n'y a pas encore d'historique ou il n'est pas disponible.", "EffectiveDocumentLifecycle": "Cycle de vie du document effectif", "ReasonAndImpact": "Raison et impact", "ImpactAnalysis": "Analyse d'impact", diff --git a/plugins/controlled-documents-assets/lang/it.json b/plugins/controlled-documents-assets/lang/it.json index 559ba5fd0e6..6ff616acdca 100644 --- a/plugins/controlled-documents-assets/lang/it.json +++ b/plugins/controlled-documents-assets/lang/it.json @@ -197,6 +197,7 @@ "ArchiveDocsConfirm": "Vuoi davvero archiviare i seguenti documenti: {titles}?", "DocumentInHierarchy": "Documento nella gerarchia", "FirstDraftVersion": "Questa è la prima versione bozza del documento. Non c'è ancora una storia.", + "FirstOrNotAvailable": "Questa è la prima versione disponibile del documento. Non c'è ancora una storia o non è disponibile.", "EffectiveDocumentLifecycle": "Ciclo di vita del documento effettivo", "ReasonAndImpact": "Motivo e Impatto", "ImpactAnalysis": "Analisi dell'impatto", diff --git a/plugins/controlled-documents-assets/lang/ja.json b/plugins/controlled-documents-assets/lang/ja.json index cf43ee8b8da..feacbedf087 100644 --- a/plugins/controlled-documents-assets/lang/ja.json +++ b/plugins/controlled-documents-assets/lang/ja.json @@ -202,6 +202,7 @@ "ArchiveDocsConfirm": "本当に次のドキュメントをアーカイブしますか: {titles}?", "DocumentInHierarchy": "階層内のドキュメント", "FirstDraftVersion": "これはドキュメントの最初のドラフトバージョンです。まだ履歴はありません。", + "FirstOrNotAvailable": "これはドキュメントの最初の利用可能なバージョンです。履歴がまだ存在しないか、利用できません。", "EffectiveDocumentLifecycle": "有効なドキュメントライフサイクル", "ReasonAndImpact": "理由と影響", "ImpactAnalysis": "影響分析", diff --git a/plugins/controlled-documents-assets/lang/pt.json b/plugins/controlled-documents-assets/lang/pt.json index e6ca2594bb7..e9229faa9e6 100644 --- a/plugins/controlled-documents-assets/lang/pt.json +++ b/plugins/controlled-documents-assets/lang/pt.json @@ -87,6 +87,8 @@ "AddApprovalDescription4": "se houver treinamento planejado, ele deve estar no status 'Liberado'", "NoApprovalsDescription": "Não há aprovações para esta versão do documento", "CurrentVersion": "Versão atual", + "FirstDraftVersion": "Esta é a primeira versão de rascunho do documento. Ainda não há histórico.", + "FirstOrNotAvailable": "Esta é a primeira versão disponível do documento. Ainda não há histórico ou não está disponível.", "Obsolete": "Obsoleto", "MakeDocumentObsolete": "Marcar como obsoleto", "MakeDocumentObsoleteConfirm": "Tem certeza de que deseja marcar os seguintes documentos como obsoletos: {titles}?", diff --git a/plugins/controlled-documents-assets/lang/ru.json b/plugins/controlled-documents-assets/lang/ru.json index ab5ac7d7de4..d087b2f8073 100644 --- a/plugins/controlled-documents-assets/lang/ru.json +++ b/plugins/controlled-documents-assets/lang/ru.json @@ -230,9 +230,10 @@ "ArchiveDocsConfirm": "Вы действительно хотите архивировать следующие документы: {titles}?", "DocumentInHierarchy": "Документ в иерархии", - "FirstDraftVersion": "Это первая рабочая копия документа. Для него пока нет истории.", + "FirstDraftVersion": "Это первая рабочая копия документа. Для него пока нет истории.", + "FirstOrNotAvailable": "Это первая доступная версия документа. История еще не создана или недоступна.", - "EffectiveDocumentLifecycle": "Жизненный цикл эффективного документа", + "EffectiveDocumentLifecycle": "Эффективный жизненный цикл документа", "ReasonAndImpact": "Причина и Воздействие", "ImpactAnalysis": "Анализ воздействия", diff --git a/plugins/controlled-documents-assets/lang/tr.json b/plugins/controlled-documents-assets/lang/tr.json index 892f90aab8a..c91cbc01d7f 100644 --- a/plugins/controlled-documents-assets/lang/tr.json +++ b/plugins/controlled-documents-assets/lang/tr.json @@ -202,6 +202,7 @@ "ArchiveDocsConfirm": "Şu dokümanları gerçekten arşivlemek istiyor musunuz: {titles}?", "DocumentInHierarchy": "Hiyerarşide doküman", "FirstDraftVersion": "Bu, dokümanın ilk taslak sürümü. Henüz geçmiş yok.", + "FirstOrNotAvailable": "Bu, dokümanın ilk kullanılabilir sürümüdür. Henüz geçmiş yoktur veya kullanılamıyor.", "EffectiveDocumentLifecycle": "Yürürlükteki doküman yaşam döngüsü", "ReasonAndImpact": "Neden ve Etki", "ImpactAnalysis": "Etki analizi", diff --git a/plugins/controlled-documents-assets/lang/zh.json b/plugins/controlled-documents-assets/lang/zh.json index 111ecfc5d3c..7b43dd17a9b 100644 --- a/plugins/controlled-documents-assets/lang/zh.json +++ b/plugins/controlled-documents-assets/lang/zh.json @@ -229,8 +229,9 @@ "DocumentInHierarchy": "层级中的文档", "FirstDraftVersion": "这是文档的第一个草稿版本。尚无历史记录。", + "FirstOrNotAvailable": "这是文档的第一个可用版本。尚无历史记录或不可用。", - "EffectiveDocumentLifecycle": "生效文档生命周期", + "EffectiveDocumentLifecycle": "有效的文档生命周期", "ReasonAndImpact": "原因与影响", "ImpactAnalysis": "影响分析", diff --git a/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte b/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte index e616ca62d48..ee785a0d359 100644 --- a/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte +++ b/plugins/controlled-documents-resources/src/components/document/DocumentHistory.svelte @@ -17,6 +17,7 @@ import { Label, Scroller } from '@hcengineering/ui' import { getClient } from '@hcengineering/presentation' import documents, { type ChangeControl } from '@hcengineering/controlled-documents' + import { getCurrentEmployee } from '@hcengineering/contact' import documentsRes from '../../plugin' import { @@ -26,6 +27,7 @@ import { documentCompareFn, getDocumentVersionString } from '../../utils' const client = getClient() + const me = getCurrentEmployee() let changeControls: Record, ChangeControl> = {} $: if ($documentReleasedVersions.length > 0) { @@ -54,6 +56,8 @@ }) .sort(documentCompareFn) + $: isExternalApprover = $controlledDocument?.externalApprovers?.includes(me) ?? false + function getDescription (cc: ChangeControl | undefined): string { if (cc === undefined) { return '' @@ -90,7 +94,7 @@ {/each} {:else} -