From b83e7a0e15b0de94190d89c768ab17a74098a8a2 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 3 May 2022 16:56:05 +0300 Subject: [PATCH 01/30] RED-3966 - As a user I want to set/edit the justification of an imported redaction --- apps/red-ui/src/app/models/file/annotation.permissions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index 2c5d1e02d..8e9ee5082 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -44,7 +44,7 @@ export class AnnotationPermissions { (annotation.isRedacted || annotation.isSkipped || annotation.isHint) && !annotation.pending; - permissions.canChangeLegalBasis = annotation.isRedacted && !annotation.imported && !annotation.pending; + permissions.canChangeLegalBasis = annotation.isRedacted && !annotation.pending; permissions.canRecategorizeImage = ((annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage) && !annotation.pending; From ac60d7cc2b88e8944b073229fce172ca4ca669c4 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 3 May 2022 15:58:40 +0200 Subject: [PATCH 02/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3248 -> 3247 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a159797d..3489a8446 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.451.0", + "version": "3.452.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 279150e4a1e20797f7e49866baf6f5eac403b2a5..59bdcf47207552ff2177b84ded3734d61b733b19 100644 GIT binary patch literal 3247 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 Date: Tue, 3 May 2022 19:13:45 +0300 Subject: [PATCH 03/30] RED-3800 error message parsing --- apps/red-ui/src/assets/config/config.json | 4 ++-- libs/common-ui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 684210fa7..0cb5f13c3 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/libs/common-ui b/libs/common-ui index 2998cb076..fd9d62241 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 2998cb076f802a2bfb8694742c2c35a36ae687b8 +Subproject commit fd9d622413547de842439e8d91ee4316f2facff1 From 2ca93e4a135a32fe095d564c45dd3250e957d1cc Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 3 May 2022 18:16:18 +0200 Subject: [PATCH 04/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3247 -> 3248 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3489a8446..7ce869fae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.452.0", + "version": "3.453.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 59bdcf47207552ff2177b84ded3734d61b733b19..53f3a6730fca594c0cc51aa61bf1f64c96f4ad7e 100644 GIT binary patch delta 2623 zcmV-F3c&TR8L%0DABzY80000000ZqC$#Uejb1Ur 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 Zo(u+)o(u*K=kh;M{tKy&UWEWq008}B3DW=o From 05edefe569aedcb89b461198b95e93402d31be2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 3 May 2022 23:26:16 +0300 Subject: [PATCH 05/30] RED-3688: Paligo featured content --- paligo-styles/homepage.scss | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/paligo-styles/homepage.scss b/paligo-styles/homepage.scss index 7256c0b92..b38122cbb 100644 --- a/paligo-styles/homepage.scss +++ b/paligo-styles/homepage.scss @@ -11,31 +11,28 @@ .publication-icon { background-color: variables.$red-1; } + + width: 280px; } -.portal-contents { +.featured-content-label { + margin-top: 24px; + text-align: center; +} + +.featured-content { margin-top: 24px; margin-bottom: 0; .inner { margin: 0; - display: grid; - grid-template-columns: 1fr 1fr; - grid-gap: 24px; - - &::before { - content: none; - } + justify-content: center; } -} -.publication-contents { - @include mixin.card; -} - -@media only screen and (max-width: 768px) { - .portal-contents .inner { - grid-template-columns: 1fr; + .publication-contents { + @include mixin.card; + width: 250px; + margin: 0 15px !important; } } From 1f56e7ba4fc246671afdd169a26a6be45d7cbb36 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 3 May 2022 22:29:32 +0200 Subject: [PATCH 06/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3248 -> 3245 bytes paligo-theme/paligo-styles/redacto-theme.css | 57 +++++++++---------- 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 7ce869fae..2798e7bbc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.453.0", + "version": "3.454.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 53f3a6730fca594c0cc51aa61bf1f64c96f4ad7e..c452809fbb35ee5514a9e84ea31a37895721265e 100644 GIT binary patch literal 3245 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 diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css index b475625a2..7a028fe0e 100644 --- a/paligo-theme/paligo-styles/redacto-theme.css +++ b/paligo-theme/paligo-styles/redacto-theme.css @@ -59,6 +59,7 @@ } .portal-single-publication { background-color: transparent; + width: 280px; } .portal-single-publication > a { border-radius: 4px; @@ -67,78 +68,74 @@ background-color: #dd4d50; } -.portal-contents { +.featured-content-label { + margin-top: 24px; + text-align: center; +} + +.featured-content { margin-top: 24px; margin-bottom: 0; } -.portal-contents .inner { +.featured-content .inner { margin: 0; - display: grid; - grid-template-columns: 1fr 1fr; - grid-gap: 24px; + justify-content: center; } -.portal-contents .inner::before { - content: none; -} - -.publication-contents { +.featured-content .publication-contents { padding: 24px 40px; border: 1px solid #e2e4e9; width: 100%; margin: 0; background-color: #fff; border-radius: 4px; + width: 250px; + margin: 0 15px !important; } -.publication-contents h4.featured-title, -.publication-contents .section-toc-title { +.featured-content .publication-contents h4.featured-title, +.featured-content .publication-contents .section-toc-title { margin: 0; } -.publication-contents h4.featured-title a, -.publication-contents .section-toc-title a { +.featured-content .publication-contents h4.featured-title a, +.featured-content .publication-contents .section-toc-title a { color: #283241; } -.publication-contents h4.featured-title a:hover, -.publication-contents .section-toc-title a:hover { +.featured-content .publication-contents h4.featured-title a:hover, +.featured-content .publication-contents .section-toc-title a:hover { color: #283241; text-decoration: underline; } -.publication-contents .section-toc-title { +.featured-content .publication-contents .section-toc-title { font-size: 28px; font-weight: 300; line-height: 36px; } -.publication-contents ul { +.featured-content .publication-contents ul { margin: 0; padding: 0; } -.publication-contents li { +.featured-content .publication-contents li { margin: 4px 0; } -.publication-contents li:first-child { +.featured-content .publication-contents li:first-child { margin-top: 20px; } -.publication-contents li:last-child { +.featured-content .publication-contents li:last-child { margin-bottom: 40px; } -.publication-contents li a { +.featured-content .publication-contents li a { color: #dd4d50; font-size: 16px; line-height: 24px; } -.publication-contents li a:hover { +.featured-content .publication-contents li a:hover { color: #dd4d50; text-decoration: underline; } -.publication-contents h4 span, -.publication-contents li::before { +.featured-content .publication-contents h4 span, +.featured-content .publication-contents li::before { display: none; } -@media only screen and (max-width: 768px) { - .portal-contents .inner { - grid-template-columns: 1fr; - } -} /* Einleitung */ .cat-panel-1:before { content: "\f277"; From c31e19358881912e20ccfa72d0dd6adf03158808 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 4 May 2022 11:13:23 +0300 Subject: [PATCH 07/30] RED-3800 performance --- apps/red-ui/ngsw-config.json | 8 ++++++++ docker/common/nginx/nginx.conf | 2 +- libs/common-ui | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/ngsw-config.json b/apps/red-ui/ngsw-config.json index 5b78c22f4..90d383880 100644 --- a/apps/red-ui/ngsw-config.json +++ b/apps/red-ui/ngsw-config.json @@ -16,6 +16,14 @@ "resources": { "files": ["/assets/**", "/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"] } + }, + { + "name": "pdftron", + "installMode": "prefetch", + "updateMode": "prefetch", + "resources": { + "files": ["/assets/wv-resources/**/*.*"] + } } ] } diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index 752051c54..26e32461a 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -6,7 +6,7 @@ server { root /usr/share/nginx/html; # SSL stuff for cloudflare proxy-ing - ignores SSL certificate and uses SNI - add_header Content-Security-Policy "default-src 'self'; script-src 'self' data: 'unsafe-eval'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self'; script-src 'inline'; script-src 'self' data: 'unsafe-eval'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; proxy_ssl_verify off; proxy_read_timeout 1m; diff --git a/libs/common-ui b/libs/common-ui index fd9d62241..d8c2a342b 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit fd9d622413547de842439e8d91ee4316f2facff1 +Subproject commit d8c2a342baa6acb330132c44000562bdd823f620 From 8175e0b81821eb568864602caad43e4cc1fb455c Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 4 May 2022 11:14:21 +0300 Subject: [PATCH 08/30] RED-3800 performance --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index d8c2a342b..83f2fbd88 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d8c2a342baa6acb330132c44000562bdd823f620 +Subproject commit 83f2fbd88feb455d27397f470b9cadf72aa3471e From 896731ae6b76f88d98a4e18ec1651cabfa6ada14 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 10:16:54 +0200 Subject: [PATCH 09/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3245 -> 3246 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2798e7bbc..645a0ba08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.454.0", + "version": "3.455.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c452809fbb35ee5514a9e84ea31a37895721265e..7f182f6d8cc68e6893c30dab2c11a2776f8ee84c 100644 GIT binary patch delta 3158 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 delta 3157 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 Date: Wed, 4 May 2022 11:19:58 +0300 Subject: [PATCH 10/30] RED-3800 csp fix --- docker/common/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index 26e32461a..243242264 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -6,7 +6,7 @@ server { root /usr/share/nginx/html; # SSL stuff for cloudflare proxy-ing - ignores SSL certificate and uses SNI - add_header Content-Security-Policy "default-src 'self'; script-src 'inline'; script-src 'self' data: 'unsafe-eval'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self'; script-src 'self' data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; proxy_ssl_verify off; proxy_read_timeout 1m; From 416f6e59f39186fb489f404380912429e93249a4 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 10:22:22 +0200 Subject: [PATCH 11/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3246 -> 3247 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 645a0ba08..88757f5a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.455.0", + "version": "3.456.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7f182f6d8cc68e6893c30dab2c11a2776f8ee84c..87c50018e21746f02f885768442d296bbb2a352a 100644 GIT binary patch delta 3128 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 S?cDyy+J68!*oDpjPyhfxBpCew delta 3127 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 Date: Wed, 4 May 2022 11:30:26 +0300 Subject: [PATCH 12/30] RED-3800 csp fix --- docker/common/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index 243242264..4c51b152e 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -6,7 +6,7 @@ server { root /usr/share/nginx/html; # SSL stuff for cloudflare proxy-ing - ignores SSL certificate and uses SNI - add_header Content-Security-Policy "default-src 'self'; script-src 'self' data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'blob' data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; proxy_ssl_verify off; proxy_read_timeout 1m; From 031e610f3114239f166be971e18340c721139303 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 10:33:09 +0200 Subject: [PATCH 13/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3247 -> 3247 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 88757f5a6..d055f42a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.456.0", + "version": "3.457.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 87c50018e21746f02f885768442d296bbb2a352a..821ad4b05d43cddb0adfd654a8de369f0545c121 100644 GIT binary patch delta 3093 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 Date: Wed, 4 May 2022 13:19:39 +0300 Subject: [PATCH 14/30] RED-3198: show remove only here for redacted images --- apps/red-ui/src/app/models/file/annotation.permissions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index 8e9ee5082..7ce766bc0 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -38,7 +38,7 @@ export class AnnotationPermissions { permissions.canMarkAsFalsePositive = annotation.canBeMarkedAsFalsePositive && annotationEntity.hasDictionary; permissions.canRemoveOrSuggestToRemoveOnlyHere = - (annotation.isRedacted || annotation.isHint) && !annotation.pending && !annotation.isImage; + !annotation.pending && (annotation.isRedacted || (annotation.isHint && !annotation.isImage)); permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint) && From 7af39d97ad1eb635eeb4f2bc4b426de57a3962ea Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 12:21:57 +0200 Subject: [PATCH 15/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3247 -> 3246 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d055f42a1..5a5aaafdc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.457.0", + "version": "3.458.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 821ad4b05d43cddb0adfd654a8de369f0545c121..ce8fc64cffa3770dab306d56179a2304f84eabec 100644 GIT binary patch delta 3158 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 delta 3159 zcmV-d45;(28Lt_TcYk~SV(GuI9XoLR7by5quo<+bX1GG=r`YPhvCVb)%O5p+%t-yQ zwBdC5d!A#T<^NN(z4EU}j3Xw;=22aL*dAQK3x7)fp0lu*o%{nkSc3c)fxmo#?2k*T zx&5EZ|8^Tppl{9TB@OYwIFe;qN$ z5px_d#}RWJF~{L^ei_rc%<$vq^*t^xuU}rwIes{^Qi5Yrp}$`s^vnRIEmoAUc%}7)1!Kh)ur?x%x}P<{Rg?-u zw)nxir!h+bmTjxR)(AJO;J?eFri>QQQ;`fa`j#AqJ%4XMt%Q;+7CXsZ9NYes0}YFc z^AS1a1FDOR#^{sSi-Q>N2CWLmw5fse7B2&zlO#D2m-QMHAtGs!b%HNS98vbTM)rJp zBCy%>b{=YrrWcOX3rz={)iHt{Grz=fO!Ex@aDm^>@+c@F%iG1h{Ba1PY8c^oRV_wB zPj}$CIDef$G?)`E5|3IQHW} zK)QInB{9XQ$g@XOM-?GC!g-9Ylq0g_=j~d+GM{Trg1+1G!F;v{k`3hPeo~04fu|X< z$|lTcgt-VN$QbZdV(YF3X21aN6~Zk{oy-2gg@1G9hee}F)Km`76M|U-Aps16c!4Jw z4oM~r(ax&5QuP^mU=|N2K=mThDufBlB!GcgY&B-IdQS6PYDj1LgoM5W$4-;SZk~#R z0f@>E*;(snk7FfGv(f$$m-ysX5nyL4HLRwrpjn1HWe5h=-9}CTd;g;K)tGC}@pPsB zZht1DEF-g{mx6JML=P*XcI}Y!&p-p=XCZ=(X8Bq8wC3k|SScoKY%;|miAhvcxHZzC z8KmO29y^}b4{W_sl&8#S;(s625 z#XgNN0GDACv{9ILJbk)`cD7Xy92SPa!GHBn-^!qNyA3~%+NC}Mzm*?)TO;uzx-R`E|-_x>c1A%U6K{|gSGC| zT03(3wSNI_G&STx?_hI?A9N7j6bQ$@?LmA&@`k-5)t2P%f8b0-R#_DZ%?7~yNq>Co zr3ws3X+@)y(TxeEU=m8=^-#WPqBLppJK^{B^^0jN+SaDWD6u zFw(-A* z8}D%V&7c1LkAK$aDt-Tblh6%8Usa$U`SlRm^l1nrMS5mnRith*HWjlb0e}3rY}d&J z94Mw;oGATMZ^<27n({sS^gfM;S0Uu%9 z`(Ro$%p}LVe2l=y6hG>_)PFfGOTsjUai`seKGUnEGFf2-IcHQg+psn|XGIH>qF^HW zgbbd@UuwQ5RARqOv^2Ygun)REHj1J8gEE-c=3oOvrxLT>NfHNX;di_{Itnsv4!Q7W zW&~hBKfwl`baUrXQ9g>=h#A&yT&;=)JkbNWtt*%;1}uxdsX;Ih;YQ246{ZQ zUk0OAwF!Yb*PbEQ6MuZuEO(6{Kmm`a4&o>h#&QU{?QbDFt|x%bkmES&B#6Ion2{K? z@7B9rVOt%{3)WAt82_;NVdd89Ho-}#&J7ua#T!dRoNHAN^$C2foj8d`-aW2zJ`jho zts!uq!hUNcJ~UVvn12dRF?^`~S*ss?WN9bCc&>oO$9gsApETuUg zfB^E_3Q*v|qWJZDoX6nb;pfu;+j&-O3PZIH;+QsA8qe9&(mR|U3fUs z=NwpLF@dYjx3!t*W1yuFAMAx@;_+CJ>SfW+|Lr`fX@BldeED+_g(L2K4#Jpy&_2(& z;W>`6y-1e);>GJi=N!MaM#oW$!@45fXyzQoX#~D7ztd8kcA3+nJj#C@B}P6-of5K2 zsUJXO{~b=}N{m2o#4ju%gd5WJ!GQDmVfUDyi}iI)G5UPCC@D?ygwsY+p99r|;uI+Z6vLT||Vl z=qj*3MV7c^zE%l9sV9+dzx9Z>KPA%b4}UJ1)Em`a^n);Ie~rbTkw{lMe^J?CS8B+W z3T~xDtyLR+lL?ok+OJYKE^cr0=AxQyc(6067sI3Y)WK*!fXMi9u;VUf>p}+OiZ$@y zN?wN+iNzjEay^bB`&zAdJ5z+;0g==9rs|~5#_p?Fcjicm48Az_wm~SwoX607v-~3r3jRxom7n5@x7_tBi8~93`bwHcECT!

aMD;aJwSxF1=1otS!B#dQ+M2NzmL+#mXb6aQ(z(^z;zh~1OqgAfA^ zq9XetMDJLLzNbP|ROi`Va8RUqqY&@36hT59M~eHLk62>%VBO%+$?hb8q==fSJO7{i xp8=iQxt-g&o!hyc+qs?Fxt-g&o!hyc+qs?Fxt-g&o!kFd`wyqbZ0i6}0057EEt>!U From 90778aac7f33066c6bf5b2f8acf77d29e8829816 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 4 May 2022 13:39:38 +0300 Subject: [PATCH 16/30] RED-3784: change type label for suggest add to false positive --- apps/red-ui/src/app/models/file/annotation.wrapper.ts | 11 +++++++++-- .../app/translations/annotation-types-translations.ts | 7 ++++++- apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 509b98f4d..0ce9794ae 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -1,4 +1,4 @@ -import { annotationTypesTranslations } from '../../translations/annotation-types-translations'; +import { annotationTypesTranslations, SuggestionAddFalsePositive } from '../../translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Highlight, IComment, IManualChange, IPoint, IRectangle, LogEntryStatus, ManualRedactionType } from '@red/domain'; import { RedactionLogEntry } from '@models/file/redaction-log.entry'; @@ -292,11 +292,18 @@ export class AnnotationWrapper implements IListable, Record { this._createContent(annotationWrapper, redactionLogEntry); this._setSuperType(annotationWrapper, redactionLogEntry); this._handleRecommendations(annotationWrapper, redactionLogEntry); - annotationWrapper.typeLabel = annotationTypesTranslations[annotationWrapper.superType]; + annotationWrapper.typeLabel = this.#getTypeLabel(redactionLogEntry, annotationWrapper); return annotationWrapper; } + static #getTypeLabel(redactionLogEntry: RedactionLogEntry, annotation: AnnotationWrapper): string { + if (redactionLogEntry.reason?.toLowerCase() === 'false positive') { + return annotationTypesTranslations[SuggestionAddFalsePositive]; + } + return annotationTypesTranslations[annotation.superType]; + } + private static _handleRecommendations(annotationWrapper: AnnotationWrapper, redactionLogEntry: RedactionLogEntry) { if (annotationWrapper.superType === SuperTypes.Recommendation) { annotationWrapper.recommendationType = redactionLogEntry.type; diff --git a/apps/red-ui/src/app/translations/annotation-types-translations.ts b/apps/red-ui/src/app/translations/annotation-types-translations.ts index 9def2207e..289292d8f 100644 --- a/apps/red-ui/src/app/translations/annotation-types-translations.ts +++ b/apps/red-ui/src/app/translations/annotation-types-translations.ts @@ -1,7 +1,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { SuperType, SuperTypes } from '@models/file/super-types'; -export const annotationTypesTranslations: { [key in SuperType]: string } = { +export const SuggestionAddFalsePositive = 'suggestion-add-false-positive' as const; + +type TranslationKey = SuperType & typeof SuggestionAddFalsePositive; + +export const annotationTypesTranslations: Record = { [SuperTypes.TextHighlight]: _('annotation-type.text-highlight'), [SuperTypes.DeclinedSuggestion]: _('annotation-type.declined-suggestion'), [SuperTypes.Hint]: _('annotation-type.hint'), @@ -19,4 +23,5 @@ export const annotationTypesTranslations: { [key in SuperType]: string } = { [SuperTypes.SuggestionRemove]: _('annotation-type.suggestion-remove'), [SuperTypes.SuggestionRemoveDictionary]: _('annotation-type.suggestion-remove-dictionary'), [SuperTypes.SuggestionResize]: _('annotation-type.suggestion-resize'), + [SuggestionAddFalsePositive]: _('annotation-type.suggestion-add-false-positive'), } as const; diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 702feb6a6..9ecf220fb 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -344,6 +344,7 @@ "skipped": "Übersprungen", "suggestion-add": "Vorschlag für Schwärzung", "suggestion-add-dictionary": "Vorschlag für neuen Wörterbucheintrag", + "suggestion-add-false-positive": "", "suggestion-change-legal-basis": "Vorschlag für Änderung der Rechtsgrundlage", "suggestion-force-hint": "", "suggestion-force-redaction": "Vorschlag für erzwungene Schwärzung", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index fa2de2d63..498a5d53d 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -344,6 +344,7 @@ "skipped": "Skipped", "suggestion-add": "Suggested redaction", "suggestion-add-dictionary": "Suggested dictionary add", + "suggestion-add-false-positive": "Suggested add to false positive", "suggestion-change-legal-basis": "Suggested change legal basis", "suggestion-force-hint": "Suggestion force hint", "suggestion-force-redaction": "Suggestion force redaction", From 281d03de25f15e08227565575842e790abdfe542 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 12:41:59 +0200 Subject: [PATCH 17/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3246 -> 3247 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a5aaafdc..b86801f49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.458.0", + "version": "3.459.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ce8fc64cffa3770dab306d56179a2304f84eabec..f2d37b28113a315c92f45d2078c866215b2feb05 100644 GIT binary patch delta 104 zcmV-u0GI!+8Lt_TcvRkU5xlS+J8%{+Q1GK*GiXiCaD~uMvDJTLo9ptIKWg@vk@{n4 z!|C$(JjXrD|EFks Date: Wed, 4 May 2022 14:59:09 +0300 Subject: [PATCH 18/30] RED-3958: return annotation value for false recommendations --- .../services/annotation-actions.service.ts | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index faa35213f..5d33b65f1 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts @@ -501,19 +501,26 @@ export class AnnotationActionsService { } private _getFalsePositiveText(annotation: AnnotationWrapper) { - if (annotation.canBeMarkedAsFalsePositive) { - let text: string; - if (annotation.hasTextAfter) { - text = getFirstRelevantTextPart(annotation.textAfter, 'FORWARD'); - return text ? (annotation.value + text).trim() : annotation.value; - } - if (annotation.hasTextAfter) { - text = getFirstRelevantTextPart(annotation.textBefore, 'BACKWARD'); - return text ? (text + annotation.value).trim() : annotation.value; - } else { - return annotation.value; - } + if (!annotation.canBeMarkedAsFalsePositive) { + return; } + + if (annotation.isRecommendation) { + return annotation.value; + } + + let text: string; + if (annotation.hasTextAfter) { + text = getFirstRelevantTextPart(annotation.textAfter, 'FORWARD'); + return text ? (annotation.value + text).trim() : annotation.value; + } + + if (annotation.hasTextBefore) { + text = getFirstRelevantTextPart(annotation.textBefore, 'BACKWARD'); + return text ? (text + annotation.value).trim() : annotation.value; + } + + return annotation.value; } private _convertPath(path: string): string { From 89fdadd8abd5704ee7e5b0c6c1925e2b285f8ba9 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 14:01:39 +0200 Subject: [PATCH 19/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3247 -> 3245 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b86801f49..20a05d70b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.459.0", + "version": "3.460.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f2d37b28113a315c92f45d2078c866215b2feb05..8f17ce6bdce4e7e4fa141669b71fc406feb601b9 100644 GIT binary patch delta 103 zcmV-t0GR);8Lb(RcT+C{*N1+`4(#9s3Vsx92CbjpXFF&4{}gSn{3{aUh{>^eRM#K22N&?dpOU}lEbL`3f8Skz{1-vszOl^P3kWj4 Js(=7c0086~F=7A! delta 105 zcmV-v0G9u)8Lt_TcU1@8auK|+9XoIqFHrEKU^8e<&2WX#PqEd1W1H*pmp^Lun34Kp zX~XIA_dLfv%m1fnd*xq|7)MNw&7->husyhd7ygv|J!fGrJNf%g;DY=Yf$zVu%G(PF LN8(dx08jt`O|drk From 4ad3722f89cf26bad3daf40753bbeabc0c64d416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 4 May 2022 20:43:20 +0300 Subject: [PATCH 20/30] RED-3688: smaller font size for li --- paligo-styles/homepage.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/paligo-styles/homepage.scss b/paligo-styles/homepage.scss index b38122cbb..cfbe08a30 100644 --- a/paligo-styles/homepage.scss +++ b/paligo-styles/homepage.scss @@ -33,6 +33,11 @@ @include mixin.card; width: 250px; margin: 0 15px !important; + + li a { + font-size: inherit; + line-height: inherit; + } } } From 2b73ec8549643a30c724f194fb8e25e3859041ac Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 4 May 2022 19:45:40 +0200 Subject: [PATCH 21/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3245 -> 3261 bytes paligo-theme/paligo-styles/redacto-theme.css | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 20a05d70b..389284f9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.460.0", + "version": "3.461.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8f17ce6bdce4e7e4fa141669b71fc406feb601b9..870efdf09e91bf47e1cc2a9dbac32b639ddcf92a 100644 GIT binary patch delta 2996 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 delta 3006 zcmV;v3qka~8Lb(RAb*=_(!O*$P15$IFCYnuh$)gwf@^y_p6PG&sW17AyzQU#OL_o; z6hMNytT#!g6*93TTn^3+=LYQjroO8GLr_h2y)P?=J$^ zhknNn?BE3oeiUp5t*IHV5c(;$`fqG=UH^eRM#K22N&?dpOU}lEbL`3f8Skz{1-vszCiZJCDq*i&*lF*N^w;ahA#j7?N`?7 z^5w;Ax-E-}p{B~NE>p(JdVO<~6gjKso1)lc1edg)N5%FA6vF*=g10n#{QQq4$$#|? z&g(U0IGf#XQh)Z^o_V(Y(w_O^Zy^3I#NVa(yMn)tnB#~!j+oo~mzUQsFXkLSoLMQsF{#ksFA#cX(L5#(YvjCyUn!xm{~Gy$T|T_Lcp9u&uS1d) z6%i{#9NlfIqRC?`Dzc(lqfgwG=lafg9ZDUsgfqjc>3=)2Mhl;BAiM76wwxm9%V

    e& zWl>W`3+Smxh8cZJ4#S?epH@Oi7K@$aE{<(~%7KPO#rcSw@&VOFMq~6z?8QNhcY{`i zW7^a}d4G$SfzL^joQTVM4T=zvw8%Qa7bT7;dt4)XzC01w?0Gv6wMEklN9u*91J3Fg z!H$_<;y9-H1^~FgZ)bTFl#u1^;$HqZ1W`4NaJ;G(BcZ1|@LZhEq`X)K$GgN8$=ORI z{ZUiZysIo|&PZj@1)FPw_}@N`gmqfHmHaj+P=6fzaUdXFyxx+SVpQbWBdVi{kR0JW zMpw!aS@QFCEnu0?wI)H|ZTVn6+XKl4@^n8bMAg94j96t8W;DWF1QTQo_$sk=R|7L( zfcFaF7N*W+|KP&8^24IhBx)*$=Lx~AfsghG=KiT&enuJTQxg6QFt# zX@3>M1ZEPzz$~^JGg>{Tc`h}iGkror-+^PN$zwN9#lZkX<%jI7^|QyZlBU^c|AY0wN(aochV<`Ys;teLwyGEVUp z(s&%Xb(4*cUVmmzQiqIcko?|B9KC*>(5hxulv3$9HLGHuMi_w0unF2IOgo-FT|+zD zss|1WL*U^0r*CCYyWNH#N9|G{f#1rHKOVqSHT0Ho{Tk&(yYa=%XXs0sXN0mQ-+!Rb zZZ75k!h$_WW;yE8-l|{zEpeC2%Wm~wi|Q`Piu=J@cWSL2IsMwd05_T%a-nyyIm8b- z2yY66W8d~5z94zS-jQlc^7lV*rXs7XiiBnZVE!aN_EH6gqqL$?%IL;~QZNZ6@p>rV zG*Ox~`JM3l`ufE*7H+@(%aG)-Gk?tykCZwBi;z@F_Wt`QCD31^uSKQc4>-pgQq_Zf zmXnh6SN%R;7g+}TaGrfZDl$p*Y7*&{-vj$?QP&jE1zZ^E;lg>i#~B-eyqyHOj1-V} z&6bA{D1`7d1Qq36*`hCF%8F{JtM;U}1kngf2+X52qvZX+B%&#)8Xl}<5PzKxk##1| zf$i)R@hd6u`uz_eshaE15YF_O@Nf_3cNyS_N90W&2HTByIQ-^M|Nh56Yjl;q|Gr7+ zhM=!1P>=k22yOZ_1d<{>Gq5UBHyN9XS(5<%Tej=u0uB_@E>4vGskh{gElv5JeR`k9 z!*U3}?AAG5G@0C^om(sM_$owrcxni!Ix){}5gqN?5t@R-$hgx`0svmi<2JV1;!NP2 zQEfG7@>X}^lg|Yef2DwrFz$UYEgEK$<6S;R;A4s(^pQp|YYtJ486*Oomw_iZ7Fd1}rGVUpUN24BB_=-L9~$4(0{xCs>SsSp2YZYjvC8 zBvj{y48r1#B_hs~*ak&^O+%wQ3qm#~3}0)=mFi|UZ&Q&+h)LCCP8)JLQGV-*216bU zVT_~D8x8qJ_KBfj8jXdKvtnpz6s{Or8D%MkZWT8=B-w^B&+%fPjK?@XNJQdfxEsj@ zuWUO>Y{M95RuGZkRwJNQcd;-@R<@%N{s?hhaW4nMl@}TYU87=u$-(y21)u`X>UM^- zDLj>Nw2Vm|5n!E#v+#AjY+79X)pEc%G31J&=+-dA6(R_4mvJ~6;tJs{{b=QkhPXmR zLF^H2RY~)^mMe}M#F~s!l9k&cCOfkvxG%jFw{|s+Nr)%wtvgk(qYC16nA(lK#nsiG zBXq4zXb;G>4oDh*Qf-epqJr>_g6HWl(Jnk3>2nUOv6#SB=iAy$^fAyn#c^@p)$vp_%x%QPeNLd@%J=U}hr0}Ekhg2N*gYW=i-(!uUX?a#z%=N| ztA;&Go>P#W2CH%_2j4!GQ*MEc2v>|o+LeuZyEaUbF66C(lWqwn3tLL=#hVm$V*9}1 zlb;D7e+BU)s{E#BBMU=S!nsv0Q$ zBEng871*C5OI$Kvs|29blgPK%{DyPnbeEnQGDuPv>!lZ{5aTg7qfLCgK@i(6YF(2w@yh1D(muFLPc{H`nL zyMnH3(RVFmSJ{15Bad(_>ss88e=NODOg*jQItk>13#}vW5BkX AP5=M^ diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css index 7a028fe0e..520e846ea 100644 --- a/paligo-theme/paligo-styles/redacto-theme.css +++ b/paligo-theme/paligo-styles/redacto-theme.css @@ -135,6 +135,10 @@ .featured-content .publication-contents li::before { display: none; } +.featured-content .publication-contents li a { + font-size: inherit; + line-height: inherit; +} /* Einleitung */ .cat-panel-1:before { From f168b74d97d2c8ceae12b9295b1ead978a331ce0 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 6 May 2022 09:58:50 +0300 Subject: [PATCH 22/30] RED-3969 Flatten existing annotations on load --- .../components/pdf-viewer/pdf-viewer.component.ts | 10 ++++++++-- docker/common/nginx/nginx.conf | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts index 03ed3c9e6..72fa76200 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts @@ -552,13 +552,19 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha return entry; } - private _loadDocument(blob: Blob, file: File) { + private async _loadDocument(blob: Blob, file: File) { const onError = () => { this._loadingService.stop(); this._errorService.set(DocLoadingError); this.stateService.reloadBlob(); }; - this.instance.UI.loadDocument(blob, { filename: file?.filename + '.pdf' ?? 'document.pdf', onError }); + + const pdfNet = this.instance.Core.PDFNet; + + await pdfNet.initialize(environment.licenseKey ? atob(environment.licenseKey) : null); + const document = await pdfNet.PDFDoc.createFromBuffer(await blob.arrayBuffer()); + await document.flattenAnnotations(false); + this.instance.UI.loadDocument(document, { filename: file?.filename + '.pdf' ?? 'document.pdf', onError }); this._pageRotationService.clearRotationsHideActions(); } diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index 4c51b152e..73661a583 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -6,7 +6,7 @@ server { root /usr/share/nginx/html; # SSL stuff for cloudflare proxy-ing - ignores SSL certificate and uses SNI - add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'blob' data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self'; script-src 'self' blob: data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"; proxy_ssl_verify off; proxy_read_timeout 1m; From ef575520a2d45311af8dde1ea3180b6b49359cdf Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 6 May 2022 09:02:07 +0200 Subject: [PATCH 23/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3261 -> 3260 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 389284f9e..33f6aadc1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.461.0", + "version": "3.462.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 870efdf09e91bf47e1cc2a9dbac32b639ddcf92a..c25db9a9417c7e7f83c96b8eb3d9881dd77dd9e7 100644 GIT binary patch delta 3145 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 From f9021361b07f79741473709f71218d9caff7319b Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 5 May 2022 17:20:45 +0300 Subject: [PATCH 24/30] RED-3765: wip license view --- .../src/app/modules/admin/admin.module.ts | 5 +- .../screens/license-information/constants.ts | 15 ++ .../screens/license-information/licence.ts | 69 ++++++ .../license-information-screen.component.html | 13 +- .../license-information-screen.component.ts | 216 ++++++++++-------- .../select-licence.component.html | 21 ++ .../select-licence.component.scss | 15 ++ .../select-licence.component.ts | 26 +++ .../admin/services/licence-report.service.ts | 17 +- apps/red-ui/src/assets/i18n/de.json | 5 + apps/red-ui/src/assets/i18n/en.json | 5 + .../src/assets/styles/red-components.scss | 4 + 12 files changed, 310 insertions(+), 101 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index b13bdebea..19db479bd 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -33,7 +33,6 @@ import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { AuditService } from './services/audit.service'; import { DigitalSignatureService } from './services/digital-signature.service'; import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component'; -import { LicenseReportService } from './services/licence-report.service'; import { RulesService } from './services/rules.service'; import { SmtpConfigService } from './services/smtp-config.service'; import { UploadDictionaryDialogComponent } from './dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; @@ -49,6 +48,7 @@ import { ConfirmDeleteDossierStateDialogComponent } from './dialogs/confirm-dele import { TrashTableItemComponent } from './screens/trash/trash-table-item/trash-table-item.component'; import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component'; import { CloneDossierTemplateDialogComponent } from './dialogs/clone-dossier-template-dialog/clone-dossier-template-dialog.component'; +import { SelectLicenceComponent } from './screens/license-information/select-licence/select-licence.component'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -103,8 +103,9 @@ const components = [ AddEditDossierStateDialogComponent, ConfirmDeleteDossierStateDialogComponent, TrashTableItemComponent, + SelectLicenceComponent, ], - providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService], + providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, SmtpConfigService], imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, A11yModule], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts new file mode 100644 index 000000000..766035b64 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts @@ -0,0 +1,15 @@ +import { Color, ScaleType } from '@swimlane/ngx-charts'; + +export const ComboBarScheme: Color = { + name: 'Combo bar scheme', + selectable: true, + group: ScaleType.Ordinal, + domain: ['#0389ec'], +}; + +export const LineChartScheme: Color = { + name: 'Line chart scheme', + selectable: true, + group: ScaleType.Ordinal, + domain: ['#dd4d50', '#5ce594', '#0389ec'], +}; diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts new file mode 100644 index 000000000..51da73235 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts @@ -0,0 +1,69 @@ +export interface ILicenseFeature { + readonly name: string; + readonly type: string; + readonly value: string; +} + +export interface ILicense { + readonly id: string; + readonly name: string; + readonly product: string; + readonly licensedTo: string; + readonly licensedToEmail: string; + readonly validFrom: string; + readonly validUntil: string; + readonly features: readonly ILicenseFeature[]; +} + +export interface ILicenses { + readonly activeLicense: string; + readonly licenses: readonly ILicense[]; +} + +export const LICENSE_DATA: ILicenses = { + activeLicense: 'guid-1', + licenses: [ + { + id: 'guid-1', + name: '1 Year comulative (2022)', + product: 'RedactManager', + licensedTo: 'Customer company name 1', + licensedToEmail: 'customer@example.com', + validFrom: '2022-01-01T00:00:00.000Z', + validUntil: '2022-12-31T23:59:59.999Z', + features: [ + { + name: 'pdftron', + type: 'STRING', + value: 'base64 encoded pdftron webviewer license key', + }, + { + name: 'processingPages', + type: 'NUMBER', + value: '200000', + }, + ], + }, + { + id: 'guid-2', + name: '2 Year comulative (2021)', + product: 'RedactManager', + licensedTo: 'Customer company name 2', + licensedToEmail: 'customer@example.com', + validFrom: '2021-01-01T00:00:00.000Z', + validUntil: '2021-12-31T23:59:59.999Z', + features: [ + { + name: 'pdftron', + type: 'STRING', + value: 'base64 encoded pdftron webviewer license key', + }, + { + name: 'processingPages', + type: 'NUMBER', + value: '100000', + }, + ], + }, + ], +}; diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html index 684b6c4dd..947c16001 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html @@ -38,16 +38,23 @@
    +
    +
    +
    + +
    +
    +
    -
    {{ configService.values.LICENSE_CUSTOMER || '-' }}
    +
    {{ selectedLicense.licensedTo || '-' }}
    - {{ configService.values.LICENSE_START || '-' }} / - {{ configService.values.LICENSE_END || '-' }} + {{ (selectedLicense.validFrom | date: 'dd-MM-YYYY') || '-' }} / + {{ (selectedLicense.validUntil | date: 'dd-MM-YYYY') || '-' }}
    diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts index ae953b5d7..57703c432 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts @@ -5,18 +5,38 @@ import { ButtonConfig, IconButtonTypes, LoadingService } from '@iqser/common-ui' import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; -import { LicenseReportService } from '../../services/licence-report.service'; +import { LicenseService } from '../../services/licence-report.service'; import { ILicenseReport } from '@red/domain'; -import { Color, ScaleType } from '@swimlane/ngx-charts'; -import { firstValueFrom } from 'rxjs'; import dayjs from 'dayjs'; +import { ComboBarScheme, LineChartScheme } from './constants'; +import { ILicense } from './licence'; + +const monthNames = dayjs.monthsShort(); + +function toDate(month: number, year: number) { + return dayjs(`01-${month}-${year}`, 'DD-M-YYYY').toDate(); +} + +interface IMonthYear { + readonly month: number; + readonly year: number; +} + +interface IDateRange { + readonly startDate: IMonthYear; + readonly endDate: IMonthYear; +} @Component({ selector: 'redaction-license-information-screen', templateUrl: './license-information-screen.component.html', styleUrls: ['./license-information-screen.component.scss'], + providers: [LicenseService], }) export class LicenseInformationScreenComponent implements OnInit { + readonly lineChartScheme = LineChartScheme; + readonly comboBarScheme = ComboBarScheme; + readonly currentYear = new Date().getFullYear(); readonly currentUser = this._userService.currentUser; readonly buttonConfigs: readonly ButtonConfig[] = [ { @@ -29,40 +49,35 @@ export class LicenseInformationScreenComponent implements OnInit { currentInfo: ILicenseReport = {}; totalInfo: ILicenseReport = {}; unlicensedInfo: ILicenseReport = {}; - totalLicensedNumberOfPages = 0; analysisPercentageOfLicense = 100; barChart: any[]; lineChartSeries: any[] = []; - lineChartScheme: Color = { - name: 'Line chart scheme', - selectable: true, - group: ScaleType.Ordinal, - domain: ['#dd4d50', '#5ce594', '#0389ec'], - }; - comboBarScheme: Color = { - name: 'Combo bar scheme', - selectable: true, - group: ScaleType.Ordinal, - domain: ['#0389ec'], - }; + selectedLicense = this.licenseService.getActiveLicense(); + totalLicensedNumberOfPages = this.#processingPages; constructor( readonly configService: ConfigService, + readonly licenseService: LicenseService, private readonly _userService: UserService, private readonly _loadingService: LoadingService, readonly routerHistoryService: RouterHistoryService, private readonly _translateService: TranslateService, - private readonly _licenseReportService: LicenseReportService, ) { _loadingService.start(); } - get currentYear(): number { - return new Date().getFullYear(); + get #processingPages() { + const processingPagesFeature = this.selectedLicense.features.find(f => f.name === 'processingPages'); + return Number(processingPagesFeature.value ?? '0'); } - async ngOnInit() { - this.totalLicensedNumberOfPages = this.configService.values.LICENSE_PAGE_COUNT || 0; + ngOnInit() { + return this.loadLicenceData(); + } + + async loadLicenceData() { + // const startDate = dayjs(this.selectedLicense.validFrom, 'DD-MM-YYYY'); + // const endDate = dayjs(this.selectedLicense.validUntil, 'DD-MM-YYYY'); const startDate = dayjs(this.configService.values.LICENSE_START, 'DD-MM-YYYY'); const endDate = dayjs(this.configService.values.LICENSE_END, 'DD-MM-YYYY'); @@ -72,30 +87,23 @@ export class LicenseInformationScreenComponent implements OnInit { startDate: startDate.toDate(), endDate: endDate.toDate(), }; - const promises = [ - firstValueFrom(this._licenseReportService.licenseReport(currentConfig)), - firstValueFrom(this._licenseReportService.licenseReport({})), - ]; + const reports: Promise[] = [this.licenseService.getReport(currentConfig), this.licenseService.getReport({})]; if (endDate.isBefore(dayjs())) { const unlicensedConfig = { startDate: endDate.toDate(), }; - promises.push(firstValueFrom(this._licenseReportService.licenseReport(unlicensedConfig))); + reports.push(this.licenseService.getReport(unlicensedConfig)); } - Promise.all(promises).then(reports => { - [this.currentInfo, this.totalInfo, this.unlicensedInfo] = reports; - this._loadingService.stop(); - this.analysisPercentageOfLicense = - this.totalLicensedNumberOfPages > 0 - ? (this.currentInfo.numberOfAnalyzedPages / this.totalLicensedNumberOfPages) * 100 - : 100; - }); + [this.currentInfo, this.totalInfo, this.unlicensedInfo] = await Promise.all(reports); + this._loadingService.stop(); + this.analysisPercentageOfLicense = + this.totalLicensedNumberOfPages > 0 ? (this.currentInfo.numberOfAnalyzedPages / this.totalLicensedNumberOfPages) * 100 : 100; } sendMail(): void { - const licenseCustomer = this.configService.values.LICENSE_CUSTOMER; + const licenseCustomer = this.selectedLicense.licensedTo; const subject = this._translateService.instant('license-info-screen.email.title', { licenseCustomer, }); @@ -108,77 +116,97 @@ export class LicenseInformationScreenComponent implements OnInit { pages: this.totalLicensedNumberOfPages, }), ].join(lineBreak); - window.location.href = `mailto:${this.configService.values.LICENSE_EMAIL}?subject=${subject}&body=${body}`; + window.location.href = `mailto:${this.selectedLicense.licensedToEmail}?subject=${subject}&body=${body}`; + } + + licenceChanged(license: ILicense) { + this.selectedLicense = license; + this.totalLicensedNumberOfPages = this.#processingPages; + return this.loadLicenceData(); } private async _setMonthlyStats(startDate: dayjs.Dayjs, endDate: dayjs.Dayjs) { - const [startMonth, startYear] = [startDate.month(), startDate.year()]; - const [endMonth, endYear] = [endDate.month(), endDate.year()]; + const startMonth: number = startDate.month(); + const startYear: number = startDate.year(); - let m: number = startMonth; - let y: number = startYear; - const totalLicensedSeries = []; - const cumulativePagesSeries = []; - const promises = []; - - while (m <= endMonth && y <= endYear) { - totalLicensedSeries.push({ - name: `${dayjs.monthsShort()[m]} ${y}`, - value: this.totalLicensedNumberOfPages, - }); - - let nm = m + 1; - let ny = y; - if (nm === 12) { - nm = 0; - ny++; - } - - promises.push( - firstValueFrom( - this._licenseReportService.licenseReport({ - startDate: dayjs(`01-${m + 1}-${y}`, 'DD-M-YYYY').toDate(), - endDate: dayjs(`01-${nm + 1}-${ny}`, 'DD-M-YYYY').toDate(), - }), - ), - ); - - y = ny; - m = nm; - } - - const reports = await Promise.all(promises); - - m = startMonth; - y = startYear; - let cumulativePages = 0; - this.barChart = []; - for (const report of reports) { - cumulativePages += report.numberOfAnalyzedPages; - this.barChart.push({ - name: `${dayjs.monthsShort()[m]} ${y}`, - value: report.numberOfAnalyzedPages, - }); - cumulativePagesSeries.push({ - name: `${dayjs.monthsShort()[m]} ${y}`, - value: cumulativePages, - }); - m++; - if (m === 12) { - m = 0; - y++; - } - } + const dateRanges = this.#generateDateRanges(startMonth, startYear, endDate.month(), endDate.year()); + const reports = await this.#getReports(dateRanges); this.lineChartSeries = [ { name: this._translateService.instant('license-info-screen.chart.licensed-total'), - series: totalLicensedSeries, + series: this.#totalLicensedPagesSeries(dateRanges), }, { name: this._translateService.instant('license-info-screen.chart.cumulative'), - series: cumulativePagesSeries, + series: this.#setBarChartAndGetCumulativePageSeries(startMonth, startYear, reports), }, ]; } + + #setBarChartAndGetCumulativePageSeries(month: number, year: number, reports: ILicenseReport[]) { + let cumulativePages = 0; + const cumulativePagesSeries = []; + this.barChart = []; + + for (const report of reports) { + cumulativePages += report.numberOfAnalyzedPages; + + const name = `${monthNames[month]} ${year}`; + this.barChart.push({ + name, + value: report.numberOfAnalyzedPages, + }); + + cumulativePagesSeries.push({ + name, + value: cumulativePages, + }); + + month++; + if (month === 12) { + month = 0; + year++; + } + } + + return cumulativePagesSeries; + } + + #getReports(dateRanges: IDateRange[]) { + const reports = dateRanges.map(dateRange => { + const startDate = toDate(dateRange.startDate.month + 1, dateRange.startDate.year); + const endDate = toDate(dateRange.endDate.month + 1, dateRange.endDate.year); + return this.licenseService.getReport({ startDate, endDate }); + }); + + return Promise.all(reports); + } + + #totalLicensedPagesSeries(dateRanges: IDateRange[]) { + return dateRanges.map(dateRange => ({ + name: `${monthNames[dateRange.startDate.month]} ${dateRange.startDate.year}`, + value: this.totalLicensedNumberOfPages, + })); + } + + #generateDateRanges(month: number, year: number, endMonth: number, endYear: number) { + const dates: IDateRange[] = []; + + while (month <= endMonth && year <= endYear) { + let nextMonth = month + 1; + let nextYear = year; + if (nextMonth === 12) { + nextMonth = 0; + nextYear++; + } + + dates.push({ startDate: { month, year }, endDate: { month: nextMonth, year: nextYear } }); + + year = nextYear; + month = nextMonth; + } + + return dates; + } } diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html new file mode 100644 index 000000000..e697dddfa --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html @@ -0,0 +1,21 @@ +
    + + + + + + + + + +
    + + +
    + {{ license.name }} +
    +
    + {{ getStatus(license.id) | translate | uppercase }} +
    +
    +     diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss new file mode 100644 index 000000000..5d71f0eab --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss @@ -0,0 +1,15 @@ +.green { + background: var(--iqser-green-2); +} + +.space-between { + justify-content: space-between; +} + +.dot { + position: relative; +} + +.small-label { + font-weight: 600; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts new file mode 100644 index 000000000..a033f39f1 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts @@ -0,0 +1,26 @@ +import { Component, EventEmitter, Output } from '@angular/core'; +import { LicenseService } from '../../../services/licence-report.service'; +import { ILicense } from '../licence'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +const translations = { + active: _('license-info-screen.status.active'), + inactive: _('license-info-screen.status.inactive'), +} as const; + +@Component({ + selector: 'redaction-select-licence', + templateUrl: './select-licence.component.html', + styleUrls: ['./select-licence.component.scss'], +}) +export class SelectLicenceComponent { + @Output() readonly valueChanges = new EventEmitter(); + + value = this.licenseService.getActiveLicense(); + + constructor(readonly licenseService: LicenseService) {} + + getStatus(id) { + return id === this.licenseService.activeLicenseId ? translations.active : translations.inactive; + } +} diff --git a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts index fa1be5312..1e80657d7 100644 --- a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts @@ -1,15 +1,24 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; import { ILicenseReport, ILicenseReportRequest } from '@red/domain'; +import { firstValueFrom } from 'rxjs'; +import { LICENSE_DATA } from '../screens/license-information/licence'; @Injectable() -export class LicenseReportService extends GenericService { +export class LicenseService extends GenericService { + readonly licenseData = LICENSE_DATA; + readonly activeLicenseId = this.licenseData.activeLicense; + constructor(protected readonly _injector: Injector) { super(_injector, 'report'); } + getActiveLicense() { + return this.licenseData.licenses.find(license => license.id === this.activeLicenseId); + } + @Validate() - licenseReport(@RequiredParam() body: ILicenseReportRequest, limit?: number, offset?: number) { + getReport$(@RequiredParam() body: ILicenseReportRequest, limit?: number, offset?: number) { const queryParams: QueryParam[] = []; if (limit) { queryParams.push({ key: 'limit', value: limit }); @@ -21,4 +30,8 @@ export class LicenseReportService extends GenericService { return this._post(body, `${this._defaultModelPath}/license`, queryParams); } + + getReport(body: ILicenseReportRequest, limit?: number, offset?: number) { + return firstValueFrom(this.getReport$(body, limit, offset)); + } } diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 9ecf220fb..607e2a984 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1532,11 +1532,16 @@ }, "end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.", "end-user-license-title": "Endbenutzer-Lizenzvereinbarung", + "license-title": "", "licensed-page-count": "Anzahl der lizenzierten Seiten", "licensed-to": "Lizenziert für", "licensing-details": "Lizenzdetails", "licensing-period": "Laufzeit der Lizenz", "ocr-analyzed-pages": "Mit OCR konvertierte Seiten", + "status": { + "active": "Aktiv", + "inactive": "" + }, "total-analyzed": "Seit {date} insgesamt analysierte Seiten", "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten", "usage-details": "Nutzungsdetails" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 498a5d53d..d532ecb08 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1532,11 +1532,16 @@ }, "end-user-license-text": "The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.", "end-user-license-title": "End User License Agreement", + "license-title": "License Title", "licensed-page-count": "Number of licensed pages", "licensed-to": "Licensed to", "licensing-details": "Licensing Details", "licensing-period": "Licensing Period", "ocr-analyzed-pages": "OCR Analyzed Pages", + "status": { + "active": "Active", + "inactive": "Inactive" + }, "total-analyzed": "Total Analyzed Pages Since {date}", "unlicensed-analyzed": "Unlicensed Analyzed Pages", "usage-details": "Usage Details" diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index e9f484584..78d3c5e9e 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -98,3 +98,7 @@ } } } + +.align-center { + align-items: center; +} From 60d27f4dff45b7ff9d85ce95cd77644ca05ceb75 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 5 May 2022 17:53:55 +0300 Subject: [PATCH 25/30] RED-3765: extract chart to a separate component --- .../src/app/modules/admin/admin.module.ts | 6 +- .../screens/license-information/date-range.ts | 9 ++ .../license-chart.component.html | 18 +++ .../license-chart.component.scss | 0 .../license-chart/license-chart.component.ts | 123 ++++++++++++++++ .../license-information-screen.component.html | 44 ++---- .../license-information-screen.component.ts | 136 ++---------------- ...ent.html => select-license.component.html} | 2 +- ...ent.scss => select-license.component.scss} | 0 ...mponent.ts => select-license.component.ts} | 13 +- .../admin/services/licence-report.service.ts | 14 +- 11 files changed, 201 insertions(+), 164 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts rename apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/{select-licence.component.html => select-license.component.html} (91%) rename apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/{select-licence.component.scss => select-license.component.scss} (100%) rename apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/{select-licence.component.ts => select-license.component.ts} (68%) diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 19db479bd..4693a3792 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -48,7 +48,8 @@ import { ConfirmDeleteDossierStateDialogComponent } from './dialogs/confirm-dele import { TrashTableItemComponent } from './screens/trash/trash-table-item/trash-table-item.component'; import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component'; import { CloneDossierTemplateDialogComponent } from './dialogs/clone-dossier-template-dialog/clone-dossier-template-dialog.component'; -import { SelectLicenceComponent } from './screens/license-information/select-licence/select-licence.component'; +import { SelectLicenseComponent } from './screens/license-information/select-licence/select-license.component'; +import { LicenseChartComponent } from './screens/license-information/license-chart/license-chart.component'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -103,7 +104,8 @@ const components = [ AddEditDossierStateDialogComponent, ConfirmDeleteDossierStateDialogComponent, TrashTableItemComponent, - SelectLicenceComponent, + SelectLicenseComponent, + LicenseChartComponent, ], providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, SmtpConfigService], imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, A11yModule], diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts new file mode 100644 index 000000000..6c18cc6d5 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts @@ -0,0 +1,9 @@ +export interface IMonthYear { + readonly month: number; + readonly year: number; +} + +export interface IDateRange { + readonly startDate: IMonthYear; + readonly endDate: IMonthYear; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html new file mode 100644 index 000000000..8da1b9488 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html @@ -0,0 +1,18 @@ + diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts new file mode 100644 index 000000000..207c1eca6 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts @@ -0,0 +1,123 @@ +import { Component } from '@angular/core'; +import { ComboBarScheme, LineChartScheme } from '../constants'; +import dayjs from 'dayjs'; +import { TranslateService } from '@ngx-translate/core'; +import { ILicenseReport } from '@red/domain'; +import { LicenseService } from '../../../services/licence-report.service'; +import { IDateRange } from '../date-range'; +import { ILicense } from '../licence'; +import { switchMap } from 'rxjs/operators'; +import { ILineChartSeries } from '../../../components/combo-chart/models'; +import { ConfigService } from '../../../../../services/config.service'; + +const monthNames = dayjs.monthsShort(); + +function toDate(month: number, year: number) { + return dayjs(`01-${month}-${year}`, 'DD-M-YYYY').toDate(); +} + +@Component({ + selector: 'redaction-license-chart', + templateUrl: './license-chart.component.html', + styleUrls: ['./license-chart.component.scss'], +}) +export class LicenseChartComponent { + readonly lineChartScheme = LineChartScheme; + readonly comboBarScheme = ComboBarScheme; + + lineChartSeries$ = this._licenseService.selectedLicense$.pipe(switchMap(license => this.#setMonthlyStats(license))); + barChart: any[]; + + constructor( + private readonly _translateService: TranslateService, + private readonly _licenseService: LicenseService, + private readonly _configService: ConfigService, + ) {} + + async #setMonthlyStats(licence: ILicense): Promise { + const startDate = dayjs(licence.validFrom, 'DD-MM-YYYY'); + const endDate = dayjs(licence.validUntil, 'DD-MM-YYYY'); + const startMonth: number = startDate.month(); + const startYear: number = startDate.year(); + + const dateRanges = this.#generateDateRanges(startMonth, startYear, endDate.month(), endDate.year()); + const reports = await this.#getReports(dateRanges); + + return [ + { + name: this._translateService.instant('license-info-screen.chart.licensed-total'), + series: this.#totalLicensedPagesSeries(dateRanges), + }, + { + name: this._translateService.instant('license-info-screen.chart.cumulative'), + series: this.#setBarChartAndGetCumulativePageSeries(startMonth, startYear, reports), + }, + ]; + } + + #setBarChartAndGetCumulativePageSeries(month: number, year: number, reports: ILicenseReport[]) { + let cumulativePages = 0; + const cumulativePagesSeries = []; + this.barChart = []; + + for (const report of reports) { + cumulativePages += report.numberOfAnalyzedPages; + + const name = `${monthNames[month]} ${year}`; + this.barChart.push({ + name, + value: report.numberOfAnalyzedPages, + }); + + cumulativePagesSeries.push({ + name, + value: cumulativePages, + }); + + month++; + if (month === 12) { + month = 0; + year++; + } + } + + return cumulativePagesSeries; + } + + #getReports(dateRanges: IDateRange[]) { + const reports = dateRanges.map(dateRange => { + const startDate = toDate(dateRange.startDate.month + 1, dateRange.startDate.year); + const endDate = toDate(dateRange.endDate.month + 1, dateRange.endDate.year); + return this._licenseService.getReport({ startDate, endDate }); + }); + + return Promise.all(reports); + } + + #totalLicensedPagesSeries(dateRanges: IDateRange[]) { + return dateRanges.map(dateRange => ({ + name: `${monthNames[dateRange.startDate.month]} ${dateRange.startDate.year}`, + value: this._licenseService.totalLicensedNumberOfPages, + })); + } + + #generateDateRanges(month: number, year: number, endMonth: number, endYear: number) { + const dates: IDateRange[] = []; + + while (month <= endMonth && year <= endYear) { + let nextMonth = month + 1; + let nextYear = year; + if (nextMonth === 12) { + nextMonth = 0; + nextYear++; + } + + dates.push({ startDate: { month, year }, endDate: { month: nextMonth, year: nextYear } }); + + year = nextYear; + month = nextMonth; + } + + return dates; + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html index 947c16001..5d0f57dd6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html @@ -41,22 +41,24 @@
    - +
    -
    -
    -
    {{ selectedLicense.licensedTo || '-' }}
    -
    - -
    -
    -
    - {{ (selectedLicense.validFrom | date: 'dd-MM-YYYY') || '-' }} / - {{ (selectedLicense.validUntil | date: 'dd-MM-YYYY') || '-' }} + +
    +
    +
    {{ selectedLicense.licensedTo || '-' }}
    -
    + +
    +
    +
    + {{ (selectedLicense.validFrom | date: 'dd-MM-YYYY') || '-' }} / + {{ (selectedLicense.validUntil | date: 'dd-MM-YYYY') || '-' }} +
    +
    +
    {{ 'license-info-screen.licensed-page-count' | translate }}
    @@ -93,23 +95,7 @@
    - + diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts index 57703c432..0deef09ea 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts @@ -8,25 +8,8 @@ import { RouterHistoryService } from '@services/router-history.service'; import { LicenseService } from '../../services/licence-report.service'; import { ILicenseReport } from '@red/domain'; import dayjs from 'dayjs'; -import { ComboBarScheme, LineChartScheme } from './constants'; import { ILicense } from './licence'; -const monthNames = dayjs.monthsShort(); - -function toDate(month: number, year: number) { - return dayjs(`01-${month}-${year}`, 'DD-M-YYYY').toDate(); -} - -interface IMonthYear { - readonly month: number; - readonly year: number; -} - -interface IDateRange { - readonly startDate: IMonthYear; - readonly endDate: IMonthYear; -} - @Component({ selector: 'redaction-license-information-screen', templateUrl: './license-information-screen.component.html', @@ -34,8 +17,6 @@ interface IDateRange { providers: [LicenseService], }) export class LicenseInformationScreenComponent implements OnInit { - readonly lineChartScheme = LineChartScheme; - readonly comboBarScheme = ComboBarScheme; readonly currentYear = new Date().getFullYear(); readonly currentUser = this._userService.currentUser; readonly buttonConfigs: readonly ButtonConfig[] = [ @@ -50,10 +31,7 @@ export class LicenseInformationScreenComponent implements OnInit { totalInfo: ILicenseReport = {}; unlicensedInfo: ILicenseReport = {}; analysisPercentageOfLicense = 100; - barChart: any[]; - lineChartSeries: any[] = []; - selectedLicense = this.licenseService.getActiveLicense(); - totalLicensedNumberOfPages = this.#processingPages; + totalLicensedNumberOfPages = this.licenseService.totalLicensedNumberOfPages; constructor( readonly configService: ConfigService, @@ -66,22 +44,13 @@ export class LicenseInformationScreenComponent implements OnInit { _loadingService.start(); } - get #processingPages() { - const processingPagesFeature = this.selectedLicense.features.find(f => f.name === 'processingPages'); - return Number(processingPagesFeature.value ?? '0'); - } - ngOnInit() { - return this.loadLicenceData(); + return this.loadLicenceData(this.licenseService.selectedLicense); } - async loadLicenceData() { - // const startDate = dayjs(this.selectedLicense.validFrom, 'DD-MM-YYYY'); - // const endDate = dayjs(this.selectedLicense.validUntil, 'DD-MM-YYYY'); - const startDate = dayjs(this.configService.values.LICENSE_START, 'DD-MM-YYYY'); - const endDate = dayjs(this.configService.values.LICENSE_END, 'DD-MM-YYYY'); - - await this._setMonthlyStats(startDate, endDate); + async loadLicenceData(license: ILicense) { + const startDate = dayjs(license.validFrom, 'DD-MM-YYYY'); + const endDate = dayjs(license.validUntil, 'DD-MM-YYYY'); const currentConfig = { startDate: startDate.toDate(), @@ -103,7 +72,7 @@ export class LicenseInformationScreenComponent implements OnInit { } sendMail(): void { - const licenseCustomer = this.selectedLicense.licensedTo; + const licenseCustomer = this.licenseService.selectedLicense.licensedTo; const subject = this._translateService.instant('license-info-screen.email.title', { licenseCustomer, }); @@ -116,97 +85,12 @@ export class LicenseInformationScreenComponent implements OnInit { pages: this.totalLicensedNumberOfPages, }), ].join(lineBreak); - window.location.href = `mailto:${this.selectedLicense.licensedToEmail}?subject=${subject}&body=${body}`; + const mail = this.licenseService.selectedLicense.licensedToEmail; + window.location.href = `mailto:${mail}?subject=${subject}&body=${body}`; } licenceChanged(license: ILicense) { - this.selectedLicense = license; - this.totalLicensedNumberOfPages = this.#processingPages; - return this.loadLicenceData(); - } - - private async _setMonthlyStats(startDate: dayjs.Dayjs, endDate: dayjs.Dayjs) { - const startMonth: number = startDate.month(); - const startYear: number = startDate.year(); - - const dateRanges = this.#generateDateRanges(startMonth, startYear, endDate.month(), endDate.year()); - const reports = await this.#getReports(dateRanges); - - this.lineChartSeries = [ - { - name: this._translateService.instant('license-info-screen.chart.licensed-total'), - series: this.#totalLicensedPagesSeries(dateRanges), - }, - { - name: this._translateService.instant('license-info-screen.chart.cumulative'), - series: this.#setBarChartAndGetCumulativePageSeries(startMonth, startYear, reports), - }, - ]; - } - - #setBarChartAndGetCumulativePageSeries(month: number, year: number, reports: ILicenseReport[]) { - let cumulativePages = 0; - const cumulativePagesSeries = []; - this.barChart = []; - - for (const report of reports) { - cumulativePages += report.numberOfAnalyzedPages; - - const name = `${monthNames[month]} ${year}`; - this.barChart.push({ - name, - value: report.numberOfAnalyzedPages, - }); - - cumulativePagesSeries.push({ - name, - value: cumulativePages, - }); - - month++; - if (month === 12) { - month = 0; - year++; - } - } - - return cumulativePagesSeries; - } - - #getReports(dateRanges: IDateRange[]) { - const reports = dateRanges.map(dateRange => { - const startDate = toDate(dateRange.startDate.month + 1, dateRange.startDate.year); - const endDate = toDate(dateRange.endDate.month + 1, dateRange.endDate.year); - return this.licenseService.getReport({ startDate, endDate }); - }); - - return Promise.all(reports); - } - - #totalLicensedPagesSeries(dateRanges: IDateRange[]) { - return dateRanges.map(dateRange => ({ - name: `${monthNames[dateRange.startDate.month]} ${dateRange.startDate.year}`, - value: this.totalLicensedNumberOfPages, - })); - } - - #generateDateRanges(month: number, year: number, endMonth: number, endYear: number) { - const dates: IDateRange[] = []; - - while (month <= endMonth && year <= endYear) { - let nextMonth = month + 1; - let nextYear = year; - if (nextMonth === 12) { - nextMonth = 0; - nextYear++; - } - - dates.push({ startDate: { month, year }, endDate: { month: nextMonth, year: nextYear } }); - - year = nextYear; - month = nextMonth; - } - - return dates; + this.totalLicensedNumberOfPages = this.licenseService.totalLicensedNumberOfPages; + return this.loadLicenceData(license); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.html similarity index 91% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html rename to apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.html index e697dddfa..8e0ee84ac 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.html @@ -1,5 +1,5 @@
    - + diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss rename to apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts similarity index 68% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts index a033f39f1..954521f9c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts @@ -9,11 +9,11 @@ const translations = { } as const; @Component({ - selector: 'redaction-select-licence', - templateUrl: './select-licence.component.html', - styleUrls: ['./select-licence.component.scss'], + selector: 'redaction-select-license', + templateUrl: './select-license.component.html', + styleUrls: ['./select-license.component.scss'], }) -export class SelectLicenceComponent { +export class SelectLicenseComponent { @Output() readonly valueChanges = new EventEmitter(); value = this.licenseService.getActiveLicense(); @@ -23,4 +23,9 @@ export class SelectLicenceComponent { getStatus(id) { return id === this.licenseService.activeLicenseId ? translations.active : translations.inactive; } + + licenseChanged($event: ILicense) { + this.valueChanges.emit($event); + this.licenseService.selectedLicense$.next($event); + } } diff --git a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts index 1e80657d7..303112868 100644 --- a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts @@ -1,18 +1,28 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; import { ILicenseReport, ILicenseReportRequest } from '@red/domain'; -import { firstValueFrom } from 'rxjs'; -import { LICENSE_DATA } from '../screens/license-information/licence'; +import { BehaviorSubject, firstValueFrom } from 'rxjs'; +import { ILicense, LICENSE_DATA } from '../screens/license-information/licence'; @Injectable() export class LicenseService extends GenericService { readonly licenseData = LICENSE_DATA; readonly activeLicenseId = this.licenseData.activeLicense; + readonly selectedLicense$ = new BehaviorSubject(this.getActiveLicense()); constructor(protected readonly _injector: Injector) { super(_injector, 'report'); } + get selectedLicense() { + return this.selectedLicense$.value; + } + + get totalLicensedNumberOfPages() { + const processingPagesFeature = this.selectedLicense$.value.features.find(f => f.name === 'processingPages'); + return Number(processingPagesFeature.value ?? '0'); + } + getActiveLicense() { return this.licenseData.licenses.find(license => license.id === this.activeLicenseId); } From 4e51e402a7e3505afd4f3469607cc4a92825fe4a Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 6 May 2022 11:56:43 +0300 Subject: [PATCH 26/30] RED-3765: add license module --- .../app/modules/admin/admin-routing.module.ts | 218 +++++++++--------- .../src/app/modules/admin/admin.module.ts | 16 +- .../combo-chart/combo-chart.component.html | 0 .../combo-chart/combo-chart.component.scss | 0 .../combo-chart/combo-chart.component.ts | 0 .../combo-series-vertical.component.ts | 0 .../license}/combo-chart/index.ts | 0 .../license}/combo-chart/models.ts | 0 .../license-chart.component.html | 0 .../license-chart.component.scss | 0 .../license-chart/license-chart.component.ts | 10 +- .../license-screen.component.html} | 6 +- .../license-screen.component.scss} | 0 .../license-screen.component.ts} | 12 +- .../license-select.component.html} | 0 .../license-select.component.scss} | 0 .../license-select.component.ts} | 12 +- .../admin/screens/license/license.module.ts | 32 +++ .../license/services/license.service.ts} | 2 +- .../utils}/constants.ts | 0 .../utils}/date-range.ts | 0 .../licence.ts => license/utils/license.ts} | 0 .../admin/shared/shared-admin.module.ts | 8 +- 23 files changed, 168 insertions(+), 148 deletions(-) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/combo-chart.component.html (100%) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/combo-chart.component.scss (100%) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/combo-chart.component.ts (100%) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/combo-series-vertical.component.ts (100%) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/index.ts (100%) rename apps/red-ui/src/app/modules/admin/{components => screens/license}/combo-chart/models.ts (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information => license}/license-chart/license-chart.component.html (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information => license}/license-chart/license-chart.component.scss (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information => license}/license-chart/license-chart.component.ts (93%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/license-information-screen.component.html => license/license-screen/license-screen.component.html} (94%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/license-information-screen.component.scss => license/license-screen/license-screen.component.scss} (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/license-information-screen.component.ts => license/license-screen/license-screen.component.ts} (90%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/select-licence/select-license.component.html => license/license-select/license-select.component.html} (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/select-licence/select-license.component.scss => license/license-select/license-select.component.scss} (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/select-licence/select-license.component.ts => license/license-select/license-select.component.ts} (71%) create mode 100644 apps/red-ui/src/app/modules/admin/screens/license/license.module.ts rename apps/red-ui/src/app/modules/admin/{services/licence-report.service.ts => screens/license/services/license.service.ts} (95%) rename apps/red-ui/src/app/modules/admin/screens/{license-information => license/utils}/constants.ts (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information => license/utils}/date-range.ts (100%) rename apps/red-ui/src/app/modules/admin/screens/{license-information/licence.ts => license/utils/license.ts} (100%) diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index d142d6642..2fcbb5317 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -7,7 +7,6 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component'; import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; -import { LicenseInformationScreenComponent } from './screens/license-information/license-information-screen.component'; import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component'; import { AuditScreenComponent } from './screens/audit/audit-screen.component'; import { RouterModule, Routes } from '@angular/router'; @@ -26,125 +25,127 @@ import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens'; import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component'; import { PermissionsGuard } from '../../guards/permissions-guard'; -const routes: Routes = [ - { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, +const dossierTemplateIdRoutes = [ { - path: 'dossier-templates', + path: 'info', + canActivate: [CompositeRouteGuard], + component: BaseDossierTemplateScreenComponent, + loadChildren: () => import('./screens/info/dossier-template-info.module').then(m => m.DossierTemplateInfoModule), + }, + { + path: 'entities', children: [ { path: '', - component: BaseAdminScreenComponent, + component: EntitiesListingScreenComponent, canActivate: [CompositeRouteGuard], data: { routeGuards: [AuthGuard, RedRoleGuard], }, - loadChildren: () => - import('./screens/dossier-templates-listing/dossier-templates-listing.module').then( - m => m.DossierTemplatesListingModule, - ), }, { - path: `:${DOSSIER_TEMPLATE_ID}`, - children: [ - { - path: 'info', - canActivate: [CompositeRouteGuard], - component: BaseDossierTemplateScreenComponent, - loadChildren: () => import('./screens/info/dossier-template-info.module').then(m => m.DossierTemplateInfoModule), - }, - { - path: 'entities', - children: [ - { - path: '', - component: EntitiesListingScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - }, - { - path: `:${ENTITY_TYPE}`, - component: BaseEntityScreenComponent, - canActivate: [CompositeRouteGuard], - loadChildren: () => import('./screens/entities/entities.module').then(m => m.EntitiesModule), - data: { - routeGuards: [AuthGuard, RedRoleGuard, EntityExistsGuard], - }, - }, - ], - }, - { - path: 'rules', - component: BaseDossierTemplateScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - loadChildren: () => import('./screens/rules/rules.module').then(m => m.RulesModule), - }, - { - path: 'file-attributes', - component: FileAttributesListingScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - }, - { - path: 'watermark', - component: BaseDossierTemplateScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - loadChildren: () => import('./screens/watermark/watermark.module').then(m => m.WatermarkModule), - }, - { - path: 'reports', - component: BaseDossierTemplateScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - loadChildren: () => import('./screens/reports/reports.module').then(m => m.ReportsModule), - }, - { - path: 'dossier-attributes', - component: DossierAttributesListingScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - }, - { - path: 'dossier-states', - component: DossierStatesListingScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - }, - { - path: 'default-colors', - component: DefaultColorsScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard], - }, - }, - { - path: 'justifications', - component: BaseDossierTemplateScreenComponent, - canActivate: [CompositeRouteGuard], - loadChildren: () => import('./screens/justifications/justifications.module').then(m => m.JustificationsModule), - }, - { path: '', redirectTo: 'info', pathMatch: 'full' }, - ], + path: `:${ENTITY_TYPE}`, + component: BaseEntityScreenComponent, canActivate: [CompositeRouteGuard], - data: { routeGuards: [DossierTemplateExistsGuard] }, + loadChildren: () => import('./screens/entities/entities.module').then(m => m.EntitiesModule), + data: { + routeGuards: [AuthGuard, RedRoleGuard, EntityExistsGuard], + }, }, ], + }, + { + path: 'rules', + component: BaseDossierTemplateScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + loadChildren: () => import('./screens/rules/rules.module').then(m => m.RulesModule), + }, + { + path: 'file-attributes', + component: FileAttributesListingScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + }, + { + path: 'watermark', + component: BaseDossierTemplateScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + loadChildren: () => import('./screens/watermark/watermark.module').then(m => m.WatermarkModule), + }, + { + path: 'reports', + component: BaseDossierTemplateScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + loadChildren: () => import('./screens/reports/reports.module').then(m => m.ReportsModule), + }, + { + path: 'dossier-attributes', + component: DossierAttributesListingScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + }, + { + path: 'dossier-states', + component: DossierStatesListingScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + }, + { + path: 'default-colors', + component: DefaultColorsScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + }, + { + path: 'justifications', + component: BaseDossierTemplateScreenComponent, + canActivate: [CompositeRouteGuard], + loadChildren: () => import('./screens/justifications/justifications.module').then(m => m.JustificationsModule), + }, + { path: '', redirectTo: 'info', pathMatch: 'full' }, +]; + +const dossierTemplatesRoutes: Routes = [ + { + path: '', + component: BaseAdminScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard], + }, + loadChildren: () => + import('./screens/dossier-templates-listing/dossier-templates-listing.module').then(m => m.DossierTemplatesListingModule), + }, + { + path: `:${DOSSIER_TEMPLATE_ID}`, + children: dossierTemplateIdRoutes, + canActivate: [CompositeRouteGuard], + data: { routeGuards: [DossierTemplateExistsGuard] }, + }, +]; + +const routes: Routes = [ + { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, + { + path: 'dossier-templates', + children: dossierTemplatesRoutes, canActivate: [CompositeRouteGuard], data: { routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard], @@ -173,12 +174,13 @@ const routes: Routes = [ }, { path: 'license-info', - component: LicenseInformationScreenComponent, + component: BaseAdminScreenComponent, canActivate: [CompositeRouteGuard], data: { routeGuards: [AuthGuard, RedRoleGuard], requiredRoles: ['RED_ADMIN'], }, + loadChildren: () => import('./screens/license/license.module').then(m => m.LicenseModule), }, { path: 'digital-signature', diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 4693a3792..f3be32ed2 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -7,7 +7,6 @@ import { DefaultColorsScreenComponent } from './screens/default-colors/default-c import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component'; import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component'; import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component'; -import { LicenseInformationScreenComponent } from './screens/license-information/license-information-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { DossierTemplateBreadcrumbsComponent } from './components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; import { ColorPickerModule } from 'ngx-color-picker'; @@ -15,8 +14,6 @@ import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-att import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; import { AddEntityDialogComponent } from './dialogs/add-entity-dialog/add-entity-dialog.component'; import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component'; -import { ComboChartComponent, ComboSeriesVerticalComponent } from './components/combo-chart'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AdminDialogService } from './services/admin-dialog.service'; import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component'; import { SmtpAuthDialogComponent } from './dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; @@ -24,7 +21,6 @@ import { AddEditUserDialogComponent } from './dialogs/add-edit-user-dialog/add-e import { UsersStatsComponent } from './components/users-stats/users-stats.component'; import { FileAttributesCsvImportDialogComponent } from './dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; import { ActiveFieldsListingComponent } from './dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component'; -import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component'; import { ResetPasswordComponent } from './dialogs/add-edit-user-dialog/reset-password/reset-password.component'; import { UserDetailsComponent } from './dialogs/add-edit-user-dialog/user-details/user-details.component'; import { AddEditDossierAttributeDialogComponent } from './dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; @@ -48,8 +44,7 @@ import { ConfirmDeleteDossierStateDialogComponent } from './dialogs/confirm-dele import { TrashTableItemComponent } from './screens/trash/trash-table-item/trash-table-item.component'; import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component'; import { CloneDossierTemplateDialogComponent } from './dialogs/clone-dossier-template-dialog/clone-dossier-template-dialog.component'; -import { SelectLicenseComponent } from './screens/license-information/select-licence/select-license.component'; -import { LicenseChartComponent } from './screens/license-information/license-chart/license-chart.component'; +import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -71,7 +66,6 @@ const screens = [ EntitiesListingScreenComponent, DigitalSignatureScreenComponent, FileAttributesListingScreenComponent, - LicenseInformationScreenComponent, UserListingScreenComponent, GeneralConfigScreenComponent, DossierAttributesListingScreenComponent, @@ -80,11 +74,9 @@ const screens = [ const components = [ DossierTemplateBreadcrumbsComponent, - ComboChartComponent, - ComboSeriesVerticalComponent, UsersStatsComponent, - ActiveFieldsListingComponent, AdminSideNavComponent, + ActiveFieldsListingComponent, ResetPasswordComponent, UserDetailsComponent, BaseAdminScreenComponent, @@ -104,10 +96,8 @@ const components = [ AddEditDossierStateDialogComponent, ConfirmDeleteDossierStateDialogComponent, TrashTableItemComponent, - SelectLicenseComponent, - LicenseChartComponent, ], providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, SmtpConfigService], - imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, A11yModule], + imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, ColorPickerModule, A11yModule], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.html b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.html rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.html diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.scss rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.scss diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-chart.component.ts diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-series-vertical.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/combo-series-vertical.component.ts diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/index.ts b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/index.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/index.ts rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/index.ts diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/models.ts b/apps/red-ui/src/app/modules/admin/screens/license/combo-chart/models.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/combo-chart/models.ts rename to apps/red-ui/src/app/modules/admin/screens/license/combo-chart/models.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.html rename to apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.html diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.scss rename to apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts similarity index 93% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts index 207c1eca6..1f64cec27 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-chart/license-chart.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; -import { ComboBarScheme, LineChartScheme } from '../constants'; +import { ComboBarScheme, LineChartScheme } from '../utils/constants'; import dayjs from 'dayjs'; import { TranslateService } from '@ngx-translate/core'; import { ILicenseReport } from '@red/domain'; -import { LicenseService } from '../../../services/licence-report.service'; -import { IDateRange } from '../date-range'; -import { ILicense } from '../licence'; +import { LicenseService } from '../services/license.service'; +import { IDateRange } from '../utils/date-range'; +import { ILicense } from '../utils/license'; import { switchMap } from 'rxjs/operators'; -import { ILineChartSeries } from '../../../components/combo-chart/models'; +import { ILineChartSeries } from '../combo-chart/models'; import { ConfigService } from '../../../../../services/config.service'; const monthNames = dayjs.monthsShort(); diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html similarity index 94% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html rename to apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html index 5d0f57dd6..a762eefda 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html @@ -1,8 +1,4 @@
    -
    - - -
    - +
    diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss rename to apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts similarity index 90% rename from apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts index 0deef09ea..b42e04ca2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts @@ -5,18 +5,16 @@ import { ButtonConfig, IconButtonTypes, LoadingService } from '@iqser/common-ui' import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; -import { LicenseService } from '../../services/licence-report.service'; +import { LicenseService } from '../services/license.service'; import { ILicenseReport } from '@red/domain'; import dayjs from 'dayjs'; -import { ILicense } from './licence'; +import { ILicense } from '../utils/license'; @Component({ - selector: 'redaction-license-information-screen', - templateUrl: './license-information-screen.component.html', - styleUrls: ['./license-information-screen.component.scss'], - providers: [LicenseService], + templateUrl: './license-screen.component.html', + styleUrls: ['./license-screen.component.scss'], }) -export class LicenseInformationScreenComponent implements OnInit { +export class LicenseScreenComponent implements OnInit { readonly currentYear = new Date().getFullYear(); readonly currentUser = this._userService.currentUser; readonly buttonConfigs: readonly ButtonConfig[] = [ diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.html rename to apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss rename to apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.ts similarity index 71% rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.ts index 954521f9c..6c088558d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Output } from '@angular/core'; -import { LicenseService } from '../../../services/licence-report.service'; -import { ILicense } from '../licence'; +import { LicenseService } from '../services/license.service'; +import { ILicense } from '../utils/license'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; const translations = { @@ -9,11 +9,11 @@ const translations = { } as const; @Component({ - selector: 'redaction-select-license', - templateUrl: './select-license.component.html', - styleUrls: ['./select-license.component.scss'], + selector: 'redaction-license-select', + templateUrl: './license-select.component.html', + styleUrls: ['./license-select.component.scss'], }) -export class SelectLicenseComponent { +export class LicenseSelectComponent { @Output() readonly valueChanges = new EventEmitter(); value = this.licenseService.getActiveLicense(); diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts b/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts new file mode 100644 index 000000000..dbe83e1b0 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts @@ -0,0 +1,32 @@ +import { NgModule } from '@angular/core'; +import { LicenseScreenComponent } from './license-screen/license-screen.component'; +import { LicenseSelectComponent } from './license-select/license-select.component'; +import { LicenseChartComponent } from './license-chart/license-chart.component'; +import { LicenseService } from './services/license.service'; +import { RouterModule, Routes } from '@angular/router'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatSelectModule } from '@angular/material/select'; +import { IqserListingModule } from '@iqser/common-ui'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { ComboChartComponent, ComboSeriesVerticalComponent } from './combo-chart'; +import { FormsModule } from '@angular/forms'; + +const routes: Routes = [ + { + path: '', + component: LicenseScreenComponent, + }, +]; + +@NgModule({ + declarations: [ + LicenseScreenComponent, + LicenseSelectComponent, + LicenseChartComponent, + ComboChartComponent, + ComboSeriesVerticalComponent, + ], + imports: [RouterModule.forChild(routes), TranslateModule, MatSelectModule, FormsModule, NgxChartsModule, IqserListingModule], + providers: [LicenseService], +}) +export class LicenseModule {} diff --git a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts b/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts similarity index 95% rename from apps/red-ui/src/app/modules/admin/services/licence-report.service.ts rename to apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts index 303112868..d16c98ca0 100644 --- a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts @@ -2,7 +2,7 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; import { ILicenseReport, ILicenseReportRequest } from '@red/domain'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; -import { ILicense, LICENSE_DATA } from '../screens/license-information/licence'; +import { ILicense, LICENSE_DATA } from '../utils/license'; @Injectable() export class LicenseService extends GenericService { diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/constants.ts rename to apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/date-range.ts rename to apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/license-information/licence.ts rename to apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts diff --git a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts index 32bdf41f4..285cc8f30 100644 --- a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts @@ -4,13 +4,15 @@ import { SharedModule } from '@shared/shared.module'; import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component'; import { AddEditEntityComponent } from './components/add-edit-entity/add-edit-entity.component'; import { ColorPickerModule } from 'ngx-color-picker'; +import { RouterModule } from '@angular/router'; const components = [DossierTemplateActionsComponent, AddEditEntityComponent]; +const modules = [CommonModule, SharedModule]; + @NgModule({ declarations: [...components], - exports: [...components], - providers: [], - imports: [CommonModule, SharedModule, ColorPickerModule], + exports: [...components, ...modules], + imports: [...modules, RouterModule, ColorPickerModule], }) export class SharedAdminModule {} From 2fc1fd7bb20464b6f5366adb0f8174c24590e4d7 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 9 May 2022 15:51:15 +0300 Subject: [PATCH 27/30] RED-3765: show license select in dev mode --- .../license-chart/license-chart.component.ts | 76 ++++++++++--------- .../license-screen.component.html | 2 +- .../license-screen.component.ts | 7 +- .../license/services/license.service.ts | 40 +++++++++- .../admin/screens/license/utils/constants.ts | 2 + .../admin/screens/license/utils/date-range.ts | 11 +-- .../admin/screens/license/utils/functions.ts | 41 ++++++++++ .../admin/screens/license/utils/license.ts | 2 +- apps/red-ui/src/assets/config/config.json | 4 +- 9 files changed, 132 insertions(+), 53 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/screens/license/utils/functions.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts index 1f64cec27..107353d82 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-chart/license-chart.component.ts @@ -1,21 +1,18 @@ import { Component } from '@angular/core'; -import { ComboBarScheme, LineChartScheme } from '../utils/constants'; +import { ComboBarScheme, LICENSE_STORAGE_KEY, LineChartScheme } from '../utils/constants'; import dayjs from 'dayjs'; import { TranslateService } from '@ngx-translate/core'; import { ILicenseReport } from '@red/domain'; import { LicenseService } from '../services/license.service'; import { IDateRange } from '../utils/date-range'; import { ILicense } from '../utils/license'; -import { switchMap } from 'rxjs/operators'; +import { switchMap, tap } from 'rxjs/operators'; import { ILineChartSeries } from '../combo-chart/models'; -import { ConfigService } from '../../../../../services/config.service'; +import { LoadingService } from '@iqser/common-ui'; +import { generateDateRanges, isCurrentMonth, toDate } from '../utils/functions'; const monthNames = dayjs.monthsShort(); -function toDate(month: number, year: number) { - return dayjs(`01-${month}-${year}`, 'DD-M-YYYY').toDate(); -} - @Component({ selector: 'redaction-license-chart', templateUrl: './license-chart.component.html', @@ -25,22 +22,30 @@ export class LicenseChartComponent { readonly lineChartScheme = LineChartScheme; readonly comboBarScheme = ComboBarScheme; - lineChartSeries$ = this._licenseService.selectedLicense$.pipe(switchMap(license => this.#setMonthlyStats(license))); + lineChartSeries$ = this.#licenseChartSeries$; barChart: any[]; constructor( private readonly _translateService: TranslateService, private readonly _licenseService: LicenseService, - private readonly _configService: ConfigService, + private readonly _loadingService: LoadingService, ) {} + get #licenseChartSeries$() { + return this._licenseService.selectedLicense$.pipe( + tap(() => this._loadingService.start()), + switchMap(license => this.#setMonthlyStats(license)), + tap(() => this._loadingService.stop()), + ); + } + async #setMonthlyStats(licence: ILicense): Promise { - const startDate = dayjs(licence.validFrom, 'DD-MM-YYYY'); - const endDate = dayjs(licence.validUntil, 'DD-MM-YYYY'); + const startDate = dayjs(licence.validFrom); + const endDate = dayjs(licence.validUntil); const startMonth: number = startDate.month(); const startYear: number = startDate.year(); - const dateRanges = this.#generateDateRanges(startMonth, startYear, endDate.month(), endDate.year()); + const dateRanges = generateDateRanges(startMonth, startYear, endDate.month(), endDate.year()); const reports = await this.#getReports(dateRanges); return [ @@ -86,38 +91,37 @@ export class LicenseChartComponent { #getReports(dateRanges: IDateRange[]) { const reports = dateRanges.map(dateRange => { - const startDate = toDate(dateRange.startDate.month + 1, dateRange.startDate.year); - const endDate = toDate(dateRange.endDate.month + 1, dateRange.endDate.year); - return this._licenseService.getReport({ startDate, endDate }); + const startMonth = dateRange.startMonth + 1; + const endMonth = dateRange.endMonth + 1; + + const key = `${startMonth}.${dateRange.startYear}-${endMonth}.${dateRange.endYear}`; + const existingReport = this._licenseService.storedReports[key]; + if (existingReport) { + return existingReport; + } + + const startDate = toDate(startMonth, dateRange.startYear); + const endDate = toDate(endMonth, dateRange.endYear); + const requestedReport = this._licenseService.getReport({ startDate, endDate }); + return requestedReport.then(report => this.#storeReportIfNotCurrentMonth(dateRange, report, key)); }); return Promise.all(reports); } + #storeReportIfNotCurrentMonth(dateRange: IDateRange, report: ILicenseReport, key: string) { + if (!isCurrentMonth(dateRange.startMonth + 1, dateRange.startYear)) { + this._licenseService.storedReports[key] = report; + localStorage.setItem(LICENSE_STORAGE_KEY, JSON.stringify(this._licenseService.storedReports)); + } + + return report; + } + #totalLicensedPagesSeries(dateRanges: IDateRange[]) { return dateRanges.map(dateRange => ({ - name: `${monthNames[dateRange.startDate.month]} ${dateRange.startDate.year}`, + name: `${monthNames[dateRange.startMonth]} ${dateRange.startYear}`, value: this._licenseService.totalLicensedNumberOfPages, })); } - - #generateDateRanges(month: number, year: number, endMonth: number, endYear: number) { - const dates: IDateRange[] = []; - - while (month <= endMonth && year <= endYear) { - let nextMonth = month + 1; - let nextYear = year; - if (nextMonth === 12) { - nextMonth = 0; - nextYear++; - } - - dates.push({ startDate: { month, year }, endDate: { month: nextMonth, year: nextYear } }); - - year = nextYear; - month = nextMonth; - } - - return dates; - } } 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 a762eefda..1d4e9834f 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 @@ -34,7 +34,7 @@
    -
    +
    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 b42e04ca2..8f080de93 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 @@ -9,6 +9,7 @@ import { LicenseService } from '../services/license.service'; import { ILicenseReport } from '@red/domain'; import dayjs from 'dayjs'; import { ILicense } from '../utils/license'; +import { UserPreferenceService } from '../../../../../services/user-preference.service'; @Component({ templateUrl: './license-screen.component.html', @@ -33,6 +34,7 @@ export class LicenseScreenComponent implements OnInit { constructor( readonly configService: ConfigService, + readonly userPreferenceService: UserPreferenceService, readonly licenseService: LicenseService, private readonly _userService: UserService, private readonly _loadingService: LoadingService, @@ -47,8 +49,8 @@ export class LicenseScreenComponent implements OnInit { } async loadLicenceData(license: ILicense) { - const startDate = dayjs(license.validFrom, 'DD-MM-YYYY'); - const endDate = dayjs(license.validUntil, 'DD-MM-YYYY'); + const startDate = dayjs(license.validFrom); + const endDate = dayjs(license.validUntil); const currentConfig = { startDate: startDate.toDate(), @@ -64,7 +66,6 @@ export class LicenseScreenComponent implements OnInit { } [this.currentInfo, this.totalInfo, this.unlicensedInfo] = await Promise.all(reports); - this._loadingService.stop(); this.analysisPercentageOfLicense = this.totalLicensedNumberOfPages > 0 ? (this.currentInfo.numberOfAnalyzedPages / this.totalLicensedNumberOfPages) * 100 : 100; } diff --git a/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts b/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts index d16c98ca0..d3081f9da 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/services/license.service.ts @@ -2,15 +2,19 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; import { ILicenseReport, ILicenseReportRequest } from '@red/domain'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; -import { ILicense, LICENSE_DATA } from '../utils/license'; +import { ILicense, ILicenses, LICENSE_DATA } from '../utils/license'; +import { ConfigService } from '../../../../../services/config.service'; +import dayjs from 'dayjs'; +import { getStoredReports } from '../utils/functions'; @Injectable() export class LicenseService extends GenericService { - readonly licenseData = LICENSE_DATA; + storedReports = getStoredReports(); + readonly licenseData = this.#licenceData; readonly activeLicenseId = this.licenseData.activeLicense; readonly selectedLicense$ = new BehaviorSubject(this.getActiveLicense()); - constructor(protected readonly _injector: Injector) { + constructor(protected readonly _injector: Injector, private readonly _configService: ConfigService) { super(_injector, 'report'); } @@ -23,6 +27,36 @@ export class LicenseService extends GenericService { return Number(processingPagesFeature.value ?? '0'); } + get #licenceData(): ILicenses { + return { + ...LICENSE_DATA, + licenses: [ + ...LICENSE_DATA.licenses, + { + id: 'guid-0', + name: this._configService.values.LICENSE_CUSTOMER, + product: 'RedactManager', + licensedTo: this._configService.values.LICENSE_CUSTOMER, + licensedToEmail: this._configService.values.LICENSE_EMAIL, + validFrom: dayjs(this._configService.values.LICENSE_START, 'DD-MM-YYYY').toISOString(), + validUntil: dayjs(this._configService.values.LICENSE_END, 'DD-MM-YYYY').toISOString(), + features: [ + { + name: 'pdftron', + type: 'STRING', + value: 'base64 encoded pdftron webviewer license key', + }, + { + name: 'processingPages', + type: 'NUMBER', + value: this._configService.values.LICENSE_PAGE_COUNT.toString(), + }, + ], + }, + ], + }; + } + getActiveLicense() { return this.licenseData.licenses.find(license => license.id === this.activeLicenseId); } diff --git a/apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts index 766035b64..a139c9732 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/utils/constants.ts @@ -13,3 +13,5 @@ export const LineChartScheme: Color = { group: ScaleType.Ordinal, domain: ['#dd4d50', '#5ce594', '#0389ec'], }; + +export const LICENSE_STORAGE_KEY = 'redaction-license-reports'; diff --git a/apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts index 6c18cc6d5..c18962cd6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/utils/date-range.ts @@ -1,9 +1,6 @@ -export interface IMonthYear { - readonly month: number; - readonly year: number; -} - export interface IDateRange { - readonly startDate: IMonthYear; - readonly endDate: IMonthYear; + readonly startMonth: number; + readonly startYear: number; + readonly endMonth: number; + readonly endYear: number; } diff --git a/apps/red-ui/src/app/modules/admin/screens/license/utils/functions.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/functions.ts new file mode 100644 index 000000000..4e445c7ae --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license/utils/functions.ts @@ -0,0 +1,41 @@ +import dayjs from 'dayjs'; +import { IDateRange } from './date-range'; +import { LICENSE_STORAGE_KEY } from './constants'; +import { ILicenseReport } from '@red/domain'; + +export function toDate(month: number, year: number) { + return dayjs(`01-${month}-${year}`, 'DD-M-YYYY').toDate(); +} + +export function generateDateRanges(month: number, year: number, endMonth: number, endYear: number) { + const dates: IDateRange[] = []; + + while (month <= endMonth && year <= endYear) { + let nextMonth = month + 1; + let nextYear = year; + if (nextMonth === 12) { + nextMonth = 0; + nextYear++; + } + + dates.push({ startMonth: month, startYear: year, endMonth: nextMonth, endYear: nextYear }); + + year = nextYear; + month = nextMonth; + } + + return dates; +} + +export function getStoredReports() { + const rawStoredReports = localStorage.getItem(LICENSE_STORAGE_KEY); + return JSON.parse(rawStoredReports ?? '{}') as Record; +} + +export function isCurrentMonth(month: number, year: number) { + const now = dayjs(); + const currentMonth = now.month() + 1; + const currentYear = now.year(); + + return month === currentMonth && year === currentYear; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts b/apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts index 51da73235..63cf5b4bf 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/utils/license.ts @@ -21,7 +21,7 @@ export interface ILicenses { } export const LICENSE_DATA: ILicenses = { - activeLicense: 'guid-1', + activeLicense: 'guid-0', licenses: [ { id: 'guid-1', diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 0cb5f13c3..684210fa7 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" From 525578011da18b3307d9039c7a11db3031ccf6ba Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 9 May 2022 14:54:17 +0200 Subject: [PATCH 28/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3260 -> 3260 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33f6aadc1..94c6c1f54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.462.0", + "version": "3.463.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c25db9a9417c7e7f83c96b8eb3d9881dd77dd9e7..ae82a4708569a60b6c0d971040a36b4724582917 100644 GIT binary patch delta 3173 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 Date: Mon, 9 May 2022 20:36:06 +0300 Subject: [PATCH 29/30] RED-3760 - new help mode keys --- .../dossier-details.component.html | 10 +- .../dossier-overview/config.service.ts | 6 +- .../edit-dossier-general-info.component.html | 4 + .../file-actions/file-actions.component.ts | 3 +- .../dossiers-listing-actions.component.html | 2 +- .../annotation-actions.component.html | 17 -- .../annotation-actions.component.ts | 16 -- .../highlights-separator.component.html | 4 +- .../user-management.component.html | 2 +- .../view-switch/view-switch.component.html | 8 +- .../file-preview-screen.component.html | 4 +- .../file-preview-screen.component.ts | 26 ++ .../expandable-file-actions.component.html | 10 +- .../expandable-file-actions.component.ts | 4 +- .../simple-doughnut-chart.component.ts | 2 +- apps/red-ui/src/assets/help-mode/links.json | 240 ++++-------------- libs/common-ui | 2 +- 17 files changed, 104 insertions(+), 256 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index d9c5384a8..e7f72dec8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -23,7 +23,7 @@ [tooltip]="'dossier-details.edit-owner' | translate" class="ml-14" icon="iqser:edit" - iqserHelpMode="edit_dossier_owner" + iqserHelpMode="dashboard_in_dossier" tooltipPosition="below" > @@ -43,7 +43,7 @@ [strokeWidth]="15" [subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier' | translate" direction="row" - helpModeKey="filter_for_status" + helpModeKey="dashboard_in_dossier" >
    @@ -51,11 +51,7 @@
    -
    +
    new NestedFilter(filter)); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index f2305bd2a..8fd005da3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -83,6 +83,8 @@ [type]="iconButtonTypes.dark" icon="iqser:trash" id="deleteDossier" + iqserHelpMode="edit_dossier_delete_dossier" + [dialogElement]="true" >
    diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 51b7578b3..406183cad 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -41,8 +41,7 @@ export class FileActionsComponent implements OnChanges { @Input() dossier: Dossier; @Input() type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow'; @Input() maxWidth: number; - @Input() fileActionsHelpModeKey: 'document_features' | 'editor_document_features' = 'document_features'; - + @Input() fileActionsHelpModeKey: 'document_features_in_dossier' | 'document_features_in_editor' = 'document_features_in_dossier'; toggleTooltip?: string; assignTooltip?: string; buttonType?: CircleButtonType; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 8e84ed10d..8ea5f9bc5 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -6,7 +6,7 @@ [scrollableParentView]="scrollableParentView" [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate" [type]="circleButtonTypes.dark" - iqserHelpMode="edit_dossier" + iqserHelpMode="edit_dossier_dossier_info" >
    -
    +
    @@ -21,7 +20,6 @@ [tooltip]="'file-preview.highlights.remove' | translate" [type]="circleButtonTypes.dark" icon="iqser:trash" - iqserHelpMode="remove_highlights" tooltipPosition="above" >
    diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html index e42a8a9c1..1d761a465 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html @@ -35,7 +35,7 @@ [tooltip]="assignTooltip$ | async" icon="iqser:edit" tooltipPosition="below" - iqserHelpMode="assign_reviewer" + iqserHelpMode="document_features_in_editor" > {{ 'file-preview.standard' | translate }} @@ -15,7 +15,7 @@ [disabled]="(canSwitchToDeltaView$ | async) === false" [matTooltip]="'file-preview.delta-tooltip' | translate" class="red-tab" - iqserHelpMode="delta_view" + iqserHelpMode="view" > {{ 'file-preview.delta' | translate }} @@ -26,7 +26,7 @@ [disabled]="(canSwitchToRedactedView$ | async) === false" [matTooltip]="'file-preview.redacted-tooltip' | translate" class="red-tab" - iqserHelpMode="preview_view" + iqserHelpMode="view" > {{ 'file-preview.redacted' | translate }} @@ -37,7 +37,7 @@ [disabled]="(canSwitchToHighlightsView$ | async) === false" [matTooltip]="'file-preview.text-highlights-tooltip' | translate" class="red-tab" - iqserHelpMode="highlights_view" + iqserHelpMode="view" > {{ 'file-preview.text-highlights' | translate }} diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index 355e6d228..4f2586b60 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -23,7 +23,7 @@ @@ -103,6 +103,8 @@ diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 5a9595bff..d8f9bbe6f 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -14,6 +14,8 @@ import { OnAttach, OnDetach, processFilters, + ScrollableParentView, + ScrollableParentViews, shareDistinctLast, } from '@iqser/common-ui'; import { MatDialogRef, MatDialogState } from '@angular/material/dialog'; @@ -52,6 +54,17 @@ import { NGXLogger } from 'ngx-logger'; import { StampService } from './services/stamp.service'; import Annotation = Core.Annotations.Annotation; +const HelpModeKeys = { + redaction: 'redaction_text', + 'manual-redaction': 'redaction_text', + recommendation: 'recommendation', + skipped: 'skipped', + hint: 'hint_text', + 'hint-ocr': 'hint_picture', + 'hint-formula': 'picture', + 'hint-image': 'image', +}; + @Component({ templateUrl: './file-preview-screen.component.html', styleUrls: ['./file-preview-screen.component.scss'], @@ -486,6 +499,19 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni this.handleAnnotationSelected([]); } + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.ANNOTATIONS_LIST; + } + + getActionsHelpModeKey(annotation: AnnotationWrapper): string { + const type = annotation?.typeLabel?.split('.')[1]; + const typeValue = annotation?.typeValue; + if (type === 'hint' && (typeValue === 'ocr' || typeValue === 'formula' || typeValue === 'image')) { + return HelpModeKeys[`${type}-${typeValue}`]; + } + return HelpModeKeys[type]; + } + private _setExcludedPageStyles() { const file = this._filesMapService.get(this.dossierId, this.fileId); setTimeout(() => { diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html index 3ad717745..f9b9c24fb 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html @@ -5,13 +5,13 @@ [attr.aria-expanded]="btn.ariaExpanded && btn.ariaExpanded | async" [disabled]="btn.disabled" [icon]="btn.icon" - [iqserHelpMode]="helpModeKey" - [scrollableParentView]="scrollableParentView" [showDot]="btn.showDot" [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [tooltip]="btn.tooltip | translate" [type]="btn.buttonType || buttonType" + [iqserHelpMode]="helpModeKey" + [scrollableParentView]="scrollableParentView" > @@ -19,11 +19,11 @@ *ngIf="btn.type === 'downloadBtn'" [dossier]="btn.dossier" [files]="btn.files" - [iqserHelpMode]="helpModeKey" - [scrollableParentView]="scrollableParentView" [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [type]="buttonType" + [iqserHelpMode]="helpModeKey" + [scrollableParentView]="scrollableParentView" > @@ -33,10 +33,10 @@ (click)="$event.stopPropagation()" [checked]="btn.checked" [disabled]="btn.disabled" - [iqserHelpMode]="helpModeKey" [matTooltipPosition]="tooltipPosition" [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" + [iqserHelpMode]="helpModeKey" [scrollableParentView]="scrollableParentView" color="primary" > diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index 9e59249c4..07ae9c81c 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -17,7 +17,7 @@ export class ExpandableFileActionsComponent implements OnChanges { @Input() actions: Action[]; @Input() buttonType: CircleButtonType; @Input() tooltipPosition: IqserTooltipPosition; - @Input() helpModeKey: 'document_features' | 'editor_document_features'; + @Input() helpModeKey: 'document_features_in_dossier' | 'document_features_in_editor'; displayedButtons: Action[]; hiddenButtons: Action[]; @@ -30,7 +30,7 @@ export class ExpandableFileActionsComponent implements OnChanges { ) {} get scrollableParentView(): ScrollableParentView { - return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; + return this.helpModeKey === 'document_features_in_dossier' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; } ngOnChanges(changes: SimpleChanges) { diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts index d91417945..b7bf8c3a2 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts @@ -26,7 +26,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit { @Input() totalType: 'sum' | 'count' | 'simpleLabel' = 'sum'; @Input() counterText: string; @Input() filterKey = 'statusFilters'; - @Input() helpModeKey: 'filter_for_status'; + @Input() helpModeKey: 'dashboard_in_dossier'; filtersEnabled: boolean; chartData: any[] = []; diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 6cd868047..b77c4b8c3 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,30 +1,12 @@ { - "assign_reviewer": { - "en": "/en/index-en.html?contextId=assign_reviewer", - "de": "", - "it": "", - "fr": "" - }, "bulk_select_annotations": { "en": "/en/index-en.html?contextId=bulk_select_annotations", "de": "", "it": "", "fr": "" }, - "delta_view": { - "en": "/en/index-en.html?contextId=delta_view", - "de": "", - "it": "", - "fr": "" - }, - "document_features": { - "en": "/en/index-en.html?contextId=document_features", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier": { - "en": "/en/index-en.html?contextId=edit_dossier", + "document_features_in_dossier": { + "en": "/en/index-en.html?contextId=document_features_in_dossier", "de": "", "it": "", "fr": "" @@ -41,14 +23,8 @@ "it": "", "fr": "" }, - "edit_dossier_owner": { - "en": "/en/index-en.html?contextId=edit_dossier_owner", - "de": "", - "it": "", - "fr": "" - }, - "redaction_edit_reason": { - "en": "/en/index-en.html?contextId=redaction_edit_reason", + "dashboard_in_dossier": { + "en": "/en/index-en.html?contextId=dashboard_in_dossier", "de": "", "it": "", "fr": "" @@ -65,12 +41,6 @@ "it": "", "fr": "" }, - "filter_for_editing_notes": { - "en": "/en/index-en.html?contextId=filter_for_editing_notes", - "de": "", - "it": "", - "fr": "" - }, "filter_for_status": { "en": "/en/index-en.html?contextId=filter_for_status", "de": "", @@ -101,104 +71,8 @@ "it": "", "fr": "" }, - "preview_view": { - "en": "/en/index-en.html?contextId=delta_view", - "de": "", - "it": "", - "fr": "" - }, - "highlights_view": { - "en": "/en/index-en.html?contextId=highlights_view", - "de": "", - "it": "", - "fr": "" - }, - "convert_highlights": { - "en": "/en/index-en.html?contextId=convert_highlights", - "de": "", - "it": "", - "fr": "" - }, - "remove_highlights": { - "en": "/en/index-en.html?contextId=remove_highlights", - "de": "", - "it": "", - "fr": "" - }, - "recommendation_accept_or_reject": { - "en": "/en/index-en.html?contextId=recommendation_accept_or_reject", - "de": "", - "it": "", - "fr": "" - }, - "redaction_false_positive": { - "en": "/en/index-en.html?contextId=redaction_false_positive", - "de": "", - "it": "", - "fr": "" - }, - "recommendation_false_positive": { - "en": "/en/index-en.html?contextId=recommendation_false_positive", - "de": "", - "it": "", - "fr": "" - }, - "skipped_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=skipped_remove_from_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "hint_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=hint_remove_from_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "recommendation_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=recommendation_remove_from_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "redaction_remove_only_here": { - "en": "/en/index-en.html?contextId=redaction_remove_only_here", - "de": "", - "it": "", - "fr": "" - }, - "hint_remove_only_here": { - "en": "/en/index-en.html?contextId=hint_remove_only_here", - "de": "", - "it": "", - "fr": "" - }, - "hint_recategorize": { - "en": "/en/index-en.html?contextId=hint_recategorize", - "de": "", - "it": "", - "fr": "" - }, - "hint_hide": { - "en": "/en/index-en.html?contextId=hint_hide", - "de": "", - "it": "", - "fr": "" - }, - "hint_force_hint": { - "en": "/en/index-en.html?contextId=hint_force_hint", - "de": "", - "it": "", - "fr": "" - }, - "redaction_recategorize": { - "en": "/en/index-en.html?contextId=redaction_recategorize", - "de": "", - "it": "", - "fr": "" - }, - "redaction_hide": { - "en": "/en/index-en.html?contextId=redaction_hide", + "view": { + "en": "/en/index-en.html?contextId=view", "de": "", "it": "", "fr": "" @@ -215,12 +89,6 @@ "it": "", "fr": "" }, - "standard_view": { - "en": "/en/index-en.html?contextId=standard_view", - "de": "", - "it": "", - "fr": "" - }, "workload_filter": { "en": "/en/index-en.html?contextId=workload_filter", "de": "", @@ -233,18 +101,6 @@ "it": "", "fr": "" }, - "delete_document_filter": { - "en": "/en/index-en.html?contextId=delete_document_filter", - "de": "", - "it": "", - "fr": "" - }, - "delete_dossier_filter": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, "edit_dossier_in_dossier": { "en": "/en/index-en.html?contextId=edit_dossier_in_dossier", "de": "", @@ -257,32 +113,8 @@ "it": "", "fr": "" }, - "recommendation_resize": { - "en": "/en/index-en.html?contextId=recommendation_resize", - "de": "", - "it": "", - "fr": "" - }, - "hint_resize": { - "en": "/en/index-en.html?contextId=hint_resize", - "de": "", - "it": "", - "fr": "" - }, - "skipped_force_redaction": { - "en": "/en/index-en.html?contextId=skipped_force_redaction", - "de": "", - "it": "", - "fr": "" - }, - "editor_document_features": { - "en": "/en/index-en.html?contextId=editor_document_features", - "de": "", - "it": "", - "fr": "" - }, - "documents_quickfilter": { - "en": "/en/index-en.html?contextId=documents_quickfilter", + "document_features_in_editor": { + "en": "/en/index-en.html?contextId=document_features_in_editor", "de": "", "it": "", "fr": "" @@ -305,14 +137,8 @@ "it": "", "fr": "" }, - "dossiers_scroll_up_button": { - "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", - "de": "", - "it": "", - "fr": "" - }, - "dossiers_scroll_down_button": { - "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", + "scroll_dossier_list": { + "en": "/en/index-en.html?contextId=scroll_dossier_list", "de": "", "it": "", "fr": "" @@ -335,6 +161,18 @@ "it": "", "fr": "" }, + "edit_dossier_delete_dossier": { + "en": "/en/index-en.html?contextId=edit_dossier_delete_dossier", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_archive_dossier": { + "en": "/en/index-en.html?contextId=edit_dossier_archive_dossier", + "de": "", + "it": "", + "fr": "" + }, "edit_dossier_download_package": { "en": "/en/index-en.html?contextId=edit_dossier_download_package", "de": "", @@ -389,26 +227,44 @@ "it": "", "fr": "" }, - "redaction_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=redaction_remove_from_dictionary", + "redaction_text": { + "en": "/en/index-en.html?contextId=redaction_text", "de": "", "it": "", "fr": "" }, - "skipped_resize": { - "en": "/en/index-en.html?contextId=skipped_resize_redaction", + "recommendation": { + "en": "/en/index-en.html?contextId=recommendation", "de": "", "it": "", "fr": "" }, - "skipped_recategorize": { - "en": "/en/index-en.html?contextId=skipped_recategorize_redaction", + "skipped": { + "en": "/en/index-en.html?contextId=skipped", "de": "", "it": "", "fr": "" }, - "skipped_hide": { - "en": "/en/index-en.html?contextId=skipped_hide", + "hint_text": { + "en": "/en/index-en.html?contextId=hint_text", + "de": "", + "it": "", + "fr": "" + }, + "hint_picture": { + "en": "/en/index-en.html?contextId=hint_picture", + "de": "", + "it": "", + "fr": "" + }, + "picture": { + "en": "/en/index-en.html?contextId=picture", + "de": "", + "it": "", + "fr": "" + }, + "image": { + "en": "/en/index-en.html?contextId=image", "de": "", "it": "", "fr": "" diff --git a/libs/common-ui b/libs/common-ui index 83f2fbd88..46f19f216 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 83f2fbd88feb455d27397f470b9cadf72aa3471e +Subproject commit 46f19f216fb158d90439cfaa0dcd94f7d9f71f72 From d680af07b8ff4e806af566d7552f4205a0179ff0 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 9 May 2022 19:38:31 +0200 Subject: [PATCH 30/30] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3260 -> 3260 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94c6c1f54..08771f626 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.463.0", + "version": "3.464.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ae82a4708569a60b6c0d971040a36b4724582917..ec2a79ac5e47d280c00114c7225b32521f7ffa35 100644 GIT binary patch delta 102 zcmV-s0Ga>18N3;gcTyYJzU#iQ9Xqg{7by5yuo<+bX1GG=V{G-m*yg(Y<&T;@W~Ba5 z+Hku3J$D(L<^M6-Uinuf#u1Za^Qf-hZx1fug+C>K&sqA5Uj7S*%YPC0vB~QT2r&{j IDF9Fa07E}Cv;Y7A delta 102 zcmV-s0Ga>18N3;gcT#IFonZOGcI?2hU!dS;!Di5!n&AqekFnMNVw>yomp^Lun34KJ zX~XIA_dMG_%l~7vz4EU}j3Xw;=22b0-yU4R3x7)fp0o59z5G3&%YP9BvB~QT2;MJ@ IW<C00W*ld;kCd