From 4bd636887cb08c49feafd2362dd5c06ae200ad4c Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 9 Mar 2023 14:57:29 +0200 Subject: [PATCH 01/12] RED-6174 - added default values for environment variables in case they are not available --- .../src/app/services/notifications.service.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 42cb282be..399cc5734 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -13,6 +13,10 @@ import dayjs from 'dayjs'; const INCLUDE_SEEN = false; +const AVAILABLE_NOTIFICATIONS_DAYS = 30; +const AVAILABLE_OLD_NOTIFICATIONS_MINUTES = 60; +const NOTIFICATIONS_THRESHOLD = 1000; + @Injectable({ providedIn: 'root', }) @@ -81,14 +85,17 @@ export class NotificationsService extends EntitiesService { From 1866a8e234e2d787eaac5055ea6dc544c0c5f8df Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 9 Mar 2023 14:00:00 +0100 Subject: [PATCH 02/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3445 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 61f5f467b..d5f658662 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.977.0", + "version": "3.978.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 062df6f06e9bb5353877c3f92307430ed0e9b166..d07a2e884ed5c059d7c67e7fceb00947a21e9134 100644 GIT binary patch delta 3359 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 Date: Thu, 9 Mar 2023 21:32:15 +0200 Subject: [PATCH 03/12] RED-6174 - added some logs to check why some notifications are not shown (will be removed) --- .../src/app/services/notifications.service.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 399cc5734..93bcb1b60 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -89,6 +89,21 @@ export class NotificationsService extends EntitiesService Date: Thu, 9 Mar 2023 20:34:57 +0100 Subject: [PATCH 04/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5f658662..3c9314698 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.978.0", + "version": "3.979.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d07a2e884ed5c059d7c67e7fceb00947a21e9134..f32077ed08be36025a2233a41fd7b7b131aad58e 100644 GIT binary patch delta 75 zcmV-R0JQ)08uS{FcMJNS>p1Qc+p+z%`;meoC|aH6|8umX@~=pYBPRQnQC)x78eG6D he@gzIw{qQH{+_b}`L6;G Date: Fri, 10 Mar 2023 11:12:11 +0200 Subject: [PATCH 05/12] RED-6174 - updated docker-entrypoint values --- apps/red-ui/src/app/services/notifications.service.ts | 6 ++---- docker/red-ui/docker-entrypoint.sh | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 93bcb1b60..3a8297b12 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -99,10 +99,8 @@ export class NotificationsService extends EntitiesService /usr/share/nginx/html/ui/assets/config/config.json echo 'Env variables: ' From e527e10551525ad7c908897804f7f17ecfeeea99 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 10 Mar 2023 10:16:04 +0100 Subject: [PATCH 06/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c9314698..b4b719286 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.979.0", + "version": "3.980.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f32077ed08be36025a2233a41fd7b7b131aad58e..a8b3dd9cb576296ca76d49f97bbcd214246ca7b3 100644 GIT binary patch delta 3331 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 N{ReuZuDJkE003)-eHj1% delta 3331 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 Date: Fri, 10 Mar 2023 10:59:29 +0100 Subject: [PATCH 07/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4b719286..02c7f54e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.980.0", + "version": "3.981.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a8b3dd9cb576296ca76d49f97bbcd214246ca7b3..677d4e02c84983672ef2598fc396cf8cedb1f859 100644 GIT binary patch delta 105 zcmV-v0G9vs8uS{Fcvb7Q7p$MyjvYAbCn)$yuo<+bX1GG==UD2$u`PA^%O5qn&q)2T zwBh0M_dLft%m3$SN9A9U7)MO@Eu*^rur;`VSN@dzJ#Xc@z5Iif3-VtD0m$F6&7TYi LJ-|``08jt`SFAYV delta 105 zcmV-v0G9vs8uS{FcvWlHS$j`x#}4e(6BPU;*bG`zGh89`b1e1W*p|Bd<&T=(XQcjE z+VF7sd!Fr{<^OZEqw=pvj3XxdmQh`Q*cx2GD}PG Date: Fri, 10 Mar 2023 12:50:43 +0200 Subject: [PATCH 08/12] RED-6174 - updated var names --- docker/red-ui/docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh index 5a409c446..260f4d97e 100755 --- a/docker/red-ui/docker-entrypoint.sh +++ b/docker/red-ui/docker-entrypoint.sh @@ -46,9 +46,9 @@ echo '{ "BASE_TRANSLATIONS_DIRECTORY":"'"$BASE_TRANSLATIONS_DIRECTORY"'", "THEME":"'"$THEME"'", "ANNOTATIONS_THRESHOLD":"'"$ANNOTATIONS_THRESHOLD"'" - "AVAILABLE_NOTIFICATIONS_DAYS":"'"AVAILABLE_NOTIFICATIONS_DAYS"'" - "AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'" - "NOTIFICATIONS_THRESHOLD":"'"NOTIFICATIONS_THRESHOLD"'" + "AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'" + "AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'" + "NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'" }' > /usr/share/nginx/html/ui/assets/config/config.json echo 'Env variables: ' From 4883166dfda0db3b4426b80339a89d2f13a8d5ec Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 10 Mar 2023 11:53:31 +0100 Subject: [PATCH 09/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3442 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02c7f54e7..7e108b7b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.981.0", + "version": "3.982.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 677d4e02c84983672ef2598fc396cf8cedb1f859..589f9a1244ae89f417a850c0acdaa8e98d67fa5f 100644 GIT binary patch delta 3415 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 From 24cfd868c7719e99de969d542a2f32264e7a6921 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 10 Mar 2023 13:02:39 +0200 Subject: [PATCH 10/12] RED-6174 - forgot commas --- docker/red-ui/docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh index 260f4d97e..1f49ec007 100755 --- a/docker/red-ui/docker-entrypoint.sh +++ b/docker/red-ui/docker-entrypoint.sh @@ -45,9 +45,9 @@ echo '{ "MANUAL_BASE_URL":"'"$MANUAL_BASE_URL"'", "BASE_TRANSLATIONS_DIRECTORY":"'"$BASE_TRANSLATIONS_DIRECTORY"'", "THEME":"'"$THEME"'", - "ANNOTATIONS_THRESHOLD":"'"$ANNOTATIONS_THRESHOLD"'" - "AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'" - "AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'" + "ANNOTATIONS_THRESHOLD":"'"$ANNOTATIONS_THRESHOLD"'", + "AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'", + "AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'", "NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'" }' > /usr/share/nginx/html/ui/assets/config/config.json From 5bd1fae73fd2e9b4ee56d95ab6f6447a6487fb05 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 10 Mar 2023 12:11:26 +0100 Subject: [PATCH 11/12] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3442 -> 3446 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e108b7b5..9b2d412fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.982.0", + "version": "3.983.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 589f9a1244ae89f417a850c0acdaa8e98d67fa5f..8120c554312dff3305f9f04c006657056dd4d9c7 100644 GIT binary patch delta 3394 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 Date: Fri, 10 Mar 2023 17:41:54 +0200 Subject: [PATCH 12/12] RED-6364: fix licenses infos --- .../license-screen.component.html | 10 ++--- .../license-screen.component.ts | 2 +- .../src/app/services/license.service.ts | 37 +++++++++++-------- .../src/lib/reports/license-report.request.ts | 4 +- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html index 9c242f49f..30d8341cc 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html @@ -75,23 +75,23 @@
-
{{ licenseService.totalInfo.numberOfAnalyzedPages }}
+
{{ licenseService.annualInfo.numberOfAnalyzedPages }}
- {{ licenseService.currentInfo.numberOfAnalyzedPages }} + {{ licenseService.analyzedPagesInCurrentLicensingPeriod }} ({{ analysisPercentageOfLicense$ | async | number : '1.0-2' }}%)
-
+
-
{{ licenseService.unlicensedInfo.numberOfAnalyzedPages }}
+
{{ licenseService.unlicensedPages }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts index 0b9cbcd6c..b38bf630e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts @@ -50,7 +50,7 @@ export class LicenseScreenComponent { getAnalysisPercentageOfLicense() { const totalLicensedNumberOfPages = this.licenseService.totalLicensedNumberOfPages; - const numberOfAnalyzedPages = this.licenseService.currentInfo.numberOfAnalyzedPages; + const numberOfAnalyzedPages = this.licenseService.analyzedPagesInCurrentLicensingPeriod; return totalLicensedNumberOfPages > 0 ? (numberOfAnalyzedPages / totalLicensedNumberOfPages) * 100 : 100; } diff --git a/apps/red-ui/src/app/services/license.service.ts b/apps/red-ui/src/app/services/license.service.ts index aa66c4dd9..05dfb64d9 100644 --- a/apps/red-ui/src/app/services/license.service.ts +++ b/apps/red-ui/src/app/services/license.service.ts @@ -51,20 +51,16 @@ export class LicenseService extends GenericService { activeLicenseId: string; totalLicensedNumberOfPages = 0; currentInfo: ILicenseReport = {}; - totalInfo: ILicenseReport = {}; - unlicensedInfo: ILicenseReport = {}; + annualInfo: ILicenseReport = {}; + unlicensedPages = 0; + analyzedPagesInCurrentLicensingPeriod = 0; protected readonly _defaultModelPath = 'report'; readonly #licenseData$ = new BehaviorSubject(undefined); readonly #selectedLicense$ = new BehaviorSubject(undefined); constructor(private readonly _logger: NGXLogger) { super(); - this.selectedLicense$ = this.#selectedLicense$.pipe( - filter(license => !!license), - tap(license => { - this.totalLicensedNumberOfPages = this.getTotalLicensedNumberOfPages(license); - }), - ); + this.selectedLicense$ = this.#selectedLicense$.pipe(filter(license => !!license)); this.licenseData$ = this.#licenseData$.pipe( filter(licenses => !!licenses), tap(data => (this.activeLicenseId = data.activeLicense)), @@ -95,6 +91,8 @@ export class LicenseService extends GenericService { } async loadLicenseData(license: ILicense = this.selectedLicense) { + this.totalLicensedNumberOfPages = this.getTotalLicensedNumberOfPages(license); + const startDate = dayjs(license.validFrom); const endDate = dayjs(license.validUntil); @@ -102,16 +100,23 @@ export class LicenseService extends GenericService { startDate: startDate.toDate(), endDate: endDate.toDate(), }; - const reports: Promise[] = [this.getReport(currentConfig), this.getReport({})]; - if (endDate.isBefore(dayjs())) { - const unlicensedConfig = { - startDate: endDate.toDate(), - }; - reports.push(this.getReport(unlicensedConfig)); + const thisYearConfig = { + startDate: `${startDate.year()}-01-01T00:00:00.000Z`, + endDate: `${startDate.year()}-12-31T00:00:00.000Z`, + }; + const configs = [currentConfig, thisYearConfig]; + const reports = configs.map(config => this.getReport(config)); + + [this.currentInfo, this.annualInfo] = await Promise.all(reports); + + if (this.currentInfo.numberOfAnalyzedPages > this.totalLicensedNumberOfPages) { + this.unlicensedPages = this.currentInfo.numberOfAnalyzedPages - this.totalLicensedNumberOfPages; + this.analyzedPagesInCurrentLicensingPeriod = this.totalLicensedNumberOfPages; + } else { + this.unlicensedPages = 0; + this.analyzedPagesInCurrentLicensingPeriod = this.currentInfo.numberOfAnalyzedPages; } - - [this.currentInfo, this.totalInfo, this.unlicensedInfo] = await Promise.all(reports); } getTotalLicensedNumberOfPages(license: ILicense) { diff --git a/libs/red-domain/src/lib/reports/license-report.request.ts b/libs/red-domain/src/lib/reports/license-report.request.ts index f12577f42..796fb114a 100644 --- a/libs/red-domain/src/lib/reports/license-report.request.ts +++ b/libs/red-domain/src/lib/reports/license-report.request.ts @@ -2,7 +2,7 @@ import { List } from '@iqser/common-ui'; export interface ILicenseReportRequest { dossierIds?: List; - endDate?: Date; + endDate?: Date | string; requestId?: string; - startDate?: Date; + startDate?: Date | string; }