From 88e833eec98005d1639845c6bba254c7ad9e2e5a Mon Sep 17 00:00:00 2001 From: George Date: Tue, 13 Dec 2022 12:22:21 +0200 Subject: [PATCH 1/5] RED-4590: Fix blocking sonar issues. --- .../app/modules/pdf-viewer/services/webviewer-loaded.guard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts index b0934ac21..9ce46809e 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts @@ -28,6 +28,6 @@ export class WebViewerLoadedGuard implements CanActivate { this._documentViewer.init(instance.Core.documentViewer); this._viewerHeaderService.init(); - return true; + return !!this._pdf.instance; } } From 308bb90fe3e1113f7a36b1ec300b8662e82ac7dc Mon Sep 17 00:00:00 2001 From: George Date: Tue, 13 Dec 2022 13:43:40 +0200 Subject: [PATCH 2/5] RED-4590: Update submodules --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 5f9c754ab..8208fdb1b 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 5f9c754abf0fb4fcc0606d811a66c5bbb88d164a +Subproject commit 8208fdb1baa774b648f90c3fd21ec59536ab93d1 From dfefd1b512235ecb259f0123bbae6dd11cfe4328 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 13 Dec 2022 12:47:34 +0100 Subject: [PATCH 3/5] chore(release) --- package-lock.json | 2 +- package.json | 2 +- paligo-theme.tar.gz | Bin 3382 -> 3385 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f62cce76..f98f53836 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.828.0", + "version": "3.829.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index fd7578f43..b5a793540 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.828.0", + "version": "3.829.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ad56665b10d07cc30dcc3eb001254d1b96a1b010..c7a7fbee6fa39ddcf2476fd7eb2c2971bcf30614 100644 GIT binary patch delta 3275 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 GPyhf#@>vW3 From 613834b5b74902abebecdaffce2ef5e231c2b5ec Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 13 Dec 2022 15:04:57 +0200 Subject: [PATCH 4/5] RED-5763: Fixed help mode links overlay overlapping with the user menu. --- .../default-colors-screen.component.html | 1 + .../dossier-attributes-listing-screen.component.html | 3 ++- .../entities-listing-screen.component.html | 3 ++- .../file-attributes-listing-screen.component.html | 4 +++- .../license/license-screen/license-screen.component.ts | 10 +++++++++- .../permissions-screen.component.html | 1 + .../reports-screen/reports-screen.component.html | 1 + .../user-listing/user-listing-screen.component.ts | 2 ++ .../watermarks-listing-screen.component.html | 3 ++- .../dossier-template-actions.component.html | 2 +- 10 files changed, 24 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index 12a96582e..ed94a0c5c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -41,6 +41,7 @@ (action)="openEditColorDialog($event, entity)" *allow="roles.colors.write; if: currentUser.isAdmin" [iqserHelpMode]="'default_colors'" + [overlappingElement]="'USER_MENU'" [tooltip]="'default-colors-screen.action.edit' | translate" [type]="circleButtonTypes.dark" icon="iqser:edit" diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html index dd3da97cf..a57b2bc0a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html @@ -59,6 +59,7 @@ (action)="openAddEditAttributeDialog($event)" *ngIf="canEditDossierAttributes" [iqserHelpMode]="'create_new_dossier_attribute'" + [overlappingElement]="'USER_MENU'" [label]="'dossier-attributes-listing.add-new' | translate" [type]="iconButtonTypes.primary" icon="iqser:plus" @@ -88,7 +89,7 @@
-
+
-
+
-
+
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 3ca03ab33..3000b9078 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 @@ -25,6 +25,7 @@ (action)="fileInput.click()" *allow="roles.reportTemplates.upload; if: currentUser.isAdmin" [iqserHelpMode]="'reports'" + [overlappingElement]="'USER_MENU'" [tooltip]="'reports-screen.upload-document' | translate" icon="iqser:upload" > diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 3de51afa8..afcc8d5ce 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -12,6 +12,7 @@ import { listingProvidersFactory, LoadingService, NestedFilter, + OverlappingElements, SearchPositions, TableColumnConfig, } from '@iqser/common-ui'; @@ -62,6 +63,7 @@ export class UserListingScreenComponent extends ListingComponent implement icon: 'iqser:plus', disabled$: this._userService.currentUser$.pipe(map(user => !user.isAdmin)), helpModeKey: 'create_user', + overlappingElement: OverlappingElements.USER_MENU, }, ]; collapsedDetails = false; diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html index cdaadddd8..81f615ff2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html @@ -14,6 +14,7 @@
-
+
-
+
Date: Tue, 13 Dec 2022 14:07:54 +0100 Subject: [PATCH 5/5] chore(release) --- package-lock.json | 2 +- package.json | 2 +- paligo-theme.tar.gz | Bin 3385 -> 3384 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f98f53836..267c4b9c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.829.0", + "version": "3.830.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index b5a793540..b5f7a843a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.829.0", + "version": "3.830.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c7a7fbee6fa39ddcf2476fd7eb2c2971bcf30614..483a4198390563a8087af1da7da0705096040bd1 100644 GIT binary patch delta 3210 zcmV;540ZFl8n_yec~kaX*L`L?c3=n3Q1FvrGiXiCaD~v%vDE)!Tk7(cKWcWLk@{n4 z!{g=edA4(w|Ig8m%D*Bpj+pFQMs@vRYj6Rt{3-c+p5v~2`TL#+@?Qo1`jO38f1Yi> zv=_ek48-S3e6Gdk20k4z#t~y2F~$*N95Ke>V}2dey3FwXXZ0N}FRx!-EIEESvr>X% zQlWobAoR|nc}(7Jk@FIMrG&!zTjU3J`S#_-!(hgC8pSClD0RdX&J3%j@5mOde|)}xe03+6;Y>d(y04c6I?~9KxB{KT6Z*NDZsLA71$Qxh86sGS=5x#0^U?4!;HQmr(rMK zZ!4iBi^WQE700$e;XuQp;(SC-`4-hhMq~6miXswwhfb@)F>Pv~yv57Ff9E7g9*N6# z3yKhtw8%Qa7bT7;yWb*vxqc+D#nV7yIR+ouDXAVDrl?vl%o|1~Pe-ZEc_u#Bve2TuLc}6H} z@*Vp0#l;dJTR;NIEJwwx_cE7%Pi%XA+0Fi2QQan4aW|OjPR`u~{oKC-vzr=nvv;sK z#4|bwZwiEC-}E59AbG>yk!nx!_djx(A*-y4gk}R^{v28W7>?44Mk%8^6H37(l*H?y zeA7f}(&V=ye-6>-uconZ`}tpnB!`u0j(FtO5m2;|Kq$aSQE zylwV8q(LEs%OR*J=gJ;^8Bd0;3

d5Ekt zy$_s&B7P+$UcdhlBvo@A8p4_06CUp2{5}I5@rb<1&0xFn0f*23{GWgRt43Gp`yZNw z?g;v-0`% zoKbByX!2f<5#%~OMm?iU^z@wJlhCH)!X$<2rK^s|3&z8z$g%#w$QPu3j+UWZge=SUkf{Ea^1~$oGYW^uy;zEsK6%gMiA40_hMxi7gpsjmRkny;ijgfjHM*AlDNgzG;-Z ze?<_VfJ0O}aTEz#IRxFlZy`IbCx9-H<2dS|!E9jx*$#X*cmUA~ca303rvda%)YrSk z%=W|z0=l}`6Qq{)-(a8_u@o~@f2TzQX?#c!w+I!DdE|SS!Ux1|5Ii;&*ltKF#nI@c zX6wq*%JH83go_C;&b>iRV-n)Y`uJi0*HH!e3=Hl1-r(x0!i zLJ#>`hb8?DOQ{er#Ms|fFqX&D;@2N=9zzHOKOY7NFSBA-7z(Tq>b3Fgf1psQP2O%H zatd!LD1ky&m5&Yzw#P{sz%_u?&b}P!?oZ6InBc)j#>8SNglI>h4#YTC6ZPou5Pclt z7}MCF`6%!t3NuasPr_Jy&^k{z@0-WiULe+NT~uNOf+K!>4FU9!t`7#J*H>lQtEFcA zE`kxrD_&IWAap#;NTMbNQD5ihQ(W}PH|k^9nP!{7M|OPiPOD6!IiJy*K-f~f9arVqTyoqgiK5x z=HW+G+Nc53peN6fj!bzutu&IoG4{SuZVl>ju9oEzozU6ibn zq5{O4vLsc6Ycj-ccBxA_gf^7EGz$Au&;gx_(jQatM_fKpt5i`+qT7ttjF+|uu&KhF z=$W@*gj6LYp3nn-fPlPU{II(ZMi;zL+;B+n#ArFz3)id{f9^mpgp!GUAf8qyLZhDP z(y||dt%JHu+yarr$eOmK>F}#3?eI!ccz6MX>Lu}^rgpaur1tj}GJE$wyM7lylHlX@}S)DInu_RA8bLw&_VfY`++#u;1S z!IeB%FA|I0m*jdJvi49 z0ddCytpZ*{bNuVkVj#IvW4^&8o0VHV>fkqGX*57je>kh0>%fo&U?RaWkxp!`-;6LRa&kS}v z>9URrf5wd*b@=498-38cyETJ3GcV8#(0TGLnIXKV1n0W;boX5bbRNId@(4ycCV`%0 zWN&@Tf2xQ`4B9QSzh%uxdE#>XL}=)k0+KQBboTcpj_(^%_ql~J`RYf!LM$G+LUGb- z3$KC<<3}9q(qtL`^+q$HZ}~o#`K-*3T8E6b3>G7-hitqf(24MH^fuo4M{Wp6;`^F0 z|ECJX|Ec0~fok}&YEn^QWq#wWYhkuHzo#>eFy65=@gJm%5F6ti3GI%ntNlK_$;YNqat wEd0{{)^={^c5df(Zs&Gx=XP%Ac5df(Zs&Gx=XP%Ac5cxA3!eAA0sv3|09&(D;Q#;t delta 3211 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