From fb43fb17d628c33d787b986e69400d3b308ea514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 2 Aug 2023 15:58:36 +0300 Subject: [PATCH] RED-3800: Update common-ui --- .../base-screen/base-screen.component.html | 5 +-- .../base-screen/base-screen.component.ts | 35 +++++++++---------- .../skeleton-top-bar.component.html | 2 +- .../skeleton-top-bar.component.ts | 3 -- ...one-dossier-template-dialog.component.html | 4 +-- .../screens/audit/audit-screen.component.html | 12 +++---- ...ossier-template-info-screen.component.html | 8 ++--- .../dossier-details-stats.component.html | 4 +-- .../document-info.component.html | 2 +- .../src/app/modules/icons/icons.module.ts | 14 ++++++-- .../edit-dossier-general-info.component.html | 6 ++-- .../dossier-name-column.component.html | 4 +-- .../add-dossier-dialog.component.html | 2 +- .../src/assets/icons/general/calendar.svg | 15 -------- libs/common-ui | 2 +- 15 files changed, 52 insertions(+), 66 deletions(-) delete mode 100644 apps/red-ui/src/assets/icons/general/calendar.svg diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index b0a9e9658..b7efcf7a5 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -11,10 +11,7 @@ diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index d1e8a888f..2a4d299a8 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -6,7 +6,7 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action'; import { filter, map, startWith } from 'rxjs/operators'; -import { getConfig, IqserPermissionsService } from '@iqser/common-ui'; +import { IqserPermissionsService } from '@iqser/common-ui'; import { BreadcrumbsService } from '@services/breadcrumbs.service'; import { FeaturesService } from '@services/features.service'; import { ARCHIVE_ROUTE, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE } from '@red/domain'; @@ -24,16 +24,9 @@ const isSearchScreen: (url: string) => boolean = url => url.includes('/search'); styleUrls: ['./base-screen.component.scss'], }) export class BaseScreenComponent { - readonly #navigationStart$ = this._router.events.pipe( - filter(isNavigationStart), - map(event => event.url), - startWith(this._router.url), - shareDistinctLast(), - ); readonly roles = Roles; readonly documentViewer = inject(REDDocumentViewer); readonly currentUser = this.userService.currentUser; - readonly config = getConfig(); readonly searchActions: List = [ { text: this._translateService.instant('search.this-dossier'), @@ -53,8 +46,24 @@ export class BaseScreenComponent { action: (query): void => this.#search(query, []), }, ]; + readonly #navigationStart$ = this._router.events.pipe( + filter(isNavigationStart), + map(event => event.url), + startWith(this._router.url), + shareDistinctLast(), + ); readonly isSearchScreen$ = this.#navigationStart$.pipe(map(isSearchScreen)); + get #hideSearchThisDossier() { + const routerLink = this.breadcrumbsService.breadcrumbs[1]?.options?.routerLink; + if (!routerLink) { + return true; + } + + const isDossierOverview = (routerLink.includes(DOSSIERS_ROUTE) || routerLink.includes(ARCHIVE_ROUTE)) && routerLink.length === 3; + return !isDossierOverview; + } + constructor( private readonly _router: Router, activatedRoute: ActivatedRoute, @@ -71,16 +80,6 @@ export class BaseScreenComponent { activatedRoute.queryParamMap.pipe(takeUntilDestroyed()).subscribe(queryParams => this.#navigate(queryParams)); } - get #hideSearchThisDossier() { - const routerLink = this.breadcrumbsService.breadcrumbs[1]?.options?.routerLink; - if (!routerLink) { - return true; - } - - const isDossierOverview = (routerLink.includes(DOSSIERS_ROUTE) || routerLink.includes(ARCHIVE_ROUTE)) && routerLink.length === 3; - return !isDossierOverview; - } - #navigate(queryParams: ParamMap) { if (queryParams.has('username')) { return this._router.navigate([], { diff --git a/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.html b/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.html index ffc2d86fd..4f080c00f 100644 --- a/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.html +++ b/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.html @@ -4,7 +4,7 @@ diff --git a/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts b/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts index 936ef0af5..1ac32cbd5 100644 --- a/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts +++ b/apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Title } from '@angular/platform-browser'; -import { getConfig } from '@iqser/common-ui'; @Component({ selector: 'redaction-skeleton-top-bar', @@ -9,7 +8,5 @@ import { getConfig } from '@iqser/common-ui'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class SkeletonTopBarComponent { - readonly config = getConfig(); - constructor(readonly titleService: Title) {} } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html index d49a04bba..d3f993aa4 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html @@ -45,7 +45,7 @@ placeholder="dd/mm/yy" /> - + @@ -60,7 +60,7 @@ placeholder="dd/mm/yy" /> - + diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index 2c24e476d..10ada4ff0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -30,8 +30,8 @@ {{ (translations[category] | translate) || category }} @@ -52,7 +52,7 @@
- +
@@ -65,14 +65,14 @@
- +
@@ -81,14 +81,14 @@
- +
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 0b6e312b6..ab6d52248 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 @@ -17,12 +17,12 @@
- +
- +
@@ -32,12 +32,12 @@
- +
- +
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 698475809..964c708b6 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -22,7 +22,7 @@
- +
@@ -37,8 +37,8 @@
- +
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 d0b98b06e..9ad978831 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; +import { getConfig } from '@common-ui/services'; @NgModule({ imports: [CommonModule, MatIconModule], @@ -9,6 +10,8 @@ import { DomSanitizer } from '@angular/platform-browser'; exports: [MatIconModule], }) export class IconsModule { + readonly config = getConfig(); + constructor(private readonly _iconRegistry: MatIconRegistry, private readonly _sanitizer: DomSanitizer) { const icons = [ 'ai', @@ -26,7 +29,6 @@ export class IconsModule { 'assign', 'assign-me', 'attribute', - 'calendar', 'case-sensitive', 'color-picker', 'comment', @@ -36,7 +38,6 @@ export class IconsModule { 'dictionary', 'denied', 'disable-analysis', - 'documine-logo', 'double-chevron-right', 'enable-analysis', 'enter', @@ -51,7 +52,6 @@ export class IconsModule { 'info', 'import_redactions', 'lightning', - 'logo', 'nav-first', 'nav-last', 'nav-next', @@ -100,5 +100,13 @@ export class IconsModule { _sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/general/${icon}.svg`), ); } + + const logo = this.config.IS_DOCUMINE ? 'documine-logo' : 'logo'; + + _iconRegistry.addSvgIconInNamespace( + 'iqser', + 'logo', + _sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/general/${logo}.svg`), + ); } } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index bda829798..35e78ad5d 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -69,7 +69,7 @@
- +
@@ -81,20 +81,20 @@ diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html index 026670beb..d3dc3d53e 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html @@ -1,4 +1,4 @@ -
+
{{ dossier.dossierName }}
@@ -26,7 +26,7 @@
- + {{ dossier.date | date : 'mediumDate' }}
diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index 261705769..af225b1bb 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -71,7 +71,7 @@
- +
diff --git a/apps/red-ui/src/assets/icons/general/calendar.svg b/apps/red-ui/src/assets/icons/general/calendar.svg deleted file mode 100644 index 7ec143f05..000000000 --- a/apps/red-ui/src/assets/icons/general/calendar.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/libs/common-ui b/libs/common-ui index 3b84e73f8..5d40f20a3 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3b84e73f8060f648e91b61f7df6827778d73917c +Subproject commit 5d40f20a32fbcbd99faaaf42688b19b6601a8f1f