From 5f75cff1592454c64c25588ec6e79fe0707a2553 Mon Sep 17 00:00:00 2001 From: mkovalua Date: Wed, 6 May 2026 17:47:25 +0300 Subject: [PATCH 1/7] show registry.overview.endEmbargo for registration status if it is not set --- .../registry-statuses.component.html | 7 +++---- .../registry-statuses.component.ts | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html index 016932507..5ba34afb1 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html @@ -1,17 +1,16 @@ -

{{ 'registry.overview.statuses.' + registry()?.status + '.text' | translate }}

+

{{ statusTranslations().text | translate }}

-

{{ 'registry.overview.statuses.' + registry()?.status + '.short' | translate }}

+

{{ statusTranslations().short | translate }}

{{ - 'registry.overview.statuses.' + registry()?.status + '.long' - | translate: { embargoEndDate: embargoEndDate(), email: supportEmail } + statusTranslations().long | translate: { embargoEndDate: embargoEndDate(), email: supportEmail } }} diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index abf8b81e9..b36a67728 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -55,6 +55,23 @@ export class RegistryStatusesComponent { return date ? new Date(date).toDateString() : null; }); + statusTranslations = computed(() => { + const status = this.registry()?.status; + if (!status) { + return { + text: 'registry.overview.endEmbargo', + short: 'registry.overview.endEmbargo', + long: 'registry.overview.endEmbargo', + }; + } + const basePath = `registry.overview.statuses.${status}`; + return { + text: `${basePath}.text`, + short: `${basePath}.short`, + long: `${basePath}.long`, + }; + }); + openWithdrawDialog(): void { const registry = this.registry(); From c2b5849b3fe8b219984b5d9b87b71d5a626501dd Mon Sep 17 00:00:00 2001 From: mkovalua Date: Wed, 6 May 2026 18:19:14 +0300 Subject: [PATCH 2/7] resolve linter errors --- .../registry-statuses/registry-statuses.component.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html index 5ba34afb1..6fa7ed144 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html @@ -9,9 +9,7 @@

{{ statusTranslations().short | translate }}

- {{ - statusTranslations().long | translate: { embargoEndDate: embargoEndDate(), email: supportEmail } - }} + {{ statusTranslations().long | translate: { embargoEndDate: embargoEndDate(), email: supportEmail } }} @if (isAccepted()) { From 68bcd2a1e4037abe76265d23c1879283975c07bc Mon Sep 17 00:00:00 2001 From: mkovalua Date: Tue, 7 Jul 2026 16:25:59 +0300 Subject: [PATCH 3/7] resolve CR --- .../components/registry-statuses/registry-statuses.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index b36a67728..069bf824d 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -57,7 +57,7 @@ export class RegistryStatusesComponent { statusTranslations = computed(() => { const status = this.registry()?.status; - if (!status) { + if (!status || (status === 'None')) { return { text: 'registry.overview.endEmbargo', short: 'registry.overview.endEmbargo', From 93f41ff41f4cbd23a1d10720ae54394d4509cb23 Mon Sep 17 00:00:00 2001 From: mkovalua Date: Tue, 7 Jul 2026 16:33:25 +0300 Subject: [PATCH 4/7] resolve CR --- .../components/registry-statuses/registry-statuses.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index 069bf824d..55b5ec212 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -57,7 +57,7 @@ export class RegistryStatusesComponent { statusTranslations = computed(() => { const status = this.registry()?.status; - if (!status || (status === 'None')) { + if (!status || status === 'None') { return { text: 'registry.overview.endEmbargo', short: 'registry.overview.endEmbargo', From 6c6c276ebc52fb3c334f20f2939ba2666974469d Mon Sep 17 00:00:00 2001 From: mkovalua Date: Tue, 7 Jul 2026 16:55:28 +0300 Subject: [PATCH 5/7] Update src/app/features/registry/components/registry-statuses/registry-statuses.component.ts Co-authored-by: nsemets --- .../registry-statuses.component.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index 55b5ec212..0d49acc09 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -55,16 +55,13 @@ export class RegistryStatusesComponent { return date ? new Date(date).toDateString() : null; }); - statusTranslations = computed(() => { +statusTranslationKeys = computed(() => { + const defaultStatusKey = 'registry.overview.endEmbargo'; + const status = this.registry()?.status; - if (!status || status === 'None') { - return { - text: 'registry.overview.endEmbargo', - short: 'registry.overview.endEmbargo', - long: 'registry.overview.endEmbargo', - }; - } - const basePath = `registry.overview.statuses.${status}`; + const basePath = + !status || status === RegistryStatus.None ? defaultStatusKey : `registry.overview.statuses.${status}`; + return { text: `${basePath}.text`, short: `${basePath}.short`, From 821febf456d9b4ec954d10301441d45588291581 Mon Sep 17 00:00:00 2001 From: mkovalua Date: Tue, 7 Jul 2026 17:00:27 +0300 Subject: [PATCH 6/7] resolve linter issues --- .../components/registry-statuses/registry-statuses.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index 0d49acc09..d75a2e038 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -55,7 +55,7 @@ export class RegistryStatusesComponent { return date ? new Date(date).toDateString() : null; }); -statusTranslationKeys = computed(() => { + statusTranslationKeys = computed(() => { const defaultStatusKey = 'registry.overview.endEmbargo'; const status = this.registry()?.status; From 31fb6d7a1870b8e2866127627e10ceb8b47787d2 Mon Sep 17 00:00:00 2001 From: mkovalua Date: Tue, 7 Jul 2026 17:05:09 +0300 Subject: [PATCH 7/7] update code --- .../components/registry-statuses/registry-statuses.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts index d75a2e038..85e9e8497 100644 --- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts +++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts @@ -55,7 +55,7 @@ export class RegistryStatusesComponent { return date ? new Date(date).toDateString() : null; }); - statusTranslationKeys = computed(() => { + statusTranslations = computed(() => { const defaultStatusKey = 'registry.overview.endEmbargo'; const status = this.registry()?.status;