From e92bf44487c21c5cfa06ef59a679f9ee6a4d102a Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 1 Mar 2022 17:38:31 +0200 Subject: [PATCH 01/24] fix RED-3352: deactivate multiselect on page change --- .../file-workload.component.html | 6 +- .../file-workload/file-workload.component.ts | 55 +++++++++---------- .../pdf-viewer/pdf-viewer.component.ts | 5 +- .../file-preview-screen.component.html | 4 +- .../file-preview-screen.component.ts | 5 +- 5 files changed, 31 insertions(+), 44 deletions(-) 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 528e8846d..25e934cfe 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 @@ -39,7 +39,7 @@ -
+
-
+
-
+
(); @Input() selectedAnnotations: AnnotationWrapper[]; @Input() activeViewerPage: number; - @Input() shouldDeselectAnnotationsOnPageChange: boolean; @Input() dialogRef: MatDialogRef; @Input() file!: File; @Input() annotationActionsTemplate: TemplateRef; @Input() viewer: WebViewerInstance; - @Output() readonly shouldDeselectAnnotationsOnPageChangeChange = new EventEmitter(); @Output() readonly selectAnnotations = new EventEmitter(); @Output() readonly deselectAnnotations = new EventEmitter(); @Output() readonly selectPage = new EventEmitter(); @@ -66,7 +64,6 @@ export class FileWorkloadComponent { displayedPages: number[] = []; pagesPanelActive = true; readonly displayedAnnotations$: Observable>; - readonly multiSelectActive$: Observable; readonly multiSelectInactive$: Observable; readonly showExcludedPages$: Observable; readonly title$: Observable; @@ -88,7 +85,6 @@ export class FileWorkloadComponent { private readonly _annotationProcessingService: AnnotationProcessingService, ) { this.displayedAnnotations$ = this._displayedAnnotations$; - this.multiSelectActive$ = this._multiSelectActive$; this.multiSelectInactive$ = this._multiSelectInactive$; this.showExcludedPages$ = this._showExcludedPages$; this.isHighlights$ = this._isHighlights$; @@ -140,16 +136,6 @@ export class FileWorkloadComponent { ); } - private get _multiSelectActive$() { - const disableDeselectOnPageChange = (value: boolean) => { - if (value) { - this.shouldDeselectAnnotationsOnPageChange = false; - this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); - } - }; - return this.multiSelectService.active$.pipe(tap(disableDeselectOnPageChange), shareDistinctLast()); - } - private get _firstSelectedAnnotation() { return this.selectedAnnotations?.length ? this.selectedAnnotations[0] : null; } @@ -303,15 +289,11 @@ export class FileWorkloadComponent { // Displayed page doesn't have annotations if ($event.key === 'ArrowDown') { const nextPage = this._nextPageWithAnnotations(); - this.shouldDeselectAnnotationsOnPageChange = false; - this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); this.selectAnnotations.emit([this.displayedAnnotations.get(nextPage)[0]]); return; } const prevPage = this._prevPageWithAnnotations(); - this.shouldDeselectAnnotationsOnPageChange = false; - this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); const prevPageAnnotations = this.displayedAnnotations.get(prevPage); this.selectAnnotations.emit([prevPageAnnotations[prevPageAnnotations.length - 1]]); return; @@ -319,6 +301,8 @@ export class FileWorkloadComponent { const page = this._firstSelectedAnnotation.pageNumber; const pageIdx = this.displayedPages.indexOf(page); + const nextPageIdx = pageIdx + 1; + const previousPageIdx = pageIdx - 1; const annotationsOnPage = this.displayedAnnotations.get(page); const idx = annotationsOnPage.findIndex(a => a.id === this._firstSelectedAnnotation.id); @@ -326,22 +310,33 @@ export class FileWorkloadComponent { if (idx + 1 !== annotationsOnPage.length) { // If not last item in page this.selectAnnotations.emit([annotationsOnPage[idx + 1]]); - } else if (pageIdx + 1 < this.displayedPages.length) { + } else if (nextPageIdx < this.displayedPages.length) { // If not last page - const nextPageAnnotations = this.displayedAnnotations.get(this.displayedPages[pageIdx + 1]); - this.shouldDeselectAnnotationsOnPageChange = false; - this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); - this.selectAnnotations.emit([nextPageAnnotations[0]]); + for (let i = nextPageIdx; i < this.displayedPages.length; i++) { + const nextPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]); + if (nextPageAnnotations) { + this.selectAnnotations.emit([nextPageAnnotations[0]]); + break; + } + } } - } else if (idx !== 0) { + return; + } + + if (idx !== 0) { // If not first item in page - this.selectAnnotations.emit([annotationsOnPage[idx - 1]]); - } else if (pageIdx) { + return this.selectAnnotations.emit([annotationsOnPage[idx - 1]]); + } + + if (pageIdx) { // If not first page - const prevPageAnnotations = this.displayedAnnotations.get(this.displayedPages[pageIdx - 1]); - this.shouldDeselectAnnotationsOnPageChange = false; - this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); - this.selectAnnotations.emit([prevPageAnnotations[prevPageAnnotations.length - 1]]); + for (let i = previousPageIdx; i > 0; i--) { + const prevPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]); + if (prevPageAnnotations) { + this.selectAnnotations.emit([prevPageAnnotations[prevPageAnnotations.length - 1]]); + break; + } + } } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts index 0c92b92ab..f6a2a834a 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts @@ -67,7 +67,6 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha @Input() dossier: Dossier; @Input() canPerformActions = false; @Input() annotations: AnnotationWrapper[]; - @Input() shouldDeselectAnnotationsOnPageChange = true; @Output() readonly fileReady = new EventEmitter(); @Output() readonly annotationSelected = new EventEmitter(); @Output() readonly manualAnnotationRequested = new EventEmitter(); @@ -266,9 +265,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha }); this.documentViewer.addEventListener('pageNumberUpdated', (pageNumber: number) => { - if (this.shouldDeselectAnnotationsOnPageChange) { - this.utils.deselectAllAnnotations(); - } + this.utils.deselectAllAnnotations(); this._ngZone.run(() => this.pageChanged.emit(pageNumber)); return this._handleCustomActions(); }); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html index 811373798..a2f32d01f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html @@ -20,8 +20,8 @@
@@ -93,7 +92,6 @@ (selectAnnotations)="selectAnnotations($event)" (selectPage)="selectPage($event)" *ngIf="!file.excluded" - [(shouldDeselectAnnotationsOnPageChange)]="shouldDeselectAnnotationsOnPageChange" [activeViewerPage]="activeViewerPage" [annotationActionsTemplate]="annotationActionsTemplate" [annotations]="visibleAnnotations" 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 2c988e34d..d50fbb5ef 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 @@ -65,7 +65,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni dialogRef: MatDialogRef; fullScreen = false; - shouldDeselectAnnotationsOnPageChange = true; selectedAnnotations: AnnotationWrapper[] = []; displayPdfViewer = false; activeViewerPage: number = null; @@ -394,9 +393,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } this._scrollViews(); - if (!this.multiSelectService.isActive) { - this.shouldDeselectAnnotationsOnPageChange = true; - } + this.multiSelectService.deactivate(); // Add current page in URL query params const extras: NavigationExtras = { From fd8b4852da941e271f2567e4da246a7399550bc3 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 1 Mar 2022 16:42:52 +0100 Subject: [PATCH 02/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 357bd0be1..b96ab981b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.270.0", + "version": "3.271.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a0399a8f7866a0dead49e08e398f24549a4ef938..0db4b7b2c25077a83e8b43ba5a18ea8e67e30240 100644 GIT binary patch delta 3125 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 Pzu5MFj1ahM08jt`25t)& delta 3127 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

H0Z!QjR4Np!c?P9nU zpF14w2QV2w4OZOcY+cG=gjjmtsZuPhfKT@==}C`Ph92 zw4FOr@&hQy_+H~e0mEufAAEZTslW^^0)F)1_}8PwKy#%ge1ju38@GDg%OBR!Xn#PS z2r)UgfuRV%u|cfFS%Yv3E28EszUM{Fym>w*s<3IR2 zg}uaxV0?g_$<*xt<~|4>!vB&t2rBL)o*t;vCtn=sla706Fn~GoeZhd77e6Z);(JL3 zt!uY?L@?lU@7sY>1lbqpCke9m$A4v2L?j056D8WbW~4mu>UJW8DyA0l3-WM%IB568%^jV--oj3ltoM%qS2bcVubaW z_rER^@zK09_uQLG=G(X0Yjnw9Ya{+z`*MbA_^@hHQQ>!g;$u<4Uh2${_$|+J%kR7Vt}E!fg05@PcP(UB*?m@I?6Qs%T}%6shp`h=PdkI1MDoE$uOsOX zL*I$d-Ji$G8)EF9*&f6gXc!gU4>5YjV)Q)~qhdNQ4EWDu%Nr$qrxgtn<2ZNR7kmVW zIf8YAN0+~o2$CXdrY^mI>M;Mc<=oEg+|KRX&h6aJ?cC1o+|KRX&h6aJ?cC1o+|KRX R&g~c5{tsYRrvv~{006Gi6;J>G From d874489e9c4f447bdb345c5010fcaf16f00e1695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 21:54:59 +0200 Subject: [PATCH 03/24] RED-3485: Fixed edit dossier dictionary --- .../src/app/modules/shared/services/dictionary.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts index 275d7e278..70b401f86 100644 --- a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts @@ -99,11 +99,11 @@ export class DictionaryService extends EntitiesService const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; return this._post(body, url, queryParams).pipe( catchError((error: HttpErrorResponse) => this.#addUpdateDictionaryErrorToast(error)), - switchMap(dictionary => + switchMap(() => forkJoin([ this._dossierTemplateStatsService.getFor([dossierTemplateId]), this.loadDictionaryDataForDossierTemplate(dossierTemplateId), - ]).pipe(map(() => this._dictionariesMapService.get(dictionary.dossierTemplateId, dictionary.type))), + ]).pipe(map(() => this._dictionariesMapService.get(dossierTemplateId, type))), ), ); } From f44235ad8be97033272aedb991ad6e5ad20ec490 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 1 Mar 2022 20:59:41 +0100 Subject: [PATCH 04/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b96ab981b..ca6585a6c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.271.0", + "version": "3.272.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 0db4b7b2c25077a83e8b43ba5a18ea8e67e30240..47cff9200bf8569fe2869ac0e10a3fc99841332b 100644 GIT binary patch delta 3126 zcmV-649WA28IBo{cYj|7j^n(t9XqhSS19;Fs2Q}TX1GG=$5`s;*yg(a<&T;@Wu*ST ztl@P1d+u_1*8h*u_UgYPF^-rVn@4s1VQX*&FZ?O}dyeCIz5acV>wgjW&MRbpzpR?u zFI@j`q7+v(Vd(O&Uw>h(F7Gbh&}~^%3^i4Db(u0&*6W*_q<_d+J>L|?CL_3{^*k!J zH((I%?-IPF+0!R~E=m5|uW(+kDZ|<9VUw~q_RO>GJA3Afzk&F>5Pz5A?+X4pVvZx` zIAV??<~U-G!{_`argfR&r%&n!TwY$^UCcRsII~iMV^X1iT_E(%qIpan*T}hpUn!xm z{u=p#T|VAjJbw=$*6WZYMMVT;h@<;WRWx~QMMYLrYxI%3@?75;!=cm>AY2$$P2Z6< zTKIec+4Ufo8e_agq`lt zb9FkC`hQ{-Z0{0RBxiR<{-dUB?PkuLMM<3 zVgT3-ha?j#NKdv#d6A2KIG#N0Fjwq^a5QZ_?}LAhaEn9Nm9Lwb z0dTJTuxK<%imIm$o#eKber)Fy9o>=jUQsic9(qpmT-rzH_=J9X0d6W9^A7%LF|vhT zMmS;37Gf20l8XP=&)8rf!5y$ZSWOEba!k{dA{C9zexvaPq?>tvuzv}5oDoe>sw=89tN=P6s#RNJ?!5=GffTU%{y2eB!8u& z@TO2W_HB>iGmifU-9_N280(TGaOwWBnnsqy;#cc7`7+t3it^q%l=kLM2=(1=IuO>PF;jdwJB`j`Lx`#&|hN`K#f+az>D z&=(b$M}9rTHoY4H$&sGyTNSCBj7=qwNdW(rEt~}4NHOhvnT%+C#E@C!-gWvYxUzY0 zUA5CRAIT37RviL4zf4 z^{_A3=_%?3W#Xro3%J~mZu z4Kd0*VL<3qwYA$xVk0g5PIkxVUxvk@F#Xs}01W6m*dUW`?mQ~WCx3C=VaBx^R}Z=Z zUT=Zk))h<^1C~Xte;>p{$cUW%DvTXf|F34 z8!|}0HR)J~9|!qjf;Ev~NiSj@FHp|yu=9g*}METuUg zfPCre3P|9&k$?F0M<~=FoWalM0k!k2*c65{A_&`UZt|=4QU=SzJQaAoh9DT;Q*g8$ zCEAg_BVFtP7>fy7b-At0Odo?Sg>bkRn@PrFMXJ{wJ9obe9HzNH^7X|*5{|gFIEZ8R zLF>HWj^a4M_9|KOs{^mg6m$I68f`}{?O4cVMl5zAFd@WvWJt-7_))JS=?nnzYdZrcqBG zZSMhj$yw+$T2)#(#P+EYY71gSxMDPtCE@sjXjlKc&QN_@JQL!PoB)>}#*#H$K*Vt;!~`aGILx0`V-+D(Qshabp|%*iuf zn|0j-!AKYw_8mI z2^xpHdl;Qh#iIAw?+LfzYR%8#14XgSuVYu2Va(55gA zVSl~i+u}gB(u+zuTP6SLl{|5ID4CJxdXlHzub#DCm*jBQ0gUR$fb>RCd&r8gZpUTPaCv&3{H;WFjP~{;SlTi`)CWxj4KvJUN-Pi{Vy$ z?r^jpz-0V1SaFxLbt!`pVhu95lJ`tSVzH-^T#vKJ{%BHMiWT8MfywF1M|D!?WA`1< zcJ4^Y51=69dyNYP468kT@a-9-0yDG-_|b#oUyl|8&6S$)4UW`o-0E>Je^^JO0e^WS z#N^xth9UsR2C))n9nvPR3EM@|BAc~eh8M(I^ipo9e-=*|6naj0xu9}kda$65|KRTw z_7Wq4@d0usQ?~<{`yhA-|4ZH=sJM@KdZ139d~u*pI_{yt0OrW|1p{(k{H$Pz?UO|h2Q;&k3|K0sWU_3%YPic$u76= za=R|C@AA4Xzwh$9uAuJf zeJ4J5e;zAuh_QQSdk|xwVN`TK#ONK1(f3r0is`&C;6INoZzpz%9cNcHywk#@!nku`xOc^Wd_03IE61T~B>(MKIIq`~;cWJ>N!c5F=Gpe0J@duiK>S^Zzf19V1%Dke#}RWJ zF~<>e95Kh?bAA)ky3Fv?C-nm^FR$+|=A1s9St-FWsnEYJ5PE0PJSLB8nmo3mA}gvj`p8{*uJ4TDQ0fQ}E)1)t@5mZ0 ze7=C}dXURQQQ;`fa`j#BVJ#Rm)gnyDO7AwhB9NYdiM;aCtmm_k@ zM^qOXjnPN37Y8xk4O$hBX;TB|EnNmVCrNT5E$cNHLPXLc>l9y{Hh6UYQH z0BnXsl8F_hCtIVu$i+S!&z_ps$p$o)5vy#%jDJR$D|SLSnzo+z!M{eh#i8rU*UiiT zI9GmHG@2wu)l-K~a$8G3wsVS(?#Ozts2NNTJ*Rmt?W1#iLO;C#Hx-R}2miDf*+MTP zoUmpKu?jg!#sBMPY%q}E4p<+oriBkVrfEu%ipFNY(f9(=%^Q6wafwfE@5X*t<8jKP zPJe6CK-fB=Rn4p@rPA35F|_i5b#K6ga^y~eqtxG7FrzFZvx$k|)*{ivim07AjHT}C z$XMzv^iXG?Kpw&;5QvSA{)Dw!_jSsOio+W_SVkV16_co_aO=`R_oU*onWn1A#=E08 z#66PBs0Qcne71S^$dJ@c?b>@xkOODf1b;iuh$bl271g;LJt8j*5!v0hH3VXVK6dCo zL?5Y-_@0`w36O>AUdDmo!vdYjVeWH^Z7>rEj&T|Tx6$REJRIJ9j6SD%Mks6Y4f^=z zVh+eGkO0Xn$LL8f|B<-M<)z>jp#NS}_eoYf3}D?USUYlh*uQ~hni|TRcd$4}N`FV; zO`&k?+aASdByZR|Qf*28{yVNpDZRy0Z(-Iz!UCb1-5kL9Z- zN|PqP7eQEuUrbZs_VAyFB!`u0j(GCZF<6A8O0xIgMk#^*8ht5>|3BdzZ%9=S)>%$! z&R_NGd|6}}tixsY8L7x5)2m6MSATww?Ds`oQy>>;VWh_kd-DNjY=rW566G>dP~JD7 zRz^?=8D|J4%B8YJpU0FH)zDV$NoxtB5tWc@M`=dM`~ONpQ&KfNDb66_91`nH?gQJ| z8R8dGJ>lUV&mS_N5s%oL+zhrG?`Zh+FaP`Ze`<7-14@W%J<1 z{|SgDlWVkdYb80J$kI;B#PrbUxhnB!7o1Kt~1{45T~8wGUR1!{Ttf%J-8ejuSY2l{%+oNth-u zo-VY>(loR*CM&FEQ@|qgNDkA0`HKKi9H!+jW|ykj9S$u1nyjWhFnkl@lCVbHG%{MBBDBo zqewW*A?mij#q7AAKsrN?YUf$8DGX;s5VqUgv^D)4#@K`^|h;AlHa zv?F^*y4V9S78A7Ua$B33J_cI~;czcDlZ?lTRIfXB?tT|IOmlza>x+XV9C2%L5XbC; z)_K7l#c_h|RkGw)2VR#c=J>5O+KyV}Mn8D=C= zGqEY4Cff(zRWV0^??>eKbsH-pG~Z-TW!hgY2pb6GN_<=*Qf2#k2&9^wze8U1jxsDB ztvbbV@qf@Av#D;F`v_OB+d8WY6k7TE-3`usR}c)!RE-w9XJi6+SorKUX`=;9qn$(Smkx1HYIMaTL8y~Zd4YoKoyPyx+{KP+qbI`ECra;#0)tW9^IO<@|s zdVj^Y#er<47nO9jO8(O;dE)X=G9%CRBu~3vJ!`uz$>FX87}bvjhxR4YG*{Yee@b90 zCd418fp&N;+&(c-B=POHp78dkB)a{*?5Ha>;!1_KQj*r1jeow#L`YKoSE)M}xA%E-ad>NZax!Tb!>#z- z;b=dA$@poo;x1?FQU)W$8f0)K@0p6kVoxQx9%qsL(WJN(E5d&Qlhc=v>ZH!c?mM9E z+>w$WKtaa$8W#!}R(ty3+cQW7W@r)cqX);o9xVo%D>dO89I4s3)#G0Nu#QFp@_$5# z$+-;-MF5TsVkOQxq)lEEwu_`iHfz5OFNn41rQA^eES@kZ^qlZ=LFK~qU_l-K!QUzD zB}N3}1LRDmZU->;LGTd%m%KqxaUb#YK%GAM;y|Bt+(Ux_%#rU42IRc>S-}wBOEPF( zyWJy#0iS!{4xA#$zCb@oki9=HtA8RQF<74{(dIQH<$+hX6Dgi!N>RqL)5YJPLwwVa zx_={QtdRN{uMvw!!BO0Q*&@y$!~Bs1yINL0uk77uLLd1)ltrg3V%iXm)(jRStjE0n zb(x5d=AF6c-c&N*zSUl%Oa59L@z>gyGgQNeRg;Pezxxv(iwgEqXNJU=Ie&bUU2fmy zc3ocI<#kHSmxuP!a;c5df(Zs&Gx=XP%Ac5df(Zs&Gx=XP%Ac5df(Zs&Gx Pzu5MFj1ahM08jt``YH<- From 85c6d87ea3a9a78e5d336b453471359567faa295 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 2 Mar 2022 11:53:30 +0200 Subject: [PATCH 05/24] RED-3499 -> minor update to display "reanalyse all" button in screen header only if there is at least one file which require analysis --- apps/red-ui/src/app/services/permissions.service.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 17e62cfd1..e16f15dc2 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -20,7 +20,7 @@ export class PermissionsService { } displayReanalyseBtn(dossier: Dossier): boolean { - return this.isApprover(dossier) && this._filesMapService.get(dossier.dossierId).length > 0; + return this.isApprover(dossier) && !!this._filesMapService.get(dossier.dossierId).find(f => f.analysisRequired); } canEditFileAttributes(file: File): boolean { diff --git a/libs/common-ui b/libs/common-ui index 17008f447..4d045682a 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 17008f44757a29ae3d09581a94520c2a05670432 +Subproject commit 4d045682ab46688934883450706e8aee8e2f1d02 From 628ee4d84cbf6e57fde182299496f91203c263fa Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 10:58:07 +0100 Subject: [PATCH 06/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca6585a6c..8771f72e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.272.0", + "version": "3.273.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 47cff9200bf8569fe2869ac0e10a3fc99841332b..a99a96b691ab28e0d8273f4db35f10574c42b8fa 100644 GIT binary patch delta 3128 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 delta 3127 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 Date: Wed, 2 Mar 2022 13:02:34 +0200 Subject: [PATCH 07/24] Fix RED-3477: accept/reject force hint suggestions --- .../src/app/models/file/annotation.wrapper.ts | 97 +++++-------------- .../red-ui/src/app/models/file/super-types.ts | 57 +++++++++++ .../annotation-types-translations.ts | 4 +- .../app/utils/sorters/super-type-sorter.ts | 4 +- 4 files changed, 87 insertions(+), 75 deletions(-) create mode 100644 apps/red-ui/src/app/models/file/super-types.ts 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 618b9b02a..f23eab407 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -2,28 +2,17 @@ import { annotationTypesTranslations } from '../../translations/annotation-types import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IComment, IManualChange, ImportedRedaction, IPoint, IRectangle, LogEntryStatus, ManualRedactionType } from '@red/domain'; import { RedactionLogEntry } from '@models/file/redaction-log.entry'; - -export type AnnotationSuperType = - | 'text-highlight' - | 'suggestion-change-legal-basis' - | 'suggestion-recategorize-image' - | 'suggestion-add-dictionary' - | 'suggestion-force-redaction' - | 'suggestion-force-hint' - | 'suggestion-resize' - | 'suggestion-remove-dictionary' - | 'suggestion-add' - | 'suggestion-remove' - | 'ignored-hint' - | 'skipped' - | 'redaction' - | 'manual-redaction' - | 'recommendation' - | 'hint' - | 'declined-suggestion'; +import { + FalsePositiveSuperTypes, + LowLevelFilterTypes, + SuggestionAddSuperTypes, + SuggestionsSuperTypes, + SuperType, + SuperTypes, +} from '@models/file/super-types'; export class AnnotationWrapper { - superType: AnnotationSuperType; + superType: SuperType; typeValue: string; recategorizationType: string; @@ -88,7 +77,7 @@ export class AnnotationWrapper { } get canBeMarkedAsFalsePositive() { - return (this.isRecommendation || this.superType === 'redaction') && !this.isImage; + return (this.isRecommendation || this.superType === SuperTypes.Redaction) && !this.isImage; } get isSuperTypeBasedColor() { @@ -96,7 +85,7 @@ export class AnnotationWrapper { } get isSkipped() { - return this.superType === 'skipped'; + return this.superType === SuperTypes.Skipped; } get isImage() { @@ -112,13 +101,7 @@ export class AnnotationWrapper { } get topLevelFilter() { - return ( - this.superType !== 'hint' && - this.superType !== 'redaction' && - this.superType !== 'recommendation' && - this.superType !== 'ignored-hint' && - this.superType !== 'skipped' - ); + return !LowLevelFilterTypes[this.superType]; } get filterKey() { @@ -129,26 +112,12 @@ export class AnnotationWrapper { return this.topLevelFilter ? this.superType : this.superType + this.type; } - get isManuallySkipped() { - return this.isSkipped && this.manual; - } - get isFalsePositive() { - return ( - this.type?.toLowerCase() === 'false_positive' && - (this.superType === 'skipped' || - this.superType === 'hint' || - this.superType === 'ignored-hint' || - this.superType === 'redaction') - ); - } - - get isManualRedaction() { - return this.superType === 'manual-redaction'; + return this.type?.toLowerCase() === 'false_positive' && !!FalsePositiveSuperTypes[this.superType]; } get isDeclinedSuggestion() { - return this.superType === 'declined-suggestion'; + return this.superType === SuperTypes.DeclinedSuggestion; } get isApproved() { @@ -156,53 +125,39 @@ export class AnnotationWrapper { } get isHint() { - return this.superType === 'hint'; + return this.superType === SuperTypes.Hint; } get isHighlight() { - return this.superType === 'text-highlight'; + return this.superType === SuperTypes.TextHighlight; } get isIgnoredHint() { - return this.superType === 'ignored-hint'; + return this.superType === SuperTypes.IgnoredHint; } get isRedacted() { - return this.superType === 'redaction' || this.superType === 'manual-redaction'; + return this.superType === SuperTypes.Redaction || this.superType === SuperTypes.ManualRedaction; } get isSuggestion() { - return ( - this.isSuggestionAdd || - this.isSuggestionRemove || - this.isSuggestionChangeLegalBasis || - this.isSuggestionRecategorizeImage || - this.isSuggestionResize - ); + return !!SuggestionsSuperTypes[this.superType]; } get isSuggestionResize() { - return this.superType === 'suggestion-resize'; + return this.superType === SuperTypes.SuggestionResize; } get isSuggestionRecategorizeImage() { - return this.superType === 'suggestion-recategorize-image'; - } - - get isSuggestionChangeLegalBasis() { - return this.superType === 'suggestion-change-legal-basis'; + return this.superType === SuperTypes.SuggestionRecategorizeImage; } get isSuggestionAdd() { - return ( - this.superType === 'suggestion-add' || - this.superType === 'suggestion-add-dictionary' || - this.superType === 'suggestion-force-redaction' - ); + return !!SuggestionAddSuperTypes[this.superType]; } get isSuggestionRemove() { - return this.superType === 'suggestion-remove' || this.superType === 'suggestion-remove-dictionary'; + return this.superType === SuperTypes.SuggestionRemove || this.superType === SuperTypes.SuggestionRemoveDictionary; } get isModifyDictionary() { @@ -221,11 +176,11 @@ export class AnnotationWrapper { } get isConvertedRecommendation() { - return this.isRecommendation && this.superType === 'suggestion-add-dictionary'; + return this.isRecommendation && this.superType === SuperTypes.SuggestionAddDictionary; } get isRecommendation() { - return this.superType === 'recommendation'; + return this.superType === SuperTypes.Recommendation; } get id() { @@ -402,7 +357,7 @@ export class AnnotationWrapper { redactionLogEntry: RedactionLogEntry, lastManualChange: IManualChange, isHintDictionary: boolean, - ): AnnotationSuperType { + ): SuperType { switch (lastManualChange.manualRedactionType) { case ManualRedactionType.ADD_LOCALLY: switch (lastManualChange.annotationStatus) { diff --git a/apps/red-ui/src/app/models/file/super-types.ts b/apps/red-ui/src/app/models/file/super-types.ts new file mode 100644 index 000000000..b27c5bd6b --- /dev/null +++ b/apps/red-ui/src/app/models/file/super-types.ts @@ -0,0 +1,57 @@ +import { ValuesOf } from '@iqser/common-ui'; + +export const SuperTypes = { + TextHighlight: 'text-highlight', + SuggestionChangeLegalBasis: 'suggestion-change-legal-basis', + SuggestionRecategorizeImage: 'suggestion-recategorize-image', + SuggestionAddDictionary: 'suggestion-add-dictionary', + SuggestionForceRedaction: 'suggestion-force-redaction', + SuggestionForceHint: 'suggestion-force-hint', + SuggestionResize: 'suggestion-resize', + SuggestionRemoveDictionary: 'suggestion-remove-dictionary', + SuggestionAdd: 'suggestion-add', + SuggestionRemove: 'suggestion-remove', + IgnoredHint: 'ignored-hint', + Skipped: 'skipped', + Redaction: 'redaction', + ManualRedaction: 'manual-redaction', + Recommendation: 'recommendation', + Hint: 'hint', + DeclinedSuggestion: 'declined-suggestion', +} as const; + +export type SuperType = ValuesOf; + +export const LowLevelFilterTypes = { + [SuperTypes.Hint]: true, + [SuperTypes.Redaction]: true, + [SuperTypes.Recommendation]: true, + [SuperTypes.IgnoredHint]: true, + [SuperTypes.Skipped]: true, +} as const; + +export const FalsePositiveSuperTypes = { + [SuperTypes.Hint]: true, + [SuperTypes.Redaction]: true, + [SuperTypes.IgnoredHint]: true, + [SuperTypes.Skipped]: true, +} as const; + +export const SuggestionAddSuperTypes = { + [SuperTypes.SuggestionAdd]: true, + [SuperTypes.SuggestionAddDictionary]: true, + [SuperTypes.SuggestionForceRedaction]: true, + [SuperTypes.SuggestionForceHint]: true, +} as const; + +export const SuggestionsSuperTypes = { + [SuperTypes.SuggestionAdd]: true, + [SuperTypes.SuggestionAddDictionary]: true, + [SuperTypes.SuggestionForceRedaction]: true, + [SuperTypes.SuggestionForceHint]: true, + [SuperTypes.SuggestionChangeLegalBasis]: true, + [SuperTypes.SuggestionRecategorizeImage]: true, + [SuperTypes.SuggestionRemove]: true, + [SuperTypes.SuggestionRemoveDictionary]: true, + [SuperTypes.SuggestionResize]: true, +} as const; 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 0ea4d69c1..e09d3cd18 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,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { AnnotationSuperType } from '@models/file/annotation.wrapper'; +import { SuperType } from '@models/file/super-types'; -export const annotationTypesTranslations: { [key in AnnotationSuperType]: string } = { +export const annotationTypesTranslations: { [key in SuperType]: string } = { 'text-highlight': _('annotation-type.text-highlight'), 'declined-suggestion': _('annotation-type.declined-suggestion'), hint: _('annotation-type.hint'), diff --git a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts index c7d976872..246efd1a9 100644 --- a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts +++ b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts @@ -1,6 +1,6 @@ -import { AnnotationSuperType } from '../../models/file/annotation.wrapper'; +import { SuperType } from '../../models/file/super-types'; -export const SuperTypeSorter: { [key in AnnotationSuperType]: number } = { +export const SuperTypeSorter: { [key in SuperType]: number } = { 'text-highlight': 100, 'suggestion-change-legal-basis': 14, 'suggestion-force-redaction': 15, From 0a5d4dc7eb09606fb9b8988bc5c178c2cefe9718 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 12:06:50 +0100 Subject: [PATCH 08/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8771f72e9..ea8330042 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.273.0", + "version": "3.274.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a99a96b691ab28e0d8273f4db35f10574c42b8fa..e570c342ad502559bcd65d076c89dd5c00e5f8b3 100644 GIT binary patch delta 3126 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 Date: Wed, 2 Mar 2022 14:03:29 +0200 Subject: [PATCH 09/24] RED-3478 -> Updated placeholder text --- .../reports/reports-screen/reports-screen.component.html | 5 ----- .../reports/reports-screen/reports-screen.component.scss | 3 +-- apps/red-ui/src/assets/i18n/de.json | 4 +--- apps/red-ui/src/assets/i18n/en.json | 4 +--- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html index bffe195a8..40f257440 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html @@ -3,11 +3,6 @@
-
-
-
-
-
diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss index 19aac0ebd..09dc44a65 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss @@ -71,8 +71,7 @@ .content-container { > .heading-xl, - > .description, - > .document-setup { + > .description { margin-bottom: 24px; > .all-caps-label { diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 64e622c8a..5f6013ae1 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1482,7 +1482,7 @@ }, "reports": "Berichte", "reports-screen": { - "description": "Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.", + "description": "", "descriptions": { "dossier-attributes": "Dieser Platzhalter wird durch den Wert des Dossier-Attributs {attribute} ersetzt.", "file-attributes": "Dieser Platzhalter wird durch den Wert des Dateiattributs {attribute} ersetzt.", @@ -1511,8 +1511,6 @@ } } }, - "document-setup-description": "Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.", - "document-setup-heading": "Dokumenten-Konfiguration", "invalid-upload": "Ungültiges Upload-Format ausgewählt! Unterstützt werden Dokumente im .xlsx- und im .docx-Format", "multi-file-report": "(Mehrere Dateien)", "report-documents": "Dokumente für den Bericht", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 59b6449b4..165a2dc29 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1623,7 +1623,7 @@ }, "reports": "Reports", "reports-screen": { - "description": "A short text explaining how to create report documents. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.", + "description": "Click the upload button on the right to upload your redaction report templates.", "descriptions": { "dossier-attributes": "This placeholder gets replaced with the value of the dossier attribute {attribute}.", "file-attributes": "This placeholder gets replaced with the value of the file attribute {attribute}.", @@ -1652,8 +1652,6 @@ } } }, - "document-setup-description": "A short text explaining what placeholders are and how to use them in your report template. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.", - "document-setup-heading": "Document Setup", "invalid-upload": "Invalid format selected for Upload! Supported formats are XLSX and DOCX", "multi-file-report": "(Multi-file)", "report-documents": "Report Documents", From 2e443df6802c2e2ee8c2a9130c641d3e4dba8580 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 13:18:49 +0100 Subject: [PATCH 10/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3216 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea8330042..f68a199fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.274.0", + "version": "3.275.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e570c342ad502559bcd65d076c89dd5c00e5f8b3..d6c21acf6fc32c01e35e844ea097204472ff0439 100644 GIT binary patch delta 3128 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 S+|KP6+x`!-3UFEgPyhh20Tnd> delta 3127 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 Rx&30>{{hXkx=8>~0089tB`^R0 From 5706ee12d7f6bc2dba387945da3f2bede238c721 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 2 Mar 2022 15:51:16 +0200 Subject: [PATCH 11/24] updated "i18n:extract" cmd to generate also "de" keys for translations --- apps/red-ui/src/assets/i18n/de.json | 236 ++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 190 insertions(+), 48 deletions(-) diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 5f6013ae1..744ec25c2 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1,10 +1,13 @@ { + "accept-recommendation-dialog": { + "header": "", + "multiple-values": "" + }, "account-settings": "Account Einstellungen", "actions": { "all": "Alle", "none": "Keine" }, - "active": "Aktiv", "add-dossier-dialog": { "actions": { "save": "Speichern", @@ -68,6 +71,16 @@ "save": "Attribut speichern", "title": "{type, select, edit{Dossier-Attribut {name} bearbeiten} create{Neues Dossier-Attribut hinzufügen} other{}}" }, + "add-edit-dossier-state": { + "form": { + "color": "", + "color-placeholder": "", + "name": "", + "name-placeholder": "" + }, + "save": "", + "title": "" + }, "add-edit-dossier-template": { "error": { "conflict": "Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen.", @@ -141,10 +154,6 @@ "settings": "Einstellungen" }, "annotation": "Anmerkung", - "references": { - "singular": "", - "plural": "" - }, "annotation-actions": { "accept-recommendation": { "label": "Empfehlung annehmen" @@ -155,15 +164,12 @@ "edit-reason": { "label": "Begründung bearbeiten" }, - "force-redaction": { - "label": "Schwärzung erzwingen" - }, - "see-references": { - "label": "" - }, "force-hint": { "label": "Hinweis erzwingen" }, + "force-redaction": { + "label": "Schwärzung erzwingen" + }, "hide": "Ausblenden", "message": { "dictionary": { @@ -268,11 +274,15 @@ "resize": { "label": "Größe ändern" }, + "see-references": { + "label": "" + }, "show": "Zeigen", "undo": "Rückgängig" }, "annotation-changes": { - "forced": "Redaktion erzwungen", + "forced-hint": "", + "forced-redaction": "", "header": "Manuelle Änderungen:", "legal-basis": "Grund geändert", "recategorized": "Bildkategorie geändert", @@ -295,14 +305,15 @@ "suggestion-add": "Vorschlag für Schwärzung", "suggestion-add-dictionary": "Vorschlag für neuen Wörterbucheintrag", "suggestion-change-legal-basis": "Vorschlag für Änderung der Rechtsgrundlage", + "suggestion-force-hint": "", "suggestion-force-redaction": "Vorschlag für erzwungene Schwärzung", "suggestion-recategorize-image": "Vorschlag für Rekategorisierung eines Bilds", "suggestion-remove": "Vorschlagen, die Schwärzung zu entfernen", "suggestion-remove-dictionary": "Vorschlag für Löschung eines Wörterbucheintrags", - "suggestion-resize": "Vorgeschlagene Größenänderung" + "suggestion-resize": "Vorgeschlagene Größenänderung", + "text-highlight": "" }, "annotations": "Anmerkungen", - "archived": "Archiviert", "assign-dossier-owner": { "dialog": { "approvers": "Genehmiger", @@ -310,7 +321,6 @@ "no-reviewers": "Es gibt noch keine Reviewer.\nBitte aus der Liste unten auswählen.", "reviewers": "Reviewer", "search": "Suche ...", - "select-below": "Wählen Sie aus der Liste unten aus.", "single-user": "Besitzer" } }, @@ -384,6 +394,7 @@ }, "header": "Begründung für die Schwärzung bearbeiten" }, + "color": "", "comments": { "add-comment": "Kommentar eingeben", "comments": "{count} {count, plural, one{Kommentar} other{Kommentare}}", @@ -399,17 +410,29 @@ } }, "configurations": "Einstellungen", + "confirm-delete-dossier-state": { + "cancel": "", + "delete": "", + "delete-replace": "", + "form": { + "status": "", + "status-placeholder": "" + }, + "suggestion": "", + "title": "", + "warning": "" + }, "confirm-delete-file-attribute": { "cancel": "{type, select, single{Attribut} bulk{Attribute} other{}} behalten", "delete": "{type, select, single{Attribut} bulk{Attribute} other{}} löschen", - "file-impacted-documents": "Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen", "dossier-impacted-documents": "", - "file-lost-details": "Alle in die Dokumente eingegebenen Daten gehen verloren", "dossier-lost-details": "", + "file-impacted-documents": "Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen", + "file-lost-details": "Alle in die Dokumente eingegebenen Daten gehen verloren", + "impacted-report": "{count}", "title": "{type, select, single{{name}} bulk{Datei-Attribute} other{}} löschen", "toast-error": "Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!", - "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!", - "impacted-report": "{count}" + "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!" }, "confirm-delete-users": { "cancel": "{usersCount, plural, one{Benutzer} other{Benutzer}} behalten", @@ -470,18 +493,25 @@ "question": "Möchten Sie {filesCount, plural, one{dieses Dokument} other{diese Dokumente}} wirklich löschen?", "title": "{filesCount, plural, one{{fileName}} other{ausgewählte Dokumente}} löschen" }, + "report-template-same-name": { + "confirmation-text": "Ja. Hochladen fortsetzen", + "deny-text": "Nein. Hochladen abbrechen", + "question": "{fileName}", + "title": "Hochladen von Berichtsvorlagen" + }, + "unsaved-changes": { + "confirmation-text": "", + "details": "", + "discard-changes-text": "", + "question": "", + "title": "" + }, "upload-report-template": { "alternate-confirmation-text": "Als Bericht für mehrere Dokumente hochladen", "confirmation-text": "Als Bericht für ein Dokument hochladen", "deny-text": "Uploads abbrechen", "question": "Wählen Sie bitte aus, ob {fileName} eine Berichtsvorlage für eine oder für mehrere Dateien ist", "title": "Upload der Berichtsvorlage" - }, - "report-template-same-name": { - "confirmation-text": "Ja. Hochladen fortsetzen", - "deny-text": "Nein. Hochladen abbrechen", - "question": "{fileName}", - "title": "Hochladen von Berichtsvorlagen" } }, "content": "Begründung", @@ -616,7 +646,6 @@ "title": "Datei-Attribute anlegen" }, "dossier": "Dossier", - "dossier-states": "", "dossier-attribute-types": { "date": "Datum", "image": "Bild", @@ -701,10 +730,11 @@ "total-people": "Anzahl der Benutzer" }, "table-col-names": { + "documents-status": "", + "dossier-status": "", "name": "Name", "needs-work": "Arbeitsvorrat", - "owner": "Besitzer", - "status": "Status" + "owner": "Besitzer" }, "table-header": { "title": "{length} {length, plural, one{aktives Dossier} other{aktive Dossiers}}" @@ -763,6 +793,7 @@ "edit": "Dossier bearbeiten", "upload-document": "Dokument hochgeladen" }, + "import-redactions": "", "new-rule": { "toast": { "actions": { @@ -794,8 +825,8 @@ }, "table-col-names": { "added-on": "Hinzugefügt", - "last-modified": "", "assigned-to": "Zugewiesen an", + "last-modified": "", "name": "Name", "needs-work": "Arbeitsvorrat", "pages": "Seiten", @@ -808,14 +839,46 @@ "under-review": "In Review", "upload-files": "Sie können Dateien überall per Drag and Drop platzieren..." }, - "dossier-templates": { - "label": "Dossier-Vorlagen", - "status": { - "label": "", - "active": "", - "incomplete": "" + "dossier-states": "", + "dossier-states-listing": { + "action": { + "delete": "", + "edit": "" + }, + "add-new": "", + "chart": { + "dossier-states": "" + }, + "error": { + "conflict": "", + "generic": "" + }, + "no-data": { + "title": "" + }, + "no-match": { + "title": "" + }, + "search": "", + "table-col-names": { + "dossiers-count": "", + "name": "" + }, + "table-header": { + "title": "" } }, + "dossier-template-info": "", + "dossier-template-info-screen": { + "created-by": "", + "created-on": "", + "description": "", + "dictionaries": "", + "entries": "", + "modified-on": "", + "valid-from": "", + "valid-to": "" + }, "dossier-templates-listing": { "action": { "delete": "Dossier-Vorlage", @@ -848,12 +911,20 @@ "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}" } }, + "dossier-templates": { + "label": "Dossier-Vorlagen", + "status": { + "active": "", + "incomplete": "" + } + }, "download-includes": "Wählen Sie die Dokumente für Ihr Download-Paket aus", "download-status": { "queued": "Ihr Download wurde zur Warteschlange hinzugefügt. Hier finden Sie alle angeforderten Downloads: My Downloads." }, "download-type": { "annotated": "PDF mit Anmerkungen", + "delta-preview": "", "flatten": "PDF verflachen", "label": "{length} Dokumenten{length, plural, one{version} other{versionen}}", "original": "Optimiertes PDF", @@ -951,6 +1022,11 @@ "label": "Beschreibung", "placeholder": "Beschreibung eingeben" }, + "dossier-status": { + "label": "", + "no-status-placeholder": "", + "placeholder": "" + }, "due-date": "Termin", "name": { "label": "Dossier-Name", @@ -975,8 +1051,7 @@ "members": "Mitglieder", "team-members": "Team-Mitglieder" }, - "side-nav-title": "Konfiguration", - "unsaved-changes": "Sie haben nicht gespeicherte Änderungen. Speichern Sie oder machen Sie die Änderungen rückgängig, bevor Sie die Registerkarte wechseln." + "side-nav-title": "Konfiguration" }, "error": { "deleted-entity": { @@ -996,6 +1071,7 @@ "http": { "generic": "Aktion mit Code {status} fehlgeschlagen" }, + "missing-types": "", "offline": "Du bist offline", "online": "Du bist online", "reload": "Neu laden", @@ -1003,12 +1079,32 @@ }, "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr", "file": "Datei", + "file-attribute-encoding-types": { + "ascii": "", + "iso": "", + "utf8": "" + }, "file-attribute-types": { "date": "Datum", "number": "Nummer", "text": "Freier Text" }, "file-attributes": "Datei-Attribute", + "file-attributes-configurations": { + "cancel": "", + "form": { + "delimiter": "", + "encoding-type": "", + "key-column": "", + "support-csv-mapping": "" + }, + "save": "", + "title": "", + "update": { + "error": "", + "success": "" + } + }, "file-attributes-csv-import": { "action": { "cancel-edit-name": "Abbrechen", @@ -1074,6 +1170,7 @@ "bulk-actions": { "delete": "Ausgewählte Attribute löschen" }, + "configurations": "", "error": { "conflict": "Es gibt bereits ein Attribute mit diesem Name!", "generic": "Attribute konnte nicht erstellt werden!" @@ -1112,6 +1209,10 @@ "exclude-pages": "Seiten von Schwärzung ausschließen", "excluded-from-redaction": "Von Schwärzung ausgeschlossen", "fullscreen": "Vollbildmodus", + "highlights": { + "convert": "", + "remove": "" + }, "last-reviewer": "Zuletzt überprüft von:", "no-data": { "title": "Auf dieser Seite gibt es keine Anmerkungen." @@ -1131,9 +1232,12 @@ "jump-to-previous": "Springe zu Vorheriger", "label": "Arbeitsvorrat", "page-is": "Diese Seite ist", + "reset": "", "select": "Auswählen", "select-all": "Alle", - "select-none": "Keine" + "select-none": "Keine", + "the-filters": "", + "wrong-filters": "" }, "document-info": { "close": "Dokumenteninformation schließen", @@ -1156,8 +1260,13 @@ "put-back": "Rückgängig machen", "removed-from-redaction": "Von der Schwärzung ausgeschlossen" }, + "highlights": { + "label": "" + }, "is-excluded": "Schwärzungen für dieses Dokument deaktiviert." }, + "text-highlights": "", + "text-highlights-tooltip": "", "toggle-analysis": { "disable": "Schwärzen deaktivieren", "enable": "Schwärzen aktivieren", @@ -1165,16 +1274,20 @@ } }, "file-status": { + "analyse": "", "approved": "Genehmigt", "deleted": "Gelöscht", "error": "Reanalyse erforderlich", "full-reprocess": "Wird analysiert", "image-analyzing": "Bildanalyse", "indexing": "Wird analysiert", + "initial-processing": "", + "ner-analyzing": "", "new": "Neu", "ocr-processing": "OCR-Analyse", "processed": "Verarbeitet", "processing": "Wird analysiert...", + "re-processing": "", "reprocess": "Wird analysiert", "unassigned": "Nicht zugewiesen", "under-approval": "In Genehmigung", @@ -1185,6 +1298,7 @@ "filter-options": "Filteroptionen", "filter-types": "Filter", "label": "Filter", + "pages-without-annotations": "", "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen", "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten", "with-comments": "Nur Anmerkungen mit Kommentaren" @@ -1201,12 +1315,13 @@ }, "filters": { "assigned-people": "Beauftragt", + "documents-status": "", + "dossier-status": "", "dossier-templates": "Regelsätze", "empty": "Leer", "filter-by": "Filter:", "needs-work": "Arbeitsvorrat", - "people": "Dossier-Mitglied(er)", - "status": "Status" + "people": "Dossier-Mitglied(er)" }, "general-config-screen": { "actions": { @@ -1259,6 +1374,30 @@ "text": "Hilfe-Modus", "welcome-to-help-mode": " Willkommen im Hilfe-Modus!
Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten. " }, + "highlight-action-dialog": { + "actions": { + "cancel": "" + }, + "convert": { + "confirmation": "", + "details": "", + "save": "", + "title": "" + }, + "form": { + "color": { + "label": "" + } + }, + "remove": { + "confirmation": "", + "details": "", + "save": "", + "title": "" + }, + "success": "" + }, + "highlights": "", "hint": "Hinweis", "image-category": { "formula": "Formel", @@ -1352,10 +1491,6 @@ } } }, - "accept-recommendation-dialog": { - "header": "", - "multiple-values": "" - }, "months": { "apr": "Apr.", "aug": "August", @@ -1447,7 +1582,12 @@ }, "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen" }, - "pending-changes-guard": "ACHTUNG: Sie haben ungespeicherte Änderungen. Klicken Sie auf „Abbrechen“, wenn Sie zurückkehren und die Änderungen speichern möchten. Klicken Sie auf „OK“, um die Änderungen zu speichern.", + "processing-status": { + "ocr": "", + "pending": "", + "processed": "", + "processing": "" + }, "readonly": "Lesemodus", "recategorize-image-dialog": { "actions": { @@ -1462,6 +1602,7 @@ "header": "Bildtypen bearbeiten" }, "redaction": "Schwärzung", + "references": "", "remove-annotations-dialog": { "cancel": "Abbrechen", "confirm": "Ja, fortfahren und löschen!", @@ -1589,6 +1730,7 @@ "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen", "this-dossier": "in diesem Dossier" }, + "size": "", "smtp-auth-config": { "actions": { "cancel": "Abbrechen", @@ -1608,8 +1750,8 @@ "no-time-left": "Frist für Wiederherstellung verstrichen" }, "toggle-auto-analysis-message": { - "success": "", - "error": "" + "error": "", + "success": "" }, "top-bar": { "navigation-items": { diff --git a/package.json b/package.json index f68a199fc..23f8c287a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "nx build", "build-lint-all": "ng build --project=red-ui --configuration production --base-href /ui/", "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css", - "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", + "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/{en,de}.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", "postinstall": "ngcc --properties es2015 browser module main", "lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix", "nx": "nx", From 590df015de0ac3ceb7dae07e0d4567c839a30827 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 14:55:33 +0100 Subject: [PATCH 12/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3216 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 23f8c287a..b1b944a92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.275.0", + "version": "3.276.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d6c21acf6fc32c01e35e844ea097204472ff0439..a5cd130bd0aee911eb9e83f41c536c3a9d5d8c78 100644 GIT binary patch delta 3127 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 S+|KP6+x`!-3UFEgPyhh20Tnd> From 12c514416be4a912304b7d8e452da646fda6184a Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 2 Mar 2022 19:10:06 +0200 Subject: [PATCH 13/24] Fixed viewed pages missing --- .../modules/dossier/services/annotation-processing.service.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index de2bdaab0..05dd51983 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -9,7 +9,7 @@ import { IViewedPage } from '@red/domain'; @Injectable() export class AnnotationProcessingService { static secondaryAnnotationFilters(viewedPages: IViewedPage[]): INestedFilter[] { - const _viewedPages = viewedPages.map(page => page.page); + const _viewedPages = viewedPages ? viewedPages.map(page => page.page) : []; return [ { id: 'with-comments', diff --git a/libs/common-ui b/libs/common-ui index 4d045682a..2cfe09a07 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 4d045682ab46688934883450706e8aee8e2f1d02 +Subproject commit 2cfe09a07083fb75ab070c5f428d2a1482213b7b From 8b9616fec391cdfcef679ef01908a227b155420d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 2 Mar 2022 19:10:46 +0200 Subject: [PATCH 14/24] Fixed viewed pages missing --- .../modules/dossier/services/annotation-processing.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index 05dd51983..1bb000a10 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -8,7 +8,7 @@ import { IViewedPage } from '@red/domain'; @Injectable() export class AnnotationProcessingService { - static secondaryAnnotationFilters(viewedPages: IViewedPage[]): INestedFilter[] { + static secondaryAnnotationFilters(viewedPages?: IViewedPage[]): INestedFilter[] { const _viewedPages = viewedPages ? viewedPages.map(page => page.page) : []; return [ { From 1be1558199bfdab5cc7021d438feffc7f888425b Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 18:15:10 +0100 Subject: [PATCH 15/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1b944a92..465368b05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.276.0", + "version": "3.277.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a5cd130bd0aee911eb9e83f41c536c3a9d5d8c78..7b3b15a2d577402d845cb2784c3796c2f831a9f6 100644 GIT binary patch delta 3061 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 Date: Wed, 2 Mar 2022 22:24:35 +0200 Subject: [PATCH 16/24] update 'remove_from_dictionary' key --- .../annotation-actions/annotation-actions.component.html | 2 +- apps/red-ui/src/assets/help-mode/links.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 cb6148826..0ec4827e0 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 @@ -149,7 +149,7 @@ [tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate" [type]="buttonType" icon="red:remove-from-dict" - iqserHelpMode="skipped_remove_from_dictionary" + iqserHelpMode="remove_from_dictionary" [scrollableParentView]="scrollableParentView" > diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 7dacb0fa5..ae6cc5c82 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -119,8 +119,8 @@ "it": "", "fr": "" }, - "skipped_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=skipped_remove_from_dictionary", + "remove_from_dictionary": { + "en": "/en/index-en.html?contextId=remove_from_dictionary", "de": "", "it": "", "fr": "" From 4f583c6628d6dcff63d275542113fe256a4a5036 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 2 Mar 2022 21:28:49 +0100 Subject: [PATCH 17/24] 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 465368b05..cc552184d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.277.0", + "version": "3.278.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7b3b15a2d577402d845cb2784c3796c2f831a9f6..e49e78fe9cdf1ccd2ff12c7054836aada06e75be 100644 GIT binary patch delta 3126 zcmV-649WA48IBo{cYhf;uJ63E9Xqi7S19;Fs2Q}TX1GG=$5`s;*yg(a<&T;@Wu*ST ztl@P1dmeP1_5UNZz51_6j3Xw;=22aL*cx2H3x7)go&)Oc^&bQQ=zkIT!7F5czpR?u zFI@j`q7+v(Vd(O&Uw>h(F7Gbh&}~^%3^i4Db(u0&*6W*_q<_d+J>L|?CL_3{^*k!J zH((I%?-IPF+0!R~E=m5|uW(+kDZ|<9VUw~q_6)Z1ojvo#-$49bh`&qmcLjePF~<>e z95Kfca~v_p;d6cy)4I&?(vc$yq9Ot^#L@kxDw;gDq9QA*HTuY1dEkb|a42;I2p5J`(|2Tz z7Cv7=&4AC8GTC* z!a6P9N_iU$D31L&5ST9B zY)MQpD)Q_J)lo%Aj&L5MD`kr;`F^_=xXk-n)1dFRaxm}hfo21_yPr8z3Bjy^&tq9(%7|4qVSh#=%oRH!98Fu#``}+A+~Ux6E?~Tl(@tvw|8T|tMNGH zQGcg3X&`K!(5hxulv3$zgcw@+z`8eJLOF6L!BOh(ESOQ2k=evVaBGq1VMWx=9L7?2 zb!05{7J8_&PaqHB69~jcM}NXvt@}DWb>zjUJH~hKTI$+ZqC~K_5Hx zAEJ-cM|@9B*#yW!buZ&U@L_?@Q+3($Wrs{14>9tN=P6s#RNJ?!5=GffTU%{y2eB!8u& z@TO2W_HB>iGmifU-9_N280(TGaOwWBnnsqy;#cc7`7+t3it^q%l=kLM2=(1=IuO>PF;jdwJB`j`Lx`#&|hN`K#f+az>D z&=(b$M}9rTHoY4H$&sGyTNSCBj7=qwNdW(rEt~}4NHOhvnT%+C#E@C!-gWvYxUzY0 zUA5CRAIT37RviL4zf4 z^{_A3=_%?3W#Xro3%J~mZu z4Kd0*VL<3qwYA$xVk0g5PIkxVUxvk@F#Xs}01W6m*dUW`?mQ~WCx3C=VaBx^R}Z=Z zUT=Zk))h<^1C~Xte;>p{$cUW%DvTXf|F34 z8!|}0HR)J~9|!qjf;Ev~NiSj@FHp|yu=9g*}METuUg zfPCre3P|9&k$?F0M<~=FoWalM0k!k2*c65{A_&`UZt|=4QU=SzJQaAoh9DT;Q*g8$ zCEAg_BVFtP7>fy7b-At0Odo?Sg>bkRn@PrFMXJ{wJ9obe9HzNH^7X|*5{|gFIEZ8R zLF>HWj^a4M_9|KOs{^mg6m$I68f`}{?O4cVMl5zAFd@WvWJt-7_))JS=?nnzYdZrcqBG zZSMhj$yw+$T2)#(#P+EYY71gSxMDPtCE@sjXjlKc&QN_@JQL!PoB)>}#*#H$K*Vt;!~`aGILx0`V-+D(Qshabp|%*iuf zn|0j-!AKYw_8mI z2^xpHdl;Qh#iIAw?+LfzYR%8#14XgSuVYu2Va(55gA zVSl~i+u}gB(u+zuTP6SLl{|5ID4CJxdXlHzub#DCm*jBQ0gUR$fb>RCd&r8gZpUTPaCv&3{H;WFjP~{;SlTi`)CWxj4KvJUN-Pi{Vy$ z?r^jpz-0V1SaFxLbt!`pVhu95lJ`tSVzH-^T#vKJ{%BHMiWT8MfywF1M|D!?WA`1< zcJ4^Y51=69dyNYP468kT@a-9-0yDG-_|b#oUyl|8&6S$)4UW`o-0E>Je^^JO0e^WS z#N^xth9UsR2C))n9nvPR3EM@|BAc~eh8M(I^ipo9e-=*|6naj0xu9}kda$65|KRTw z_7Wq4@d0usQ?~<{`yhA-|4ZH=sJM@KdZ139d~u*pI_{yt0OrW|1p{(k{H$Pz?UO|h2Q;&k3|K0sWU_3%YPic$u76= za=R|C@AA4Xzwh$9uAuJf zeJ4J5e;zAuh_QQSdk|xwVN`TK#ONK1(f3r0is`&C;6INoZYmU00H6wP5=M^ delta 3127 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 Ro!c+A{U5Gc98&;L007w!DD40M From aaf7441a3566f5041b3d58e06aa29205fb43702e Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 3 Mar 2022 10:36:45 +0200 Subject: [PATCH 18/24] import redactions icon --- .../red-ui/src/assets/icons/general/import_redactions.svg | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 apps/red-ui/src/assets/icons/general/import_redactions.svg diff --git a/apps/red-ui/src/assets/icons/general/import_redactions.svg b/apps/red-ui/src/assets/icons/general/import_redactions.svg new file mode 100644 index 000000000..211373806 --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/import_redactions.svg @@ -0,0 +1,8 @@ + + + + + + + + From 30ab916811515b6d02e90502d475e60b2d3ca7e9 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 3 Mar 2022 10:39:02 +0200 Subject: [PATCH 19/24] highlight icon --- .../shared/components/file-actions/file-actions.component.ts | 2 +- apps/red-ui/src/app/modules/icons/icons.module.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 829c33302..9f9621126 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 @@ -150,7 +150,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, type: ActionTypes.circleBtn, action: $event => this._triggerImportRedactions($event), tooltip: _('dossier-overview.import-redactions'), - icon: 'iqser:upload', + icon: 'red:import_redactions', show: this.showImportRedactions, }, { diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts index 2d334e6f6..4834f495e 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -36,6 +36,7 @@ export class IconsModule { 'fullscreen', 'html-file', 'info', + 'import_redactions', 'lightning', 'logo', 'nav-first', From de38288e054efb2440dba083d0f366b4475bd817 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 3 Mar 2022 09:43:36 +0100 Subject: [PATCH 20/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3212 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc552184d..f27de02d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.278.0", + "version": "3.279.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e49e78fe9cdf1ccd2ff12c7054836aada06e75be..af5adc55163f3ccc3807b6db0f681d05d1881272 100644 GIT binary patch delta 2945 zcmV-{3x4#D8H^b+ABzY80000000ZqC+j8T!HP8ME)R}hdRFrv@WO=gPWSX=uolcXq zed!BGf+A{)lpK{T$m|*T4Kxv!{&I-~$+3A<*B`b9SMb80(!b|8 zp4aPt;Rm4qMF7*0{r$3PZohE-zm8H|)r6tTzkc(jwYt2!cz;c|Wl=HIRN2*K%2-*i zZ*GzzXZ3tj6q}6TlGgL6*xrCaxW7yAmS#_%{<$RiZ@xemynB#~!j+ohjeRnbE^x@1(364pH z{&j)SJB#Kqd4F6Z=MH|Qgu?o37cz5wUfLO0Xk`xsYkRgulH&xN(u@x0rQLWL( z?#gq0XAFl@M}Tl)ST%h|)@b4L1!UKQT$XbLeHqP()seDVwiCCw+R)r$MG3$wtuHJX zE4Dzjk!aNYtO>57R1mVokJbZ?SqivpTSc};xM2nVU4IreWwd~vie#A4x8yMHdHZQ4 zlw`43Nv;B0^w%6|SX5k&$SEIDU1T&yAIDxC#CSJoRXCx0Qo= zZx1vZ$ld+SnMw#|4TMf06T|?p84gJ%R*;@-jeqhY7yEELdum=M8_-lntg;C+8ey*3 z3E^nkdfo^B3gH%qt}99XiQvE&bTeDLT3%>%F38Fg^5~=DDm8~a_2$0?6Gtw{r6>x5P{v!awrXCuVW$_LiH0TarRI|+_be`mpr zvW(0oCW2dwL=P*XcIGgax~n5&skhKWoqYm%2%kV8Hahwf)@t3?DJv=tZ|q^LKupj1~> z=Wg_fyf8#$ci+|!hzuIgmb(hRXtc|IjK2+)qk(^Rgq<|4wu>Iq#~0{uO^9J`8~4V7j;d6T%d)K z9xv?82b{4H%G*hl%Sb_a-+)>fK_O(EA($wa$`*YQQ&v<%TeT;xC5T2;LarU9871%k zD+x_W)$pV^gM@QPtTVX}Y-eYPUrLSF@4o|0)!c@Lc&7J+hkHDK$bd#XVt;RPGuUpt zqv5l^{O{lYsnJ#X{@W&@8-l*9z&!HnA-3t=5J-;nWZ$Yt-DGSkflLDUw`}1g07r^x z=gVY7>m!EDBKNM-N5PfNgB$-RAev0B(ax=vEmWjtId z`4T^#<1wMy;!Mz-Q4Ja_d4H>ieYs9gQ7A|ZsLoXB5l z@zs_d>pP7)hw;din-KL0W-4u6H|CuRa*K;OXz znRIjKQBgjL;|?>f-MD(t74Uis^tP^GvKX)|`lbdAl@$fvAtMueGRzuro-!DVZGVf|aXo=_h8)LHCqcf5!;HjWeYf823ft;n zUa)?G#rTKCH!Js6w|@yvLUnG)ApPE0BKuvdcBoI_uy*1k8ha18%K1PX#n=bX?uyF<1Y^%{uhr>q8XDbOkg_r1 z_*zG<99VYqHWhh-oK&s2v>}%><+qV&Fyz4y#yASS(U5NxpMMw%rpZ_sB`b!OM&*j3 zl~I=)UL^>|Y&%KpAsCEt&Vq;px7un?kY^PS0x(I!l@}TYU8ADqV7m(fP>Hj;ogr-s zuaX_Dn%Y@ILxgCeAohs1XiBnjTf}6y3kChsDf7);)0l*K^2BhbS*V>LJ%y>=*jrp( z?Xj3^Z9;1g*MB-9={s0Tb3Oq1(l-^5z;h$<>yJ>VK{$h-&jV`bS+OY$XG9RT+uY<= z?WGKshj}XSdJRD^yrM!5zhMg6&nZEwgXIoR;KKy6-3{;X&?{3{7hN03rKtAw0*6eKLUrN@)6)K*loU>w^*LXI-++ z&~jmZe`-YXiXUlp7&;kdBvCW5DWE3X2i{dNM}Y4~mAE&>gd>ZkYQBSFhVTs|yrb`TE@r&U{x849ZlE z7Q1I;0(e;X>@{hl1x%x!Jlfs^@{+UAX|$@ea)|9yCDazgh;YSdBum2a1<|k~xR3|z z!bEr}S>g?mU$rVm2HURa1IUkcf?pvcs?;?gvwxNNbTNlKWkamDlst%673#$HnDlux zhi*6HTC|%CWez`(8<~@5zBcQ+2ZE7E+HE+~eu^6(vyKh6I5xYXecrYcg?)$vfTXB^ zum(!*D#A4xQg`&h!EU#j4iYpDclR(lpNd8Av)>bL!_}If*FnG)EDMzvzZmP2xEVhz zYk&AU@Qu-OtWDRfO?RM8VH(1E#ka+QY^4{Kbhb+V(<^!6@=!7(&-ElvyI(zPyDrJ$ zt^*j=j|GSJCDSxl+H8MHU@IoXAE<$LcrDyMF;L@|3=t8|qAMujk%b%x7uPBSDD@=q z?YExr_NOGe{lPVpdZVKTeIrczU*lQFNPnd(UB0O7s4F$%N`jX|UohXX{c1Bg7hHa3$}Vio{}1CAl7Fk^Rx6 zxD+eGe*%-!myhbC&d2UMpzYj|k{>`p#`hW*3K&*<`rz9$NCjqS5%8l2$G;ve27j6> zHQ^f^soA*I<6i!-jz$CWM2N|`4Gcv9jtycZ&N`$`UK6&9q(wGszYH&kwdkeXQ2#8R zFevn#@Nz-r!t`K49sj}KDeNUi1mgqbOr~xJF!w?55dN3EK~QlY@$^8QKKbH6pLEo?}W;#O8GLr_mE*hiav3D`bDateV>|T>o#P6jwE2=<=^$e_^dI?|&}d&}~^%3^i4Db(u0& z*6W*_q{vx4-xS3rBeS^Zzf19V1%Dke#}RWJF~<>e95Kh?bAA)ky3Fv?C-nm^FR$+|=A1s9St-FW zsnEYJ5PE0PJbxySYvkO)uar<&e~tXWE+6kMo(B-?bx4w;A_6kR(fy_>nmo3mA}gvj z`p8{*;D*LnRIEmo8Oywdu@ zg0W%?R2zv#-OrlfDoO<*Tl{D}(3quw%eGZyYlItC@PFTBQBy_>=&4AC8GTC*N2CWLmw5fsfmM(*wlO#Ejmh~D8 zAtGs!b&4-a98vbPM)rJpBC^@bRvuc5W*3gM3(W?c)iH`43%|s1O!EyOa6#VA@+d4J z%Uj@H|9?0HRW*!ox~i5UVW&IvT%FFOzE}m@yTldA*`1O9sHtk+RTea7q%zoo&8tq9(%7|4qVMZg& z6+0muOt<#EoGU*p8cmX->ZwB~xvixi+c`x?cVxX+)C{JFp3^*+ z_R%>$p`TuWn~KJ~gMV6#Y@wGCPFS;rScROV;{WwCHW)~72docP)53=w(=??>MPswy zXn%YG>E?~Tl(@tvw|8T|tMNGHQKvO&AZ(q`s%BP{Qt51j7+U$jx;J1#IdUh#QR?q3 zm{FFI*~CO}Ymw+-Mbyq5#!`26WGwX-dZ@EcAP?aa2*gH5f5KX=`#NPs#o>(|EF+K1 zib+&dxOM5Eds1=POjFflcRt%Zdt^xJrgrT;Cdh#^Y=RwUL=%+i zit5~r9+4M@i0tm$8UnFFA3O9PqL0)^d{0f;1js^lFXKS)VS&!%F!wpdHkb(n$2g6F z+vsvn9u99lMxWC>Ba}7y27P>UF$ZK8NPuLPWAvn#|47{B@=|aM(0?zg`y?wK27j>b z6s#RNJ?!5=GffTU%{y2eB&DP9rcgNcZI9wJk~i!fskS74{~cE_vdXGRXf{CRPts#A zRb)6yD;lMYZcHQvlUNe3$MRJZrAd?Diy*ASFQ%z*d-%^olEcb0M?CrI7%W0kCE5FL zqm)2@jlLAc|DSM9cu>ntZV=YOyIb-paJ4A$W?`;1g%lIhhX(JQ}4_WPo)DUb`a zFw*0Nz4?GMHbQwjiEPF; zjdwJB`j`Lx`#&|hO5cCmBy>a27ZsRCem%rCy&D3_k)G^Z6{(wyO(l>?0RNUPoCM%V zG3|VrjA(ttkXhv3b^0i{vUzah{{%#n$u-)!wUQi9WND{mVtQ!w+?LSMsvV;#gsO~( zD0lAe|w{anwnWFXAvGF<9TNce}#2 zI+z!%pI|ZmVe!q%y?@nhf|F348!|}0Hn4TG*x(Q>fe1p%nUS>4W% zHicKoj#f?Wtf3)7G*J+HL|Zf^S-CA@vfG7%e(99?=B{Z>LOgk5xYI1uPLQ6$)Nbr8 zuCDf2%(XV5wSR|e9g*}METuUgfPCre3P|9&k@)pTDAXXF!O!Obwezgl6oxY*2-|IL z@~iez2Ft@d6?nadAQ;|LaI_sI+L65@UF-oEiwRnFxvkAiAA>E0aJUznNycMEs@EMm zcfSi9rnx`z^~FIFj<~frh-3Ca>%8EO;yA(fDp~TY1Ani}6m$I68f`}{?O4cVMl@f;kr7qu8h?=4N_@JQL!PoB)>}#*#H$K*VtY*b zJeotdn{h4LO@=auAIOc&$unP@b=?EONF?nxoM}JBjgMK!23s7P-OxU7+lj(H!~sB3 zR6tk*C3h9!nhdEs`ru%D&Clx~;0l(7%8Or&^-0`} zAAgoLd>#14XgSuVYu2Va(55gAVZGwp;y||2i%L3MCI9J_JaKs_nUUvulBeCTp0!<< z$x4up$ql>wA` zlKA#pPk8%N65ambnn}IUQG>n_CjGDRtbb#q(v>b>RCd&r8gZpUTPaCv%|>5jA|$E) ztJIx~+xxt^IJ`AHIhnMJ;Z}U^aI_!5Wc)N(ahJ1oDT5JW4Klcr_e@1%v8R$;kF&`B zXi{8?72!XD$?3~SbyDYJ_Z`r7?nucGpdjOWjSB?~t37@2?HQy3Gqec!(Sze(kAD^e z&6S$)4UW`o-0E>Je^^JO0eK?COWq);xQ}>xpiZBBaiC8+ z?xDc|=E(O219D#ctYC=mB^k7?-8=3P!GO=bZwF2hWM814B*@+$msJsw7_3i}X!Dwp t^1!Rxi4@NEiFtA--uy-M^7DR!IGf*OP|}{Rk3TQ_TQS003}}qDue( From f5f66a5712fdc54b858f625ba47f0b598bd3b339 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 3 Mar 2022 15:23:33 +0200 Subject: [PATCH 21/24] RED-3515 -> As a user I want to edit the add-to-dictionary text --- .../manual-annotation-dialog.component.html | 21 ++++++++++++++++-- .../manual-annotation-dialog.component.ts | 22 ++++++++++++------- apps/red-ui/src/assets/i18n/de.json | 2 ++ apps/red-ui/src/assets/i18n/en.json | 2 ++ 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html index fee0300fa..683014683 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html @@ -4,10 +4,27 @@
-
+
+
+ {{ data.manualRedactionEntryWrapper.manualRedactionEntry.value }} + +
+
- {{ format(data.manualRedactionEntryWrapper.manualRedactionEntry.value) }} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index 007009825..47cd39ad5 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -8,7 +8,7 @@ import { JustificationsService } from '@services/entity-services/justifications. import { Dictionary, Dossier, IAddRedactionRequest } from '@red/domain'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DictionaryService } from '@shared/services/dictionary.service'; -import { BaseDialogComponent } from '@iqser/common-ui'; +import { BaseDialogComponent, CircleButtonTypes } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; export interface LegalBasisOption { @@ -22,9 +22,11 @@ export interface LegalBasisOption { styleUrls: ['./manual-annotation-dialog.component.scss'], }) export class ManualAnnotationDialogComponent extends BaseDialogComponent implements OnInit { + readonly circleButtonTypes = CircleButtonTypes; isDocumentAdmin: boolean; isDictionaryRequest: boolean; isFalsePositiveRequest: boolean; + isEditingSelectedText: boolean = false; possibleDictionaries: Dictionary[] = []; legalOptions: LegalBasisOption[] = []; @@ -66,7 +68,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme } get disabled() { - return this.form.invalid; + return this.form.invalid || this.isEditingSelectedText; } get commentIsMandatory() { @@ -87,6 +89,9 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme })); this.legalOptions.sort((a, b) => a.label.localeCompare(b.label)); + if (!this.data.manualRedactionEntryWrapper.manualRedactionEntry.rectangle) { + this._formatSelectedTextValue(); + } } save() { @@ -94,12 +99,13 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme this._dialogRef.close(this.data.manualRedactionEntryWrapper); } - format(value: string) { - return value.replace( - // eslint-disable-next-line no-control-regex,max-len - /([^\s\d-]{2,})[-\u00AD]\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi, - '$1', - ); + private _formatSelectedTextValue() { + this.data.manualRedactionEntryWrapper.manualRedactionEntry.value = + this.data.manualRedactionEntryWrapper.manualRedactionEntry.value.replace( + // eslint-disable-next-line no-control-regex,max-len + /([^\s\d-]{2,})[-\u00AD]\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi, + '$1', + ); } private _getForm(): FormGroup { diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 744ec25c2..13d247c4f 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1472,11 +1472,13 @@ "classification": "Wert / Klassifizierung", "comment": "Kommentar", "dictionary": "Wörterbuch", + "edit-selected-text": "", "legalBasis": "Rechtsgrundlage", "reason": "Begründung", "reason-placeholder": "Wählen Sie eine Begründung aus ...", "rectangle": "Benutzerdefinierter Bereich", "section": "Absatz / Ort", + "selected-text": "", "text": "Ausgewählter Text:" }, "header": { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 165a2dc29..64b9b6b74 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1472,11 +1472,13 @@ "classification": "Value / Classification", "comment": "Comment", "dictionary": "Dictionary", + "edit-selected-text": "Edit selected text", "legalBasis": "Legal Basis", "reason": "Reason", "reason-placeholder": "Select a reason ...", "rectangle": "Custom Rectangle", "section": "Paragraph / Location", + "selected-text": "Selected text", "text": "Selected text:" }, "header": { From 22835c6f3673d1d0899374c6062d47ec2333decd Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 3 Mar 2022 14:28:05 +0100 Subject: [PATCH 22/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3212 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f27de02d1..efaa69045 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.279.0", + "version": "3.280.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index af5adc55163f3ccc3807b6db0f681d05d1881272..92c078b42e54cd672838e49bb27aaffd9364766c 100644 GIT binary patch delta 2935 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 Date: Thu, 3 Mar 2022 22:08:11 +0200 Subject: [PATCH 23/24] RED-3515 -> edit text only if it's "add to dictionary" operation --- .../manual-annotation-dialog.component.html | 1 + libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html index 683014683..d26ef9e7f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html @@ -9,6 +9,7 @@
{{ data.manualRedactionEntryWrapper.manualRedactionEntry.value }} Date: Thu, 3 Mar 2022 21:12:28 +0100 Subject: [PATCH 24/24] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index efaa69045..bc1ec17bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.280.0", + "version": "3.281.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 92c078b42e54cd672838e49bb27aaffd9364766c..e851688421b2e4f01e0f5c4d75c7fc3a84bcade3 100644 GIT binary patch delta 3097 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 delta 3097 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