From 51ecce60a8734b9de600608cd812b06afe809676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 29 May 2023 21:32:44 +0300 Subject: [PATCH 01/12] RED-5875: Material upgrade - checkbox --- .../dossier-states-listing.module.ts | 4 ++-- ...dd-edit-file-attribute-dialog.component.ts | 4 +--- .../modules/mat-config/mat-config.module.ts | 2 +- .../watermark-selector.component.html | 2 +- .../watermark-selector.component.ts | 2 +- .../components/select/select.component.ts | 12 +++++------ .../add-dossier-dialog.component.html | 8 ++++--- .../src/assets/styles/red-material-theme.scss | 21 +++++++++++++++---- libs/common-ui | 2 +- 9 files changed, 35 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts index 6b34c2cf5..4e5910f8a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts @@ -21,9 +21,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { ColorPickerModule } from 'ngx-color-picker'; import { MatIconModule } from '@angular/material/icon'; import { ConfirmDeleteDossierStateDialogComponent } from './confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; -import { MatLegacyCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatSelectModule } from '@angular/material/select'; import { MatDialogModule } from '@angular/material/dialog'; +import { MatCheckboxModule } from '@angular/material/checkbox'; @NgModule({ declarations: [ @@ -55,7 +55,7 @@ import { MatDialogModule } from '@angular/material/dialog'; ReactiveFormsModule, ColorPickerModule, MatIconModule, - MatLegacyCheckboxModule, + MatCheckboxModule, MatSelectModule, ], }) diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index d82a45c3a..31c052c5a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -9,7 +9,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; import { NgForOf } from '@angular/common'; import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatTooltipModule } from '@angular/material/tooltip'; import { ROLES } from '@users/roles'; @@ -84,6 +84,4 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { displayedInFileList: { value: fileAttribute?.displayedInFileList, disabled: !this.canSetDisplayed }, }); } - - protected readonly ROLES = ROLES; } diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index dbc9206cf..73397a378 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -9,7 +9,7 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html index eb7683934..915654f6c 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html @@ -1,5 +1,5 @@
-
+
{{ label }} diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts index 44cb9732d..bf29d44b6 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts @@ -5,7 +5,7 @@ import { filter, map, tap } from 'rxjs/operators'; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Watermark } from '@red/domain'; import { WatermarksMapService } from '@services/entity-services/watermarks-map.service'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange } from '@angular/material/checkbox'; @Component({ selector: 'redaction-watermark-selector [dossierTemplateId] [label]', diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts index 58c32dd71..be661e398 100644 --- a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts @@ -15,7 +15,7 @@ import { MatChipListbox, MatChipSelectionChange } from '@angular/material/chips' ], }) export class SelectComponent implements AfterViewInit, ControlValueAccessor { - @Input() optionTemplate?: TemplateRef; + @Input() optionTemplate?: TemplateRef<{ option: any }>; @Input() label: string; @Input() options: any[]; @Input() disabled = false; @@ -26,11 +26,6 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor { constructor(private readonly _changeDetector: ChangeDetectorRef, private readonly _elementRef: ElementRef) {} - @HostBinding('class.fixed-height') - get isFixedHeight(): boolean { - return !!this._height; - } - private _height?: number; @Input() @@ -42,6 +37,11 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor { } } + @HostBinding('class.fixed-height') + get isFixedHeight(): boolean { + return !!this._height; + } + @Input() valueMapper: (option: any) => any = option => option.key; ngAfterViewInit(): void { 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 9cd46b0e0..434eb1f7d 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 @@ -62,9 +62,11 @@
- - {{ 'add-dossier-dialog.form.due-date' | translate }} - +
+ + {{ 'add-dossier-dialog.form.due-date' | translate }} + +
diff --git a/apps/red-ui/src/assets/styles/red-material-theme.scss b/apps/red-ui/src/assets/styles/red-material-theme.scss index 4ddb1afab..db296b020 100644 --- a/apps/red-ui/src/assets/styles/red-material-theme.scss +++ b/apps/red-ui/src/assets/styles/red-material-theme.scss @@ -9,7 +9,7 @@ // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: // `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -@include mat.all-legacy-component-typographies(); +//@include mat.all-legacy-component-typographies(); @include mat.legacy-core(); $primary-palette: ( @@ -62,13 +62,26 @@ $gn-next-mat-theme: mat.define-light-theme( ) ); -@include mat.all-legacy-component-themes($gn-next-mat-theme); +@include mat.all-component-themes($gn-next-mat-theme); -$custom-typography: mat.define-legacy-typography-config( +$custom-typography: mat.define-typography-config( $font-family: 'Inter, sans-serif', + $headline-1: null, + $headline-2: null, + $headline-3: null, + $headline-4: null, + $headline-5: null, + $headline-6: null, + $subtitle-1: null, + $subtitle-2: null, + $body-1: mat.define-typography-level(13px, 18px, 400), + $body-2: mat.define-typography-level(13px, 18px, 400), + $caption: null, + $button: mat.define-typography-level(13px, 13px, 400), + $overline: null, ); -@include mat.all-legacy-component-typographies($custom-typography); +@include mat.all-component-typographies($custom-typography); .mat-flat-button { min-width: unset !important; diff --git a/libs/common-ui b/libs/common-ui index 226ce2e73..e884d8a51 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 226ce2e73ad52810fc0035fd744c99c0e6866d6c +Subproject commit e884d8a513c8dd2df3564b3021bfa0d46bfe74d1 From f8fc7a753c22f5eefd1515d143a218e101a8a314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 29 May 2023 22:11:11 +0300 Subject: [PATCH 02/12] RED-5875: Material upgrade - slider --- .../watermark-screen.component.html | 36 ++++++++++--------- .../watermark-screen.component.ts | 6 ++-- .../screens/watermark/watermark.module.ts | 4 +-- .../modules/mat-config/mat-config.module.ts | 2 -- libs/common-ui | 2 +- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html index eb02b8739..f70f7715d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html @@ -56,26 +56,26 @@
@@ -83,14 +83,18 @@
-
+
- + + +
-
+
- + + +
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts index 829937035..cbf1c03af 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts @@ -84,15 +84,15 @@ export class WatermarkScreenComponent implements OnInit { readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL']; instance: WebViewerInstance; readonly loaded$: Observable; + readonly watermarkHorizontalAlignments = Object.values(WATERMARK_HORIZONTAL_ALIGNMENTS); + readonly watermarkVerticalAlignments = Object.values(WATERMARK_VERTICAL_ALIGNMENTS); + currentAlignment: WatermarkAlignment; @ViewChild('viewer', { static: true }) private readonly _viewer: ElementRef; private readonly _convertPath = inject(BASE_HREF_FN); readonly #loaded$ = new BehaviorSubject(false); readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); readonly #watermarkId = Number(getParam(WATERMARK_ID)); #watermark: Partial = {}; - readonly watermarkHorizontalAlignments = Object.values(WATERMARK_HORIZONTAL_ALIGNMENTS); - readonly watermarkVerticalAlignments = Object.values(WATERMARK_VERTICAL_ALIGNMENTS); - currentAlignment: WatermarkAlignment; constructor( private readonly _http: HttpClient, diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index 9df82e8c9..eb5a6fecf 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -23,7 +23,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { PaginatorComponent } from './paginator/paginator.component'; import { MatIconModule } from '@angular/material/icon'; import { ReactiveFormsModule } from '@angular/forms'; -import { MatLegacySliderModule } from '@angular/material/legacy-slider'; +import { MatSliderModule } from '@angular/material/slider'; import { ColorPickerModule } from 'ngx-color-picker'; import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -67,7 +67,7 @@ const routes: IqserRoutes = [ MatIconModule, IconButtonComponent, ReactiveFormsModule, - MatLegacySliderModule, + MatSliderModule, ColorPickerModule, MatLegacySlideToggleModule, CircleButtonComponent, diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index 73397a378..f96a5b336 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -3,7 +3,6 @@ import { MatNativeDateModule } from '@angular/material/core'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacySliderModule as MatSliderModule } from '@angular/material/legacy-slider'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; @@ -24,7 +23,6 @@ const matImports = [ MatToolbarModule, MatButtonModule, MatSlideToggleModule, - MatSliderModule, MatMenuModule, MatTooltipModule, MatButtonToggleModule, diff --git a/libs/common-ui b/libs/common-ui index e884d8a51..2ec18cc91 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit e884d8a513c8dd2df3564b3021bfa0d46bfe74d1 +Subproject commit 2ec18cc91db5548d086e0fc59a3351f6d373d5a3 From 07393503d20b284e8a02fee96e2cbbbe2fbbcaa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 29 May 2023 22:21:10 +0300 Subject: [PATCH 03/12] RED-5875: Material upgrade - spinner --- apps/red-ui/src/app/modules/mat-config/mat-config.module.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index f96a5b336..ac5ed4631 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -7,7 +7,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; diff --git a/libs/common-ui b/libs/common-ui index 2ec18cc91..95b528deb 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 2ec18cc91db5548d086e0fc59a3351f6d373d5a3 +Subproject commit 95b528deb6e88e91310b1794d497689b9a54225b From 96ecf0694c78ff11a959fe8d0974921e8243e322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 29 May 2023 23:22:03 +0300 Subject: [PATCH 04/12] RED-5875: Material upgrade - progress bar --- apps/red-ui/src/app/modules/mat-config/mat-config.module.ts | 2 +- .../upload-status-overlay/upload-status-overlay.component.html | 2 +- libs/common-ui | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index ac5ed4631..9bc0e686f 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -12,7 +12,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatChipsModule } from '@angular/material/chips'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html index 79ab9a241..83425fcc7 100644 --- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html +++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html @@ -40,8 +40,8 @@
diff --git a/libs/common-ui b/libs/common-ui index 95b528deb..b50019b01 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 95b528deb6e88e91310b1794d497689b9a54225b +Subproject commit b50019b01c03ea2a46631edd7771111896ee6682 From f581b83878841b13b1b01b8380e96ebfdc81b4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 29 May 2023 23:23:36 +0300 Subject: [PATCH 05/12] RED-5875: Material upgrade - menu trigger --- .../expandable-file-actions.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index f5e332a64..44e8fb59c 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -5,7 +5,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileDownloadService } from '@upload-download/services/file-download.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { DownloadDialogComponent, DownloadDialogData, From fc22cd176e16bfbcfb2392a6f68173c0437b9ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 30 May 2023 16:02:17 +0300 Subject: [PATCH 06/12] RED-5875: Material upgrade - slide toggle --- .../add-edit-file-attribute-dialog.component.ts | 4 ++-- ...file-attributes-configurations-dialog.component.ts | 4 ++-- .../file-attributes-csv-import-dialog.module.ts | 4 ++-- .../admin/screens/permissions/permissions.module.ts | 11 ++--------- .../admin/screens/watermark/watermark.module.ts | 4 ++-- .../src/app/modules/mat-config/mat-config.module.ts | 2 +- apps/red-ui/src/assets/styles/red-material-theme.scss | 11 +---------- libs/common-ui | 2 +- 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index 31c052c5a..b6f5b6363 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -8,10 +8,10 @@ import { TranslateModule } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; import { NgForOf } from '@angular/common'; -import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatTooltipModule } from '@angular/material/tooltip'; import { ROLES } from '@users/roles'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; export interface AddEditFileAttributeDialogData { readonly fileAttribute: IFileAttributeConfig; @@ -30,7 +30,7 @@ export interface AddEditFileAttributeDialogData { MatFormFieldModule, MatSelectModule, NgForOf, - MatLegacySlideToggleModule, + MatSlideToggleModule, MatCheckboxModule, MatTooltipModule, IconButtonComponent, diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 41db9883c..e81103835 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -4,11 +4,11 @@ import { ReactiveFormsModule, Validators } from '@angular/forms'; import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; import { BaseDialogComponent, CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui'; -import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; import { NgForOf, NgIf } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; @Component({ templateUrl: './file-attributes-configurations-dialog.component.html', @@ -16,7 +16,7 @@ import { MatSelectModule } from '@angular/material/select'; standalone: true, imports: [ ReactiveFormsModule, - MatLegacySlideToggleModule, + MatSlideToggleModule, NgIf, TranslateModule, MatFormFieldModule, diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts index 15dcd8708..c7f221f32 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts @@ -19,7 +19,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; -import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; @NgModule({ declarations: [FileAttributesCsvImportDialogComponent, ActiveFieldsListingComponent], @@ -40,7 +40,7 @@ import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggl ChevronButtonComponent, EditableInputComponent, FormsModule, - MatLegacySlideToggleModule, + MatSlideToggleModule, RoundCheckboxComponent, ], }) diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions.module.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions.module.ts index f83e6ad48..bb54b92c8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions.module.ts @@ -5,20 +5,13 @@ import { PermissionsScreenComponent } from './permissions-screen/permissions-scr import { ConfigService } from './config.service'; import { TranslateModule } from '@ngx-translate/core'; import { IqserHelpModeModule, IqserListingModule } from '@iqser/common-ui'; -import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; const routes = [{ path: '', component: PermissionsScreenComponent }]; @NgModule({ declarations: [PermissionsScreenComponent], - imports: [ - RouterModule.forChild(routes), - CommonModule, - TranslateModule, - IqserListingModule, - IqserHelpModeModule, - MatLegacySlideToggleModule, - ], + imports: [RouterModule.forChild(routes), CommonModule, TranslateModule, IqserListingModule, IqserHelpModeModule, MatSlideToggleModule], providers: [ConfigService], }) export class PermissionsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index eb5a6fecf..dc3eabe70 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -25,8 +25,8 @@ import { MatIconModule } from '@angular/material/icon'; import { ReactiveFormsModule } from '@angular/forms'; import { MatSliderModule } from '@angular/material/slider'; import { ColorPickerModule } from 'ngx-color-picker'; -import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; const routes: IqserRoutes = [ { @@ -69,7 +69,7 @@ const routes: IqserRoutes = [ ReactiveFormsModule, MatSliderModule, ColorPickerModule, - MatLegacySlideToggleModule, + MatSlideToggleModule, CircleButtonComponent, HasScrollbarDirective, IqserAllowDirective, diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index 9bc0e686f..87590325f 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { MatNativeDateModule } from '@angular/material/core'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; diff --git a/apps/red-ui/src/assets/styles/red-material-theme.scss b/apps/red-ui/src/assets/styles/red-material-theme.scss index db296b020..5cca8d964 100644 --- a/apps/red-ui/src/assets/styles/red-material-theme.scss +++ b/apps/red-ui/src/assets/styles/red-material-theme.scss @@ -1,16 +1,7 @@ @use '@angular/material' as mat; @use 'variables'; -// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. -// The following line adds: -// 1. Default typography styles for all components -// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) -// If you specify typography styles for the components you use elsewhere, you should delete this line. -// If you don't need the default component typographies but still want the hierarchy styles, -// you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -//@include mat.all-legacy-component-typographies(); -@include mat.legacy-core(); +@include mat.core(); $primary-palette: ( default: variables.$primary, diff --git a/libs/common-ui b/libs/common-ui index b50019b01..b50bd5422 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b50019b01c03ea2a46631edd7771111896ee6682 +Subproject commit b50bd54227a143517ce9a97441cbe0db908aad12 From d630c29916a7308da0fe5c9e47640ad6c8d2d800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 30 May 2023 21:48:05 +0300 Subject: [PATCH 07/12] RED-5875: Material upgrade - buttons: icon button --- apps/red-ui/src/app/modules/mat-config/mat-config.module.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index 87590325f..695cffa6c 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { MatNativeDateModule } from '@angular/material/core'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatButtonModule } from '@angular/material/button'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/libs/common-ui b/libs/common-ui index b50bd5422..471485653 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b50bd54227a143517ce9a97441cbe0db908aad12 +Subproject commit 471485653184e6489f112d11b0792c3a10643c65 From 3e09243c27fa4f93bd2cf7dd311d852b14fab1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 30 May 2023 23:28:06 +0300 Subject: [PATCH 08/12] RED-5875: Material upgrade - buttons: circle button --- .../notifications.component.scss | 4 +- .../edit-dossier-attributes.component.html | 46 +++++++++---------- .../team-members/team-members.component.html | 2 +- .../src/app/services/permissions.service.ts | 2 +- libs/common-ui | 2 +- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss index d366b2d81..57b77036c 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - ::ng-deep .notifications-backdrop + .cdk-overlay-connected-position-bounding-box { right: 0 !important; @@ -67,7 +65,7 @@ } &.unread { - background-color: rgba(variables.$primary, 0.1); + background-color: rgba(var(--iqser-primary-rgb), 0.1); .dot { background-color: var(--iqser-primary); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 9c3d18d86..1af05cdf0 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -12,12 +12,12 @@
@@ -39,32 +39,30 @@ [class.displayed-preview]="currentAttrValue(attr)" class="iqser-input-group image-attribute" > -
- + - + - + - -
+
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 2f915f76f..79a6708d8 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -394,7 +394,7 @@ export class PermissionsService { private _canEnableAutoAnalysis(file: File, dossier: Dossier): boolean { return ( - dossier.isActive && !!file.lastProcessed && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved + dossier.isActive && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved && !!file.lastProcessed ); } diff --git a/libs/common-ui b/libs/common-ui index 471485653..a71a09463 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 471485653184e6489f112d11b0792c3a10643c65 +Subproject commit a71a09463f092eea0ccbb4d21ca2f0f9416c4c6f From f64ddd009bae729a56bb5d53c2c3edc7e921db68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 31 May 2023 00:08:17 +0300 Subject: [PATCH 09/12] RED-5875: Material upgrade - buttons: chevron button --- .../file-attributes-csv-import-dialog.component.scss | 1 + libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss index 79ddc9f17..961d07275 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss @@ -49,6 +49,7 @@ .csv-part { display: flex; + flex: 1; overflow: hidden; .csv-part-header { diff --git a/libs/common-ui b/libs/common-ui index a71a09463..9e8a1fc12 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a71a09463f092eea0ccbb4d21ca2f0f9416c4c6f +Subproject commit 9e8a1fc12ed357db564bf142b2f71a6a8dc5708f From a8ef7a16a1e2b61a16a7ac3a188d83cf39086071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 31 May 2023 00:38:12 +0300 Subject: [PATCH 10/12] RED-5875: Material upgrade - buttons: user button --- apps/red-ui/src/assets/styles/red-material-theme.scss | 10 ---------- libs/common-ui | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/apps/red-ui/src/assets/styles/red-material-theme.scss b/apps/red-ui/src/assets/styles/red-material-theme.scss index 5cca8d964..3590c771b 100644 --- a/apps/red-ui/src/assets/styles/red-material-theme.scss +++ b/apps/red-ui/src/assets/styles/red-material-theme.scss @@ -57,19 +57,9 @@ $gn-next-mat-theme: mat.define-light-theme( $custom-typography: mat.define-typography-config( $font-family: 'Inter, sans-serif', - $headline-1: null, - $headline-2: null, - $headline-3: null, - $headline-4: null, - $headline-5: null, - $headline-6: null, - $subtitle-1: null, - $subtitle-2: null, $body-1: mat.define-typography-level(13px, 18px, 400), $body-2: mat.define-typography-level(13px, 18px, 400), - $caption: null, $button: mat.define-typography-level(13px, 13px, 400), - $overline: null, ); @include mat.all-component-typographies($custom-typography); diff --git a/libs/common-ui b/libs/common-ui index 9e8a1fc12..3d9a34b77 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9e8a1fc12ed357db564bf142b2f71a6a8dc5708f +Subproject commit 3d9a34b77814b1031aaa012986625328dbb95b71 From f555ff2bcc8cbee5edb655c816bd456138a8ab88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 31 May 2023 00:42:37 +0300 Subject: [PATCH 11/12] RED-5875: Material upgrade - tooltip letter spacing --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 3d9a34b77..efa522939 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3d9a34b77814b1031aaa012986625328dbb95b71 +Subproject commit efa522939167c34abf3200a042f8aa7dc5fe7c93 From 851b165f7bed3fc491c571e20fad2aad4fc6dee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 31 May 2023 23:36:49 +0300 Subject: [PATCH 12/12] RED-5875: Material upgrade - dark theme, other fixes --- apps/red-ui/src/app/app.module.ts | 2 ++ .../breadcrumbs/breadcrumbs.component.html | 9 ++--- .../src/assets/styles/red-material-theme.scss | 34 ++++++++++--------- libs/common-ui | 2 +- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index aeff40854..96423758b 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -7,6 +7,7 @@ import { BaseScreenComponent } from '@components/base-screen/base-screen.compone import { MissingTranslationHandler } from '@ngx-translate/core'; import { CachingModule, + ChevronButtonComponent, CircleButtonComponent, CommonUiModule, EmptyStateComponent, @@ -169,6 +170,7 @@ export const appModuleFactory = (config: AppConfig) => { IconButtonComponent, TenantPipe, MatDividerModule, + ChevronButtonComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index 84caaad0b..25dae2bc4 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -22,10 +22,11 @@ - +