From 72d8d5abb7e65f7b9136e198da64524bbc02bfae Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 19 Dec 2022 15:04:19 +0200 Subject: [PATCH] angular update v15 --- src/lib/buttons/buttons.module.ts | 4 ++-- .../buttons/circle-button/circle-button.component.ts | 2 +- src/lib/common-ui.module.ts | 12 ++++++------ src/lib/dialog/base-dialog.component.ts | 2 +- src/lib/dialog/confirmation-dialog.service.ts | 2 +- .../confirmation-dialog.component.ts | 2 +- .../filtering/filter-card/filter-card.component.ts | 2 +- src/lib/filtering/filters.module.ts | 4 ++-- src/lib/help-mode/help-mode.module.ts | 2 +- src/lib/help-mode/help-mode.service.ts | 2 +- src/lib/help-mode/help-mode/help-mode.component.ts | 2 +- src/lib/listing/listing.module.ts | 2 +- src/lib/listing/services/entities.service.ts | 2 +- src/lib/loading/loading.module.ts | 4 ++-- src/lib/services/dialog.service.ts | 2 +- src/lib/services/iqser-config.service.ts | 5 +++-- src/lib/shared/shared.module.ts | 2 +- src/lib/users/iqser-users.module.ts | 4 ++-- 18 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/lib/buttons/buttons.module.ts b/src/lib/buttons/buttons.module.ts index 1e71c60..6e8bdcd 100644 --- a/src/lib/buttons/buttons.module.ts +++ b/src/lib/buttons/buttons.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MatButtonModule } from '@angular/material/button'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { ChevronButtonComponent } from './chevron-button/chevron-button.component'; import { CircleButtonComponent } from './circle-button/circle-button.component'; diff --git a/src/lib/buttons/circle-button/circle-button.component.ts b/src/lib/buttons/circle-button/circle-button.component.ts index ed1c0e4..a9230b4 100644 --- a/src/lib/buttons/circle-button/circle-button.component.ts +++ b/src/lib/buttons/circle-button/circle-button.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { MatTooltip } from '@angular/material/tooltip'; +import { MatLegacyTooltip as MatTooltip } from '@angular/material/legacy-tooltip'; import { CircleButtonType, CircleButtonTypes } from '../types/circle-button.type'; import { IqserTooltipPosition, IqserTooltipPositions } from '../../utils'; diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts index d2d4a5c..79c94d5 100644 --- a/src/lib/common-ui.module.ts +++ b/src/lib/common-ui.module.ts @@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core import { CommonModule } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { SortByPipe } from './sorting'; import { CommonUiOptions, IqserAppConfig, ModuleWithOptions } from './utils'; import { HiddenActionComponent, LogoComponent, ToastComponent } from './shared'; @@ -15,12 +15,12 @@ import { IqserButtonsModule } from './buttons'; import { IqserScrollbarModule } from './scrollbar'; import { IqserEmptyStatesModule } from './empty-states'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatButtonModule } from '@angular/material/button'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; import { ConfirmationDialogComponent } from './dialog'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { ApiPathInterceptor, IqserConfigService, IqserUserPreferenceService } from './services'; import { DefaultUserPreferenceService } from './services/default-user-preference.service'; import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; diff --git a/src/lib/dialog/base-dialog.component.ts b/src/lib/dialog/base-dialog.component.ts index 444d789..5fff3bd 100644 --- a/src/lib/dialog/base-dialog.component.ts +++ b/src/lib/dialog/base-dialog.component.ts @@ -1,5 +1,5 @@ import { Directive, HostListener, inject, OnDestroy, OnInit } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { hasFormChanged, IqserEventTarget } from '../utils'; import { ConfirmOptions } from '.'; diff --git a/src/lib/dialog/confirmation-dialog.service.ts b/src/lib/dialog/confirmation-dialog.service.ts index 6c1028f..3a889f7 100644 --- a/src/lib/dialog/confirmation-dialog.service.ts +++ b/src/lib/dialog/confirmation-dialog.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DialogConfig, DialogService } from '../services'; import { ConfirmationDialogComponent, ConfirmationDialogInput, TitleColors } from '.'; diff --git a/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts b/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts index bb3e534..a11d49c 100644 --- a/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, HostListener, Inject, TemplateRef } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { TranslateService } from '@ngx-translate/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/src/lib/filtering/filter-card/filter-card.component.ts b/src/lib/filtering/filter-card/filter-card.component.ts index 2bf216a..7927f4b 100644 --- a/src/lib/filtering/filter-card/filter-card.component.ts +++ b/src/lib/filtering/filter-card/filter-card.component.ts @@ -10,7 +10,7 @@ import { Filter } from '../models/filter'; import { map } from 'rxjs/operators'; import { shareDistinctLast, shareLast } from '../../utils'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox'; +import { MAT_LEGACY_CHECKBOX_DEFAULT_OPTIONS as MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/legacy-checkbox'; const areExpandable = (nestedFilter: INestedFilter) => !!nestedFilter?.children?.length; const atLeastOneIsExpandable = pipe( diff --git a/src/lib/filtering/filters.module.ts b/src/lib/filtering/filters.module.ts index f3143f8..ec91111 100644 --- a/src/lib/filtering/filters.module.ts +++ b/src/lib/filtering/filters.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { TranslateModule } from '@ngx-translate/core'; import { IqserButtonsModule } from '../buttons'; import { PopupFilterComponent } from './popup-filter/popup-filter.component'; diff --git a/src/lib/help-mode/help-mode.module.ts b/src/lib/help-mode/help-mode.module.ts index b9ae62a..df1f58e 100644 --- a/src/lib/help-mode/help-mode.module.ts +++ b/src/lib/help-mode/help-mode.module.ts @@ -1,7 +1,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { HelpModeDialogComponent } from './help-mode-dialog/help-mode-dialog.component'; import { HelpModeComponent } from './help-mode/help-mode.component'; import { HelpModeDirective } from './help-mode.directive'; diff --git a/src/lib/help-mode/help-mode.service.ts b/src/lib/help-mode/help-mode.service.ts index 6e373d5..23f0124 100644 --- a/src/lib/help-mode/help-mode.service.ts +++ b/src/lib/help-mode/help-mode.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { HelpModeDialogComponent } from './help-mode-dialog/help-mode-dialog.component'; diff --git a/src/lib/help-mode/help-mode/help-mode.component.ts b/src/lib/help-mode/help-mode/help-mode.component.ts index bd6f46d..20947de 100644 --- a/src/lib/help-mode/help-mode/help-mode.component.ts +++ b/src/lib/help-mode/help-mode/help-mode.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, HostListener } from '@angular/core'; import { HelpModeService } from '../help-mode.service'; import { IqserEventTarget } from '../../utils'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; @Component({ selector: 'iqser-help-mode', diff --git a/src/lib/listing/listing.module.ts b/src/lib/listing/listing.module.ts index 7b8b264..5b34f34 100644 --- a/src/lib/listing/listing.module.ts +++ b/src/lib/listing/listing.module.ts @@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { TableHeaderComponent } from './table-header/table-header.component'; import { IqserFiltersModule } from '../filtering'; import { IqserInputsModule } from '../inputs'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { TableColumnNameComponent } from './table-column-name/table-column-name.component'; import { ScrollButtonComponent } from './scroll-button/scroll-button.component'; import { TableComponent } from './table/table.component'; diff --git a/src/lib/listing/services/entities.service.ts b/src/lib/listing/services/entities.service.ts index 0d674c5..2243f36 100644 --- a/src/lib/listing/services/entities.service.ts +++ b/src/lib/listing/services/entities.service.ts @@ -45,7 +45,7 @@ export class EntitiesService< loadAll(...args: unknown[]): Observable; loadAll(modelPath = this._defaultModelPath, queryParams?: List): Observable { return this.getAll(modelPath, queryParams).pipe( - mapEach(entity => (this._entityClass ? new this._entityClass(entity) : (entity as Class))), + mapEach(entity => (this._entityClass ? new this._entityClass(entity) : (entity as unknown as Class))), tap((entities: Class[]) => this.setEntities(entities)), ); } diff --git a/src/lib/loading/loading.module.ts b/src/lib/loading/loading.module.ts index 9b19ea4..ebf56ff 100644 --- a/src/lib/loading/loading.module.ts +++ b/src/lib/loading/loading.module.ts @@ -2,9 +2,9 @@ import { ModuleWithProviders, NgModule, Optional } from '@angular/core'; import { FullPageLoadingIndicatorComponent } from './full-page-loading-indicator/full-page-loading-indicator.component'; import { ProgressLoadingComponent } from './progress-loading/progress-loading.component'; import { LoadingService } from './loading.service'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { CommonModule } from '@angular/common'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; import { ProgressBarComponent } from './progress-bar/progress-bar.component'; import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/lib/services/dialog.service.ts b/src/lib/services/dialog.service.ts index 49bbc47..72e9056 100644 --- a/src/lib/services/dialog.service.ts +++ b/src/lib/services/dialog.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { ComponentType } from '@angular/cdk/portal'; import { mergeMap } from 'rxjs/operators'; import { from } from 'rxjs'; diff --git a/src/lib/services/iqser-config.service.ts b/src/lib/services/iqser-config.service.ts index 2792623..b0189b8 100644 --- a/src/lib/services/iqser-config.service.ts +++ b/src/lib/services/iqser-config.service.ts @@ -1,13 +1,14 @@ -import { inject } from '@angular/core'; +import { Inject, inject, Injectable } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { CacheApiService, wipeAllCaches } from '../caching'; import { IqserAppConfig } from '../utils'; +@Injectable() export class IqserConfigService { protected readonly _cacheApiService = inject(CacheApiService); protected readonly _titleService = inject(Title); - constructor(protected _values: T) { + constructor(@Inject('Doesnt matter') protected _values: T) { this._checkFrontendVersion(); this._titleService.setTitle(this._values.APP_NAME); } diff --git a/src/lib/shared/shared.module.ts b/src/lib/shared/shared.module.ts index ef311b9..c9ce789 100644 --- a/src/lib/shared/shared.module.ts +++ b/src/lib/shared/shared.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { SideNavComponent, SmallChipComponent, StatusBarComponent } from './index'; import { CommonModule } from '@angular/common'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; const components = [SmallChipComponent, StatusBarComponent, SideNavComponent]; diff --git a/src/lib/users/iqser-users.module.ts b/src/lib/users/iqser-users.module.ts index f45c106..b508819 100644 --- a/src/lib/users/iqser-users.module.ts +++ b/src/lib/users/iqser-users.module.ts @@ -12,11 +12,11 @@ import { IqserAuthGuard } from './guards/iqser-auth-guard.service'; import { IqserConfigService } from '../services'; import { NamePipe } from './name.pipe'; import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { CommonModule } from '@angular/common'; import { UserButtonComponent } from './components/user-button/user-button.component'; import { MatIconModule } from '@angular/material/icon'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): KeycloakOptions { let url: string = configService.values.OAUTH_URL;