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] 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