From 64f255ee452d01b9ea896dc5d85a913d1f0e2a10 Mon Sep 17 00:00:00 2001 From: Kresnadi Budisantoso Date: Sat, 19 Feb 2022 03:37:34 +0100 Subject: [PATCH 01/11] Remove /preview from help-mode paths --- apps/red-ui/src/assets/help-mode/links.json | 66 ++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index a3e6c6d04..7a99ce254 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,162 +1,162 @@ { "assign_reviewer": { - "en": "/preview/en/index-en.html?contextId=assign_reviewer", + "en": "/en/index-en.html?contextId=assign_reviewer", "de": "", "it": "", "fr": "" }, "bulk_select_annotations": { - "en": "/preview/en/index-en.html?contextId=bulk_select_annotations", + "en": "/en/index-en.html?contextId=bulk_select_annotations", "de": "", "it": "", "fr": "" }, "delta_view": { - "en": "/preview/en/index-en.html?contextId=delta_view", + "en": "/en/index-en.html?contextId=delta_view", "de": "", "it": "", "fr": "" }, "document_features": { - "en": "/preview/en/index-en.html?contextId=document_features", + "en": "/en/index-en.html?contextId=document_features", "de": "", "it": "", "fr": "" }, "edit_dossier": { - "en": "/preview/en/index-en.html?contextId=edit_dossier", + "en": "/en/index-en.html?contextId=edit_dossier", "de": "", "it": "", "fr": "" }, "download_dossier": { - "en": "/preview/en/index-en.html?contextId=download_dossier", + "en": "/en/index-en.html?contextId=download_dossier", "de": "", "it": "", "fr": "" }, "edit_dossier_member": { - "en": "/preview/en/index-en.html?contextId=edit_dossier_member", + "en": "/en/index-en.html?contextId=edit_dossier_member", "de": "", "it": "", "fr": "" }, "edit_dossier_owner": { - "en": "/preview/en/index-en.html?contextId=edit_dossier_owner", + "en": "/en/index-en.html?contextId=edit_dossier_owner", "de": "", "it": "", "fr": "" }, "redaction_edit_reason": { - "en": "/preview/en/index-en.html?contextId=redaction_edit_reason", + "en": "/en/index-en.html?contextId=redaction_edit_reason", "de": "", "it": "", "fr": "" }, "filter_document_list": { - "en": "/preview/en/index-en.html?contextId=filter_document_list", + "en": "/en/index-en.html?contextId=filter_document_list", "de": "", "it": "", "fr": "" }, "filter_dossier_list": { - "en": "/preview/en/index-en.html?contextId=filter_dossier_list", + "en": "/en/index-en.html?contextId=filter_dossier_list", "de": "", "it": "", "fr": "" }, "filter_for_editing_notes": { - "en": "/preview/en/index-en.html?contextId=filter_for_editing_notes", + "en": "/en/index-en.html?contextId=filter_for_editing_notes", "de": "", "it": "", "fr": "" }, "filter_for_status": { - "en": "/preview/en/index-en.html?contextId=filter_for_status", + "en": "/en/index-en.html?contextId=filter_for_status", "de": "", "it": "", "fr": "" }, "navigate_in_breadcrumbs": { - "en": "/preview/en/index-en.html?contextId=navigate_in_breadcrumbs", + "en": "/en/index-en.html?contextId=navigate_in_breadcrumbs", "de": "", "it": "", "fr": "" }, "new_dossier_button": { - "en": "/preview/en/index-en.html?contextId=new_dossier_button", + "en": "/en/index-en.html?contextId=new_dossier_button", "de": "", "it": "", "fr": "" }, "open_notifications": { - "en": "/preview/en/index-en.html?contextId=open_notifications", + "en": "/en/index-en.html?contextId=open_notifications", "de": "", "it": "", "fr": "" }, "open_usermenu": { - "en": "/preview/en/index-en.html?contextId=open_usermenu", + "en": "/en/index-en.html?contextId=open_usermenu", "de": "", "it": "", "fr": "" }, "preview_view": { - "en": "/preview/en/index-en.html?contextId=delta_view", + "en": "/en/index-en.html?contextId=delta_view", "de": "", "it": "", "fr": "" }, "recommendation_accept_or_reject": { - "en": "/preview/en/index-en.html?contextId=recommendation_accept_or_reject", + "en": "/en/index-en.html?contextId=recommendation_accept_or_reject", "de": "", "it": "", "fr": "" }, "redaction_false_positive": { - "en": "/preview/en/index-en.html?contextId=redaction_false_positive", + "en": "/en/index-en.html?contextId=redaction_false_positive", "de": "", "it": "", "fr": "" }, "skipped_remove_from_dictionary": { - "en": "/preview/en/index-en.html?contextId=skipped_remove_from_dictionary", + "en": "/en/index-en.html?contextId=skipped_remove_from_dictionary", "de": "", "it": "", "fr": "" }, "redaction_remove_only_here": { - "en": "/preview/en/index-en.html?contextId=redaction_remove_only_here", + "en": "/en/index-en.html?contextId=redaction_remove_only_here", "de": "", "it": "", "fr": "" }, "reset_filters": { - "en": "/preview/en/index-en.html?contextId=reset_filters", + "en": "/en/index-en.html?contextId=reset_filters", "de": "", "it": "", "fr": "" }, "search_in_entire_application": { - "en": "/preview/en/index-en.html?contextId=search_in_entire_application", + "en": "/en/index-en.html?contextId=search_in_entire_application", "de": "", "it": "", "fr": "" }, "standard_view": { - "en": "/preview/en/index-en.html?contextId=standard_view", + "en": "/en/index-en.html?contextId=standard_view", "de": "", "it": "", "fr": "" }, "workload_filter": { - "en": "/preview/en/index-en.html?contextId=workload_filter", + "en": "/en/index-en.html?contextId=workload_filter", "de": "", "it": "", "fr": "" }, "dossiers_quickfilter_my_dossiers": { - "en": "/preview/en/index-en.html?contextId=dossiers_quickfilter_my_dossiers", + "en": "/en/index-en.html?contextId=dossiers_quickfilter_my_dossiers", "de": "", "it": "", "fr": "" @@ -168,7 +168,7 @@ "fr": "" }, "delete_document_filter": { - "en": "/preview/en/index-en.html?contextId=delete_document_filter", + "en": "/en/index-en.html?contextId=delete_document_filter", "de": "", "it": "", "fr": "" @@ -180,31 +180,31 @@ "fr": "" }, "edit_dossier_in_dossier": { - "en": "/preview/en/index-en.html?contextId=edit_dossier_in_dossier", + "en": "/en/index-en.html?contextId=edit_dossier_in_dossier", "de": "", "it": "", "fr": "" }, "redaction_resize_redaction": { - "en": "/preview/en/index-en.html?contextId=redaction_resize_redaction", + "en": "/en/index-en.html?contextId=redaction_resize_redaction", "de": "", "it": "", "fr": "" }, "skipped_force_redaction": { - "en": "/preview/en/index-en.html?contextId=skipped_force_redaction", + "en": "/en/index-en.html?contextId=skipped_force_redaction", "de": "", "it": "", "fr": "" }, "editor_document_features": { - "en": "/preview/en/index-en.html?contextId=editor_document_features", + "en": "/en/index-en.html?contextId=editor_document_features", "de": "", "it": "", "fr": "" }, "documents_quickfilter": { - "en": "/preview/en/index-en.html?contextId=documents_quickfilter", + "en": "/en/index-en.html?contextId=documents_quickfilter", "de": "", "it": "", "fr": "" From 5d0e902c7f56b708cd14b7642e4ba079f27b73a1 Mon Sep 17 00:00:00 2001 From: Kresnadi Budisantoso Date: Sat, 19 Feb 2022 03:40:40 +0100 Subject: [PATCH 02/11] Set default manual base url --- apps/red-ui/src/assets/config/config.json | 2 +- docker/red-ui/docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index bf72886ff..9ee85116b 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -20,5 +20,5 @@ "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", - "MANUAL_BASE_URL": "https://docs.redactmanager.com" + "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" } diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh index 1dceb1b07..fc43fb226 100755 --- a/docker/red-ui/docker-entrypoint.sh +++ b/docker/red-ui/docker-entrypoint.sh @@ -23,7 +23,7 @@ OAUTH_IDP_HINT="${OAUTH_IDP_HINT:-}" OAUTH_URL="${OAUTH_URL:-/auth}" RECENT_PERIOD_IN_HOURS="${RECENT_PERIOD_IN_HOURS:-24}" SELECTION_MODE="${SELECTION_MODE:-structural}" -MANUAL_BASE_URL="${MANUAL_BASE_URL:-https://docs.redactmanager.com/3.0}" +MANUAL_BASE_URL="${MANUAL_BASE_URL:-https://docs.redactmanager.com/preview}" From 62e69e0e02d4532c365580fb45efe9a3fa52e18f Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 19 Feb 2022 04:00:12 +0100 Subject: [PATCH 03/11] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eaec28205..fe657ad52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.253.0", + "version": "3.254.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f5b5effe3926f2a04bdf76bd90172234a13d4ae6..fc10c9b50113154a064f1c0296f2f77808da6264 100644 GIT binary patch delta 3172 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 delta 3196 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 From 9ecfc3df1c62b7e08961d58f3c2ef26e75e918f2 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 21 Feb 2022 12:00:48 +0200 Subject: [PATCH 04/11] opacity for preview --- .../file-preview-screen.component.ts | 9 +++++++++ .../services/annotation-draw.service.ts | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index 43ca5418d..fc17cf93a 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -163,6 +163,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni .filter(a => a.getCustomData('changeLogRemoved') === 'false') .filter(a => !ocrAnnotationIds.includes(a.Id)); const nonStandardEntries = annotations.filter(a => a.getCustomData('changeLogRemoved') === 'true'); + this._setAnnotationsOpacity(standardEntries, true); this._show(standardEntries); this._hide(nonStandardEntries); break; @@ -171,12 +172,14 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni const changeLogEntries = annotations.filter(a => a.getCustomData('changeLog') === 'true'); const nonChangeLogEntries = annotations.filter(a => a.getCustomData('changeLog') === 'false'); this._setAnnotationsColor(redactions, 'annotationColor'); + this._setAnnotationsOpacity(changeLogEntries, true); this._show(changeLogEntries); this._hide(nonChangeLogEntries); break; } case 'REDACTED': { const nonRedactionEntries = annotations.filter(a => a.getCustomData('redaction') === 'false'); + this._setAnnotationsOpacity(redactions); this._setAnnotationsColor(redactions, 'redactionColor'); this._show(redactions); this._hide(nonRedactionEntries); @@ -708,6 +711,12 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni this._instance.Core.annotationManager.showAnnotations(annotations); } + private _setAnnotationsOpacity(annotations: Annotation[], restoreToOriginal: boolean = false) { + annotations.forEach(annotation => { + annotation['Opacity'] = restoreToOriginal ? parseFloat(annotation.getCustomData('opacity')) : 1; + }); + } + private _setAnnotationsColor(annotations: Annotation[], customData: string) { annotations.forEach(annotation => { annotation['StrokeColor'] = this._annotationDrawService.convertColor(this._instance, annotation.getCustomData(customData)); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index 118baac3f..173a752c3 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -15,6 +15,10 @@ import Annotation = Core.Annotations.Annotation; @Injectable() export class AnnotationDrawService { + static readonly DEFAULT_RECTANGLE_ANNOTATION_OPACITY = 0.6; + static readonly DEFAULT_TEXT_ANNOTATION_OPACITY = 1; + static readonly DEFAULT_REMOVED_ANNOTATION_OPACITY = 0.2; + constructor( private readonly _dictionariesMapService: DictionariesMapService, private readonly _dossiersService: DossiersService, @@ -168,13 +172,17 @@ export class AnnotationDrawService { annotationWrapper.superType, annotationWrapper.type, ); - annotation.Opacity = annotationWrapper.isChangeLogRemoved ? 0.2 : 0.6; + annotation.Opacity = annotationWrapper.isChangeLogRemoved + ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY + : AnnotationDrawService.DEFAULT_RECTANGLE_ANNOTATION_OPACITY; annotation.Height = firstPosition.height; annotation.Intensity = 100; } else { annotation = new activeViewer.Core.Annotations.TextHighlightAnnotation(); annotation.Quads = this._rectanglesToQuads(annotationWrapper.positions, activeViewer, pageNumber); - annotation.Opacity = annotationWrapper.isChangeLogRemoved ? 0.2 : 1; + annotation.Opacity = annotationWrapper.isChangeLogRemoved + ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY + : AnnotationDrawService.DEFAULT_TEXT_ANNOTATION_OPACITY; } annotation.setContents(annotationWrapper.content); @@ -200,6 +208,7 @@ export class AnnotationDrawService { annotation.setCustomData('skipped', String(annotationWrapper.isSkipped)); annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry)); annotation.setCustomData('changeLogRemoved', String(annotationWrapper.isChangeLogRemoved)); + annotation.setCustomData('opacity', String(annotation.Opacity)); annotation.setCustomData('redactionColor', String(this.getColor(activeViewer, dossierTemplateId, 'redaction', 'redaction'))); annotation.setCustomData( 'annotationColor', From a2f639d445d3c98837b6f4ec43340b3bccf380d2 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 21 Feb 2022 11:06:05 +0100 Subject: [PATCH 05/11] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe657ad52..22f440953 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.254.0", + "version": "3.255.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index fc10c9b50113154a064f1c0296f2f77808da6264..9f209bed1f3093bd2d937a095c66a297f0346288 100644 GIT binary patch delta 1014 zcmVcZB!5ND>iMQ9HW|Sst>;m( zy#a%8f0y7b&7MB_b4l{weueXTO&QK+51W*|v1gub-`O)?{0+q4h4{M^e^>C=5px_d z#}RWJF~<>e96skaF|ErCKYda^;PUeN?qbgA!jI&77R_VwxJJ$${7MOh z_1DM`?DFyM;(vJnv0jHHDJmi$Lmb_2s-nqbD=M<0TBDELmFN1-7!IY50O7*0YWj|> z(Zc5o$gT&uEawRNGMW>sBW1O0CvI`Ip}ED15`b4)Usy0!Y=LSc(Wv`b6I?~9AY_Xl ztp^&j6mZ$LifoN=!wUYpENaSV0X-GTFr#nDVchff(|<}R$zrjRT*a~NUvs2kQE@pU zr+h?pkn0N3`i;*q# zGQtUKwh*h3lT`e_e#Qm^3GRUP!D?FgkYk#r6sc%z_8W~aAlGBTT(2yQJBJ* zu8xeQ-a-#`_6g)6d;)>k=;%*at94(etf)A=v4dsgky$Z`iVC+b9du7BE}Lnpnryr~ zdPCeJxr}OX{?2EcXO9d?-PEqV#{@ZWhG9*xo7Q?#aX9&By3-nrDQvCf}fs kZ!YG5%mN9J%yNvL^zt8xyIfwgQ3N&!2)HV$n*dM%0Irk*!2kdN delta 1015 zcmV3Hy;mssL8uwDre?T8=*L*<=h)`D{^gIFJ!Pc+ zzO3PN{d?|mdDj1r(e~=UA~BAb9GgdV{b6fx1uy(5{d#qqbAOW*IjiTJqS#~vm$aTo z#r6ga!u?%>w={eDosLKn>}n&_QsxhwtZ*MeDOCBe;4BKQv6-PUq{Sw z#2iP=al{-)%yIaf-^8>oGyL>P{ea8M>${6Nrw?aVN^ndn^sftq-dQw{$>SP1cknAE z6xLrOKd{TkyMK%40mOP8lBB4JfDCbTzp08QkFBW4ifWBMa#x<~J7YMMIs$|X!>Z{! zvPKJ^FCe=fK*+bXg(!VN3<@3N>VqXqO-B*TopC5Lg(+ka0hp(KmNN^%v)wtvl$hDF8Y zh@A2f)kQ{Q^ik}^L5z2UR)u5Q)WCU5mqE@+lAK7(dJTpUk+jG<#TO-xD0^BXd%ipo z+3aO253NPB3rE_8W&_UZ7{!i-U*b5X`34ZUAa7@R6qb+#&d7h%R5kA^3z{=h8EnDk)*$|~k7Hq-7H_4z4F(j)ejEr) z7jL#CrWh4@_Jr!FA|yvRkI|K~MV5TOT?<_1eXVKGcUw7__x3=uf!y8CoT-Fh)Rgo8gdTVg>2R)+jG>u@A?yr{;CC0ZnDZDu0_WqY>tcoe++ut>=C4uMuu>=(_TC zGcy3rl^+(3CP`8C)S;8y*3ysdoT8&Uvfe9d2Gc{&X`V~_=p3KWPcOhtMPuH7|bT&c^t$bkJ8!(|9xs%{1^>-G`D9gxfVj{S;Nc6BGYG)2( zsk=HdmU;_4)Y&JHhwupmVxyx!VXfAEowB0h@Wu|7kw<35Bq}Q0x^&Pzskm&WscN$E z?&uA1kK{6{!TCF%ZJs?cBz04}_8t@Dz+xFT!HzSc2}*TEb?!!w$O}V6cK2-!f!Lsr z9r_Q^N9rTKr>1NIWTCp3aUl4xKxcB8` Date: Mon, 21 Feb 2022 12:20:09 +0200 Subject: [PATCH 06/11] RED-3234 --- .../info-screen/dossier-template-info-screen.component.html | 5 +++++ .../info-screen/dossier-template-info-screen.component.ts | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html index 3d0ad05c5..47ca1fe19 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html @@ -11,6 +11,11 @@ >
+
+ + {{ translations[dossierTemplate.dossierTemplateStatus] | translate }} +
+
{{ 'dossier-template-info-screen.dictionaries' | translate: { count: stats.numberOfDictionaries } }} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts index 3fd86b03f..b02f55d01 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -7,6 +7,7 @@ import { DossierTemplateStatsService } from '@services/entity-services/dossier-t import { AdminDialogService } from '../../../services/admin-dialog.service'; import { PermissionsService } from '@services/permissions.service'; import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; +import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; @Component({ templateUrl: './dossier-template-info-screen.component.html', @@ -16,6 +17,7 @@ import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; export class DossierTemplateInfoScreenComponent { readonly dossierTemplate$: Observable; readonly dossierTemplateStats$: Observable; + readonly translations = dossierTemplateStatusTranslations; constructor( private readonly _dossierTemplatesService: DossierTemplatesService, From 7b8dbd6b6577e9850db76fb05eeeeaead798ee42 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 21 Feb 2022 11:25:27 +0100 Subject: [PATCH 07/11] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22f440953..b675d1484 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.255.0", + "version": "3.256.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 9f209bed1f3093bd2d937a095c66a297f0346288..e066326f43b44bf9877267f2639e615d791d83dd 100644 GIT binary patch delta 3052 zcmV zevGAlj%}{%U;e1sQ%36V%NkDCzvnsbS^qyq+pGVI#5iJdY#!D1hpoXCyzr;=?>V6E zPXF-ff&Lc(bRm(;Tz`B9;&UNBm*R5;pN^R0h&hg!`h z*LN3lP9M&!l;D_D=wBBIy|ZW@lgBl3?%-ESD6GFmeqfi6cNfnCi1j)oNl_628RF=E zQx#1fTTzh})f#=|t~}Rw#&9Tg1PB*~RnvE5jTSy%Kz2RIWq&zG(3jDiSRE;=Wjk?; zs}0R9R+Ip|()z-Jv0@8U8;M5U&zj&WN(CWX{AfMUn5BTrwpC+yLEg^tC@dk%Ti{;*I0RKSjBvWDmLg%NJM>(g&ZNFr1>3vC70KD1k^iWvYTi{A zG-sqT*n-WiLHuVQ$HF=--b#5J3@DEMI1rdF-fT%sF@GxZ>$AskIx&->tCBi!Q9b>-`3W&oTkKP(zelA`LVLnpbdr61clMMrmJ zy;sx>rhkW?(>#~<(K$Y$pI(5QipIQye_M=fp_dU(ShIy#g`A|~|MfFA7)WpjtPfVx z!iOBwG^I#IW3%6Ad;#g^jlPt)#3#3RW528MIOS2NHEAGhozSXgR+LidY=jtE`M|n2 zU_v=^C&5wb?<|;6mXX=SL~v`7=wU_F&K$;4cYk$cEcF(8sIyNX58)FC#70Md!dk8S zI%P%0;f)IWQ7lw%J?%Nsyu|Xd@^dF*+)JJ?zP1yv4du-{SR5p!qwuCsIQDIi;xm#r>>a7LB!B-MS1_{5 zsz_)yK;}=LV1Nt54;AgseLrm1jy_|HR_*`m*5%8F`etAF;S zwFJ?KO31aNG^6DGeK{}J7n~Y5* zkVydlmMxqF;7Bp;e3^`BeZ-JiIG%urC54%1#Rc;M2$~<8}=v1|}+eu<0E&NV)$LC*$ z#i20$*h~Nn=sVaTlWy)jD#|Bu++oJG8&?my0$y){-qsaN76X<=zo|h(WkrE^$jHQ= z46{a@rwm4|Y7+u?u02DpCx1SC(=2z5AVGnMs1D*N63%jny6tZLkb) zahQ=9tnb#lU13`t%nQ~}uo(Zc_-5ta>NdeisLl-;q~9A$WWQ_G4)qBf)=r#6WA6c1 zIUk6_*wzSmNMXG-5?>mw3|s~07{1j0thJKS{F;Ch!HjP*5C^_;-G2p$!(DNifMD$T z?X^1nn}$aB7Nl%UIKI}AD+iX{yiG-(ASYETE^Wx=O!;jj8Vq?bgfWgnZ#3i^#V3Y> zX)+c@$%>(+QMqDhWz^+{R|$eK+fEXD2nJ)EvmheDt+v_|hxTAR??!?lh``VN-ToDV?0^mPR!@Z3oJ`Xdx-5YFJ|^MKlU zR%{Bx84-l-HaGcIdntqEVV(-SUPBNJ?6a5yDkf-vtiS+#mV+;vfk}+*%yOG5er(UT{ZooM3yEEcw-e*JX-1ert`k zqn36oZJ%j{b)rzLrm?mJ3Kc#u0KLz7xRK*;`E2+#3ipG+Wu5}Ljx zkg*K;`d~!*S$~(TGqhZo-=7+hyyiz*9fnSZ8A;SkYznB!_JMa*%n{)G5&3=H#)=5d zH`!B}_E!tS1_HSfAD4(!*}fhEsb=TzkQcq942wsrPH|j3bjNI}8|FU3)$6v->H>vU zzJ7OuGv5^igECd4#qJrI03H@TdrjJC0n?}_kGA)Kyno~@bQ-NHtsG+eR0*{OF(OE1z5mo9Mkl9Lnx|lUL${l8E!s_nGKU|?jm*h2Uz>H^1Hnin?KYfgKgErYS;q!j9Gl(H zK5yHJ!hb%*0YFkzKv)AMcNO8945>T%;9$2~O$P}Yhr4?iolnK0_u20Wx8Z8d&+8!I z3YLY+i(icON!*MdmNk4G_>0kUtWDRfO?RM8VH(1E#b1j9*-9@e>1>t!r&sdC<)LIo zp6f}TcE5Voc3qOgT?a6#9}5ocOQvbAwAucYz<*Xuh(AyR?eJQ-ePW=-FBu{toJChq z!Xpbg5H7A&22kor;@iJ^!rPyc==KNKOzMq}8uX1Y>3@x99V3;lborvPqpsA5D;3&G zNm^?*`XUn{N%dc)?p)m7=gr08t>MYZq+JZR;&X?i{Q@TAr@@N5oUKb4j1X&(!Iivc zDt{7-J(c8ooJICWlj2gW2>%I8PG3H%lR6)}?|`;*M@oJG1sUIKTqs~z?dgMW&ma|; zp+&%t9vuIAv>0fv)P!$vq-Nt*k9+yUIvNeg6Coz&HZT+cI5votIO~u$c}>_Zk`~#l z{bP7RtVJ*7hWcmmgh8R_gqI5{7p4ab>VNnT{!U>pF(McrAZIdlJAkh#GM2l}Mr9vTc_j(lG*Am_!;3WoSzl0oa*?H&;f_}u$;;1ogj1^P*X?EP_B z6%mQS`b3E~uNf&1yt(muFLPc{H`nLyMnH3(RVFm zSJ{16WbCqz6J1ODk%zGpQ%^gCoqa^|!AGwn=?_ESiO=1i$I2UG?4H>k#29E872OXp zddFh)Jr$#3Ixh_P&tuCQC4HwA4HDxxcib0z1c*6;b%RHjzmo`(B5I~Cy?^TewdLH- u?cC1o+|KRX&h6aJ?cC1o+|KRX&h6aJ?cC1o+|KP6+x`!-6P26*Pyhf4+Ub!1 delta 3052 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 Date: Mon, 21 Feb 2022 22:35:30 +0200 Subject: [PATCH 08/11] added more help mode keys --- .../dossier-details-stats.component.html | 11 ++++-- .../dossiers-listing-actions.component.html | 4 +-- .../dossiers-listing-actions.component.ts | 6 +++- .../annotation-actions.component.html | 7 ++++ .../annotation-actions.component.ts | 6 +++- .../file-workload.component.html | 1 + .../expandable-file-actions.component.html | 6 ++-- .../expandable-file-actions.component.ts | 6 ++-- .../team-members/team-members.component.html | 2 +- apps/red-ui/src/assets/help-mode/links.json | 36 +++++++++++++++---- libs/common-ui | 2 +- 11 files changed, 66 insertions(+), 21 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 9a656cc49..ce35f1ea8 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -8,7 +8,7 @@ {{ 'dossier-overview.dossier-details.stats.processing-documents' | translate: { count: stats.numberOfProcessingFiles } - }} + }}
@@ -37,7 +37,7 @@ {{ dossierTemplateName }}
-
+
{{ 'dossier-overview.dossier-details.dictionary' | translate }}
@@ -48,7 +48,12 @@
-
+
{{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index c78fbb3ae..4001358a5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -6,7 +6,7 @@ [type]="circleButtonTypes.dark" [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'" iqserHelpMode="edit_dossier" - [isVirtualScrollElement]="true" + [scrollableParentView]="scrollableParentView" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index c76b3e68c..80b56d553 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { PermissionsService } from '@services/permissions.service'; -import { CircleButtonTypes, List, StatusBarConfig } from '@iqser/common-ui'; +import { CircleButtonTypes, List, ScrollableParentView, ScrollableParentViews, StatusBarConfig } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { Dossier, DossierStats, File } from '@red/domain'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; @@ -56,4 +56,8 @@ export class DossiersListingActionsComponent implements OnChanges { $event.stopPropagation(); await firstValueFrom(this._reanalysisService.reanalyzeDossier(id)); } + + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.VIRTUAL_SCROLL; + } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html index 06bd99625..cb6148826 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html @@ -34,6 +34,7 @@ [type]="buttonType" icon="red:resize" iqserHelpMode="redaction_resize_redaction" + [scrollableParentView]="scrollableParentView" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts index 04742c1b4..fb5dff0c2 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts @@ -8,7 +8,7 @@ import { UserService } from '@services/user.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { MultiSelectService } from '../../services/multi-select.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { HelpModeService } from '../../../../../../../../../../libs/common-ui/src'; +import { HelpModeService, ScrollableParentView, ScrollableParentViews } from '../../../../../../../../../../libs/common-ui/src'; export const AnnotationButtonTypes = { dark: 'dark', @@ -115,6 +115,10 @@ export class AnnotationActionsComponent implements OnChanges { this.annotationActionsService.cancelResize($event, this.viewer, this.annotations[0], this.annotationsChanged); } + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.ANNOTATIONS_LIST; + } + private async _setPermissions() { const dossier = await this._state.dossier; this.annotationPermissions = AnnotationPermissions.forUser( diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index 74c0f571b..cd75fe63c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -161,6 +161,7 @@ class="annotations" iqserHasScrollbar tabindex="1" + id="annotations-list" > @@ -22,7 +22,7 @@ [tooltipPosition]="tooltipPosition" [type]="buttonType" [iqserHelpMode]="helpModeKey" - [isVirtualScrollElement]="isVirtualScrolElement" + [scrollableParentView]="scrollableParentView" > @@ -36,7 +36,7 @@ [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" [iqserHelpMode]="helpModeKey" - [isVirtualScrollElement]="isVirtualScrolElement" + [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 d9ac332d6..df9d6396a 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 @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Action, ActionTypes, File } from '@red/domain'; -import { CircleButtonType, IqserTooltipPosition, Toaster } from '@iqser/common-ui'; +import { CircleButtonType, IqserTooltipPosition, ScrollableParentView, ScrollableParentViews, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileDownloadService } from '@upload-download/services/file-download.service'; import { PermissionsService } from '@services/permissions.service'; @@ -64,7 +64,7 @@ export class ExpandableFileActionsComponent implements OnChanges { this._toaster.info(_('download-status.queued')); } - get isVirtualScrolElement(): boolean { - return this.helpModeKey === 'document_features'; + get scrollableParentView(): ScrollableParentView { + return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; } } diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index eafb4b9df..4dcd9d300 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -26,7 +26,7 @@ [type]="circleButtonTypes.primary" class="member" icon="iqser:plus" - iqserHelpMode="edit_dossier_member" + iqserHelpMode="add_dossier_members" > diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 7a99ce254..5062488e9 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -161,12 +161,6 @@ "it": "", "fr": "" }, - "scroll_up_and_down": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, "delete_document_filter": { "en": "/en/index-en.html?contextId=delete_document_filter", "de": "", @@ -208,5 +202,35 @@ "de": "", "it": "", "fr": "" + }, + "open_dictionary": { + "en": "/en/index-en.html?contextId=open_dictionary", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_attributes": { + "en": "/en/index-en.html?contextId=edit_dossier_attributes", + "de": "", + "it": "", + "fr": "" + }, + "add_dossier_members": { + "en": "/en/index-en.html?contextId=add_dossier_members", + "de": "", + "it": "", + "fr": "" + }, + "dossiers_scroll_up_and_down": { + "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", + "de": "", + "it": "", + "fr": "" + }, + "documents_scroll_up_and_down": { + "en": "/en/index-en.html?contextId=documents_scroll_up_and_down", + "de": "", + "it": "", + "fr": "" } } diff --git a/libs/common-ui b/libs/common-ui index 9b6a1b79d..b4460732f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9b6a1b79db607bf4cb679fb1139414985c2f0b6d +Subproject commit b4460732f80c3c7036ffca6aa5a876a3a91b56eb From 5a47952e941aa15de9a5389e4fd9c13b33b5071d Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 21 Feb 2022 21:39:54 +0100 Subject: [PATCH 09/11] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b675d1484..e0bea36c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.256.0", + "version": "3.257.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e066326f43b44bf9877267f2639e615d791d83dd..861d6fbcc12d5a50c543be19f262dcfc96d41fde 100644 GIT binary patch delta 3126 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 Q?HAkr53&=LoB&V&0Js+vhX4Qo From e66048460996664f79958d823452348aaf422210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 21 Feb 2022 23:53:58 +0200 Subject: [PATCH 10/11] RED-3271: Updated 409 on dossier creation error message, catch error --- .../edit-dossier-download-package.component.ts | 9 +++------ .../edit-dossier-team/edit-dossier-team.component.ts | 8 ++------ .../general-info/edit-dossier-general-info.component.ts | 9 +++------ .../src/app/services/entity-services/dossiers.service.ts | 2 +- apps/red-ui/src/assets/i18n/en.json | 2 +- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 4bef4a2e9..af3b3f7fd 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -87,12 +87,9 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS downloadFileTypes: this.form.get('downloadFileTypes').value, reportTemplateIds: this.form.get('reportTemplateIds').value, }; - try { - await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); - return { success: true }; - } catch (error) { - return { success: false }; - } + + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + return { success: !!updatedDossier }; } revert() { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index 75e563000..aac9f4a28 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -91,12 +91,8 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos ownerId: this.selectedOwnerId, } as IDossierRequest; - try { - await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); - return { success: true }; - } catch (error) { - return { success: false }; - } + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + return { success: !!updatedDossier }; } isMemberSelected(userId: string): boolean { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 622aca251..a5b0c3a6a 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -119,12 +119,9 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value, dossierStatusId: this.form.get('dossierStatusId').value, } as IDossierRequest; - try { - await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); - return { success: true }; - } catch (error) { - return { success: false }; - } + + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + return { success: !!updatedDossier }; } deleteDossier() { diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 0e48fc9c7..6c007257b 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -94,7 +94,7 @@ export class DossiersService extends EntitiesService { createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { const showToast = (error: HttpErrorResponse) => { this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); - return throwError(error); + return of(undefined); }; return this._post(dossier).pipe( diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 4facffb34..1f5f5db61 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -14,7 +14,7 @@ "save-and-add-members": "Save and Edit Team" }, "errors": { - "dossier-already-exists": "Dossier with this name already exists!", + "dossier-already-exists": "Dossier with this name already exists! If it is in the trash, you need to permanently delete it first to re-use the name. If it is an active or archived dossier, please choose a different name.", "generic": "Failed to save dossier." }, "form": { From 32553250d1c76bc11765c6f00026dd9091c9f339 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 21 Feb 2022 22:58:26 +0100 Subject: [PATCH 11/11] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0bea36c0..5d6fca3d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.257.0", + "version": "3.258.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 861d6fbcc12d5a50c543be19f262dcfc96d41fde..2f625b0cc661cdf65aefd60661a2bff246921a29 100644 GIT binary patch literal 3214 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