From 4d1108e77e93eda064234fedc1e292a0af93b500 Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Mon, 4 Nov 2024 14:47:02 +0000 Subject: [PATCH] Cherry picked commit from oidc and run fix lint --- .../breadcrumb-item.component.ts | 2 +- .../auth/oidc/redirect-auth.service.spec.ts | 120 +++++++++++++----- .../src/lib/auth/oidc/retry-login.service.ts | 1 - .../lib/auth/services/time-sync.service.ts | 15 +-- lib/core/src/lib/button/button.component.html | 2 +- .../card-view-item-dispatcher.component.ts | 2 +- .../datatable-row/datatable-row.component.ts | 2 +- .../datatable/datatable.component.spec.ts | 2 +- .../empty-list/empty-list.component.html | 8 +- .../components/form-renderer.component.html | 4 +- .../inplace-form-input.component.html | 4 +- lib/core/src/lib/header/header.component.html | 4 +- .../lib/header/navbar/navbar.component.html | 2 +- .../info-drawer-layout.component.html | 8 +- .../info-drawer/info-drawer.component.html | 6 +- .../lib/info-drawer/info-drawer.component.ts | 2 +- .../components/header/header.component.html | 2 +- .../layout-container.component.html | 4 +- .../sidebar-action-menu.component.html | 6 +- .../sidenav-layout.component.html | 2 +- .../login-dialog-panel.component.html | 4 +- .../lib/login/components/login.component.html | 8 +- .../components/login/login.component.html | 8 +- .../infinite-pagination.component.html | 2 +- .../empty-content.component.html | 2 +- .../error-content.component.html | 2 +- .../lib/toolbar/toolbar-title.component.ts | 2 +- .../src/lib/toolbar/toolbar.component.html | 4 +- .../viewer-more-actions.component.ts | 2 +- .../components/viewer-open-with.component.ts | 2 +- .../viewer-render.component.html | 5 +- .../components/viewer-sidebar.component.ts | 2 +- .../viewer-toolbar-actions.component.ts | 2 +- ...viewer-toolbar-custom-actions.component.ts | 2 +- .../components/viewer-toolbar.component.ts | 2 +- .../viewer/components/viewer.component.html | 14 +- 36 files changed, 150 insertions(+), 111 deletions(-) diff --git a/lib/core/breadcrumbs/src/components/breadcrumb-item/breadcrumb-item.component.ts b/lib/core/breadcrumbs/src/components/breadcrumb-item/breadcrumb-item.component.ts index ad48b3ae2d..b6135b7202 100644 --- a/lib/core/breadcrumbs/src/components/breadcrumb-item/breadcrumb-item.component.ts +++ b/lib/core/breadcrumbs/src/components/breadcrumb-item/breadcrumb-item.component.ts @@ -22,7 +22,7 @@ import { Component, TemplateRef, ViewChild } from '@angular/core'; selector: 'adf-breadcrumb-item', template: ` - + ` }) diff --git a/lib/core/src/lib/auth/oidc/redirect-auth.service.spec.ts b/lib/core/src/lib/auth/oidc/redirect-auth.service.spec.ts index 619748991c..301394cc2c 100644 --- a/lib/core/src/lib/auth/oidc/redirect-auth.service.spec.ts +++ b/lib/core/src/lib/auth/oidc/redirect-auth.service.spec.ts @@ -16,7 +16,18 @@ */ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { OAuthService, OAuthEvent, OAuthStorage, AUTH_CONFIG, TokenResponse, AuthConfig, OAuthLogger, OAuthErrorEvent, OAuthSuccessEvent, OAuthInfoEvent } from 'angular-oauth2-oidc'; +import { + OAuthService, + OAuthEvent, + OAuthStorage, + AUTH_CONFIG, + TokenResponse, + AuthConfig, + OAuthLogger, + OAuthErrorEvent, + OAuthSuccessEvent, + OAuthInfoEvent +} from 'angular-oauth2-oidc'; import { of, Subject, timeout } from 'rxjs'; import { RedirectAuthService } from './redirect-auth.service'; import { AUTH_MODULE_CONFIG } from './auth-config'; @@ -43,18 +54,22 @@ describe('RedirectAuthService', () => { retryLoginServiceSpy = jasmine.createSpyObj('RetryLoginService', ['tryToLoginTimes']); timeSyncServiceSpy = jasmine.createSpyObj('TimeSyncService', ['checkTimeSync']); oauthLoggerSpy = jasmine.createSpyObj('OAuthLogger', ['error', 'info', 'warn']); - oauthServiceSpy = jasmine.createSpyObj('OAuthService', [ - 'clearHashAfterLogin', - 'configure', - 'logOut', - 'hasValidAccessToken', - 'hasValidIdToken', - 'setupAutomaticSilentRefresh', - 'silentRefresh', - 'refreshToken', - 'getIdentityClaims', - 'getAccessToken' - ], { clockSkewInSec: 120, events: oauthEvents$, tokenValidationHandler: {} }); + oauthServiceSpy = jasmine.createSpyObj( + 'OAuthService', + [ + 'clearHashAfterLogin', + 'configure', + 'logOut', + 'hasValidAccessToken', + 'hasValidIdToken', + 'setupAutomaticSilentRefresh', + 'silentRefresh', + 'refreshToken', + 'getIdentityClaims', + 'getAccessToken' + ], + { clockSkewInSec: 120, events: oauthEvents$, tokenValidationHandler: {} } + ); authConfigSpy = jasmine.createSpyObj('AuthConfig', ['sessionChecksEnabled']); TestBed.configureTestingModule({ @@ -202,8 +217,14 @@ describe('RedirectAuthService', () => { }); it('should logout user if token has expired due to local machine clock being out of sync', () => { - const mockTimeSync: TimeSync = { outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' }; - const expectedError = new Error(`Token has expired due to local machine clock ${mockTimeSync.localDateTimeISO} being out of sync with server time ${mockTimeSync.serverDateTimeISO}`); + const mockTimeSync: TimeSync = { + outOfSync: true, + localDateTimeISO: '2024-10-10T22:00:18.621Z', + serverDateTimeISO: '2024-10-10T22:10:53.000Z' + }; + const expectedError = new Error( + `Token has expired due to local machine clock ${mockTimeSync.localDateTimeISO} being out of sync with server time ${mockTimeSync.serverDateTimeISO}` + ); timeSyncServiceSpy.checkTimeSync.and.returnValue(of(mockTimeSync)); @@ -375,7 +396,7 @@ describe('RedirectAuthService', () => { expect(oauthServiceSpy.logOut).not.toHaveBeenCalled(); expect(oauthLoggerSpy.error).not.toHaveBeenCalled(); - expect(await firstEventOccurPromise).toEqual(expectedFakeErrorEvent);; + expect(await firstEventOccurPromise).toEqual(expectedFakeErrorEvent); try { tick(1000); @@ -387,7 +408,6 @@ describe('RedirectAuthService', () => { })); it('should logout user if the second time the refresh token failed', fakeAsync(async () => { - const expectedErrorCausedBySecondTokenRefreshError = new OAuthErrorEvent('token_refresh_error', { reason: 'second token refresh error' }, {}); oauthEvents$.next(new OAuthErrorEvent('token_refresh_error', { reason: 'error' }, {})); @@ -398,8 +418,12 @@ describe('RedirectAuthService', () => { })); it('should logout user if token_refresh_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('token_refresh_error', { reason: 'error' }, {})); @@ -408,8 +432,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if discovery_document_load_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('discovery_document_load_error', { reason: 'error' }, {})); @@ -418,8 +446,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if code_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('code_error', { reason: 'error' }, {})); @@ -428,8 +460,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if discovery_document_validation_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('discovery_document_validation_error', { reason: 'error' }, {})); @@ -438,8 +474,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if jwks_load_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('jwks_load_error', { reason: 'error' }, {})); @@ -448,8 +488,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if silent_refresh_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('silent_refresh_error', { reason: 'error' }, {})); @@ -458,8 +502,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if user_profile_load_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('user_profile_load_error', { reason: 'error' }, {})); @@ -468,8 +516,12 @@ describe('RedirectAuthService', () => { }); it('should logout user if token_error is emitted because of clock out of sync', () => { - const expectedErrorMessage = new Error('OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z'); - timeSyncServiceSpy.checkTimeSync.and.returnValue(of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync)); + const expectedErrorMessage = new Error( + 'OAuth error occurred due to local machine clock 2024-10-10T22:00:18.621Z being out of sync with server time 2024-10-10T22:10:53.000Z' + ); + timeSyncServiceSpy.checkTimeSync.and.returnValue( + of({ outOfSync: true, localDateTimeISO: '2024-10-10T22:00:18.621Z', serverDateTimeISO: '2024-10-10T22:10:53.000Z' } as TimeSync) + ); oauthEvents$.next(new OAuthErrorEvent('token_error', { reason: 'error' }, {})); @@ -479,7 +531,7 @@ describe('RedirectAuthService', () => { it('should onLogout$ be emitted when logout event occur', () => { let expectedLogoutIsEmitted = false; - service.onLogout$.subscribe(() => expectedLogoutIsEmitted = true); + service.onLogout$.subscribe(() => (expectedLogoutIsEmitted = true)); oauthEvents$.next(new OAuthInfoEvent('logout')); diff --git a/lib/core/src/lib/auth/oidc/retry-login.service.ts b/lib/core/src/lib/auth/oidc/retry-login.service.ts index 34f548ee22..c59d7af52c 100644 --- a/lib/core/src/lib/auth/oidc/retry-login.service.ts +++ b/lib/core/src/lib/auth/oidc/retry-login.service.ts @@ -26,7 +26,6 @@ export class RetryLoginService { /** * Attempts to log in a specified number of times if the initial login attempt fails. - * * @param loginOptions - The options to be used for the login attempt. * @param maxLoginAttempts - The maximum number of login attempts. Defaults to 3. * @returns A promise that resolves to `true` if the login is successful, or rejects with an error if all attempts fail. diff --git a/lib/core/src/lib/auth/services/time-sync.service.ts b/lib/core/src/lib/auth/services/time-sync.service.ts index 24affc01a9..92d2870c83 100644 --- a/lib/core/src/lib/auth/services/time-sync.service.ts +++ b/lib/core/src/lib/auth/services/time-sync.service.ts @@ -32,13 +32,9 @@ export interface TimeSync { providedIn: 'root' }) export class TimeSyncService { - private readonly _http: HttpClient; - constructor( - private _injector: Injector, - private _appConfigService: AppConfigService - ) { + constructor(private _injector: Injector, private _appConfigService: AppConfigService) { this._http = this._injector.get(HttpClient); } @@ -59,7 +55,7 @@ export class TimeSyncService { serverTimeInMs = serverTimeResponse; } - const adjustedServerTimeInMs = serverTimeInMs + (roundTripTimeInMs / 2); + const adjustedServerTimeInMs = serverTimeInMs + roundTripTimeInMs / 2; const localCurrentTimeInMs = Date.now(); const timeOffsetInMs = Math.abs(localCurrentTimeInMs - adjustedServerTimeInMs); const maxAllowedClockSkewInMs = maxAllowedClockSkewInSec * 1000; @@ -71,20 +67,17 @@ export class TimeSyncService { serverDateTimeISO: new Date(adjustedServerTimeInMs).toISOString() }; }), - catchError(error => throwError(() => new Error(error))) + catchError((error) => throwError(() => new Error(error))) ); } /** * Checks if the local time is out of sync with the server time. - * * @param maxAllowedClockSkewInSec - The maximum allowed clock skew in seconds. * @returns An Observable that emits a boolean indicating whether the local time is out of sync. */ isLocalTimeOutOfSync(maxAllowedClockSkewInSec: number): Observable { - return this.checkTimeSync(maxAllowedClockSkewInSec).pipe( - map(sync => sync.outOfSync) - ); + return this.checkTimeSync(maxAllowedClockSkewInSec).pipe(map((sync) => sync.outOfSync)); } private getServerTime(): Observable { diff --git a/lib/core/src/lib/button/button.component.html b/lib/core/src/lib/button/button.component.html index 1dc7d7d571..1ef9393927 100644 --- a/lib/core/src/lib/button/button.component.html +++ b/lib/core/src/lib/button/button.component.html @@ -123,5 +123,5 @@ - + diff --git a/lib/core/src/lib/card-view/components/card-view-item-dispatcher/card-view-item-dispatcher.component.ts b/lib/core/src/lib/card-view/components/card-view-item-dispatcher/card-view-item-dispatcher.component.ts index 69b8be130d..33744a25c8 100644 --- a/lib/core/src/lib/card-view/components/card-view-item-dispatcher/card-view-item-dispatcher.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-item-dispatcher/card-view-item-dispatcher.component.ts @@ -23,7 +23,7 @@ import { DEFAULT_SEPARATOR } from '../card-view-textitem/card-view-textitem.comp @Component({ selector: 'adf-card-view-item-dispatcher', standalone: true, - template: '' + template: '' }) export class CardViewItemDispatcherComponent implements OnChanges { @Input() diff --git a/lib/core/src/lib/datatable/components/datatable-row/datatable-row.component.ts b/lib/core/src/lib/datatable/components/datatable-row/datatable-row.component.ts index 580ada61d5..4f9dc34bc5 100644 --- a/lib/core/src/lib/datatable/components/datatable-row/datatable-row.component.ts +++ b/lib/core/src/lib/datatable/components/datatable-row/datatable-row.component.ts @@ -22,7 +22,7 @@ import { DataRow } from '../../data/data-row.model'; @Component({ selector: 'adf-datatable-row', standalone: true, - template: ``, + template: ``, encapsulation: ViewEncapsulation.None, host: { class: 'adf-datatable-row', diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts index 7d9c152cb5..c78b309d95 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts @@ -37,7 +37,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @Component({ selector: 'adf-custom-column-template-component', standalone: true, - template: ` ` + template: ` ` }) class CustomColumnTemplateComponent { @ViewChild('tmplRef', { static: true }) templateRef: TemplateRef; diff --git a/lib/core/src/lib/datatable/components/empty-list/empty-list.component.html b/lib/core/src/lib/datatable/components/empty-list/empty-list.component.html index d484dd0a7b..8ed7c9f3d9 100644 --- a/lib/core/src/lib/datatable/components/empty-list/empty-list.component.html +++ b/lib/core/src/lib/datatable/components/empty-list/empty-list.component.html @@ -1,6 +1,6 @@
- - - - + + + +
\ No newline at end of file diff --git a/lib/core/src/lib/form/components/form-renderer.component.html b/lib/core/src/lib/form/components/form-renderer.component.html index 18f65a016b..af66dfb4b2 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.html +++ b/lib/core/src/lib/form/components/form-renderer.component.html @@ -4,14 +4,14 @@
- +
- +
diff --git a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.html b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.html index dbe5963f81..3db9455a3f 100644 --- a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.html +++ b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.html @@ -7,11 +7,11 @@ data-automation-id="adf-inplace-input"> - + - + diff --git a/lib/core/src/lib/header/header.component.html b/lib/core/src/lib/header/header.component.html index a24dc4c451..674b5fe4aa 100644 --- a/lib/core/src/lib/header/header.component.html +++ b/lib/core/src/lib/header/header.component.html @@ -30,13 +30,13 @@
- +
- + diff --git a/lib/core/src/lib/header/navbar/navbar.component.html b/lib/core/src/lib/header/navbar/navbar.component.html index 25451b1d9e..e4014c6d55 100644 --- a/lib/core/src/lib/header/navbar/navbar.component.html +++ b/lib/core/src/lib/header/navbar/navbar.component.html @@ -1,4 +1,4 @@ - + diff --git a/lib/core/src/lib/info-drawer/info-drawer-layout.component.html b/lib/core/src/lib/info-drawer/info-drawer-layout.component.html index 92a104504e..118ba4fd55 100644 --- a/lib/core/src/lib/info-drawer/info-drawer-layout.component.html +++ b/lib/core/src/lib/info-drawer/info-drawer-layout.component.html @@ -1,12 +1,12 @@
- - + +
- +
- +
diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.html b/lib/core/src/lib/info-drawer/info-drawer.component.html index 67de187408..98f50f7fd2 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.html +++ b/lib/core/src/lib/info-drawer/info-drawer.component.html @@ -2,8 +2,8 @@ {{ 'INFO_DRAWER.ICON' | translate }}
{{ title | translate }}
- - + + @@ -28,6 +28,6 @@ - + diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.ts b/lib/core/src/lib/info-drawer/info-drawer.component.ts index 3342924a16..dc303eb492 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.ts @@ -40,7 +40,7 @@ import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-info-drawer-tab', standalone: true, - template: '', + template: '', encapsulation: ViewEncapsulation.None }) export class InfoDrawerTabComponent { diff --git a/lib/core/src/lib/layout/components/header/header.component.html b/lib/core/src/lib/layout/components/header/header.component.html index 205a95149e..d3276873b4 100644 --- a/lib/core/src/lib/layout/components/header/header.component.html +++ b/lib/core/src/lib/layout/components/header/header.component.html @@ -36,7 +36,7 @@ {{ title }} - +
- +
- +
diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.html b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.html index dc49a22ca2..eb6e4aa8fb 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.html +++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.html @@ -26,5 +26,5 @@ - + diff --git a/lib/core/src/lib/login/components/login-dialog-panel/login-dialog-panel.component.html b/lib/core/src/lib/login/components/login-dialog-panel/login-dialog-panel.component.html index d8a2b9249d..48eaa2dc44 100644 --- a/lib/core/src/lib/login/components/login-dialog-panel/login-dialog-panel.component.html +++ b/lib/core/src/lib/login/components/login-dialog-panel/login-dialog-panel.component.html @@ -6,10 +6,10 @@ [backgroundImageUrl]="''" (success)="onLoginSuccess($event)"> - + - + diff --git a/lib/core/src/lib/login/components/login.component.html b/lib/core/src/lib/login/components/login.component.html index 702bf49019..98c3475c2e 100644 --- a/lib/core/src/lib/login/components/login.component.html +++ b/lib/core/src/lib/login/components/login.component.html @@ -16,8 +16,7 @@ *ngIf="headerTemplate" ngFor [ngForOf]="[data]" - [ngForTemplate]="headerTemplate"> - + [ngForTemplate]="headerTemplate" /> - +
{{ title | translate }}
{{ subtitle | translate }}
- + diff --git a/lib/core/src/lib/templates/error-content/error-content.component.html b/lib/core/src/lib/templates/error-content/error-content.component.html index c17980c6c2..6e53b64dd4 100644 --- a/lib/core/src/lib/templates/error-content/error-content.component.html +++ b/lib/core/src/lib/templates/error-content/error-content.component.html @@ -10,6 +10,6 @@

{{ 'ERROR_CONTENT.' + errorCodeTranslated + '.DESCRIPTION' | translate }}

- + diff --git a/lib/core/src/lib/toolbar/toolbar-title.component.ts b/lib/core/src/lib/toolbar/toolbar-title.component.ts index fff5ba75ad..81d089dbcc 100644 --- a/lib/core/src/lib/toolbar/toolbar-title.component.ts +++ b/lib/core/src/lib/toolbar/toolbar-title.component.ts @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'adf-toolbar-title', standalone: true, - template: '', + template: '', host: { class: 'adf-toolbar-title' } }) export class ToolbarTitleComponent {} diff --git a/lib/core/src/lib/toolbar/toolbar.component.html b/lib/core/src/lib/toolbar/toolbar.component.html index 481ff66028..16e73dcc23 100644 --- a/lib/core/src/lib/toolbar/toolbar.component.html +++ b/lib/core/src/lib/toolbar/toolbar.component.html @@ -1,5 +1,5 @@ {{ title | translate }} - - + + diff --git a/lib/core/src/lib/viewer/components/viewer-more-actions.component.ts b/lib/core/src/lib/viewer/components/viewer-more-actions.component.ts index 5f7732b8a8..ab8f54687d 100644 --- a/lib/core/src/lib/viewer/components/viewer-more-actions.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-more-actions.component.ts @@ -23,6 +23,6 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/ encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-more-actions' }, - template: `` + template: `` }) export class ViewerMoreActionsComponent {} diff --git a/lib/core/src/lib/viewer/components/viewer-open-with.component.ts b/lib/core/src/lib/viewer/components/viewer-open-with.component.ts index 2353410146..aa57967866 100644 --- a/lib/core/src/lib/viewer/components/viewer-open-with.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-open-with.component.ts @@ -23,6 +23,6 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/ encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-open-with' }, - template: `` + template: `` }) export class ViewerOpenWithComponent {} diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html index a7aa8dec4f..c255968a8f 100644 --- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html +++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html @@ -79,8 +79,7 @@ - + [ngTemplateOutletContext]="{ urlFile: urlFile, extension: extension }" /> @@ -92,5 +91,5 @@ - + diff --git a/lib/core/src/lib/viewer/components/viewer-sidebar.component.ts b/lib/core/src/lib/viewer/components/viewer-sidebar.component.ts index 2503a10aac..bbd1b861c2 100644 --- a/lib/core/src/lib/viewer/components/viewer-sidebar.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-sidebar.component.ts @@ -23,7 +23,7 @@ import { ChangeDetectionStrategy, Component, HostListener, ViewEncapsulation } f encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-sidebar' }, - template: `` + template: `` }) export class ViewerSidebarComponent { @HostListener('keydown', ['$event']) diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts b/lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts index 1c43ba78ad..15ebd6add2 100644 --- a/lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts @@ -23,6 +23,6 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/ encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-toolbar-actions' }, - template: `` + template: `` }) export class ViewerToolbarActionsComponent {} diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts b/lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts index e986d72347..0791c5959a 100644 --- a/lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts @@ -23,6 +23,6 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/ encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-toolbar-custom-actions' }, - template: `` + template: `` }) export class ViewerToolbarCustomActionsComponent {} diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar.component.ts b/lib/core/src/lib/viewer/components/viewer-toolbar.component.ts index c5e8cc95b0..676139ab77 100644 --- a/lib/core/src/lib/viewer/components/viewer-toolbar.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-toolbar.component.ts @@ -23,6 +23,6 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/ encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-viewer-toolbar' }, - template: `` + template: `` }) export class ViewerToolbarComponent {} diff --git a/lib/core/src/lib/viewer/components/viewer.component.html b/lib/core/src/lib/viewer/components/viewer.component.html index 3d89884529..bc5b8ffebc 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.html +++ b/lib/core/src/lib/viewer/components/viewer.component.html @@ -6,7 +6,7 @@
- + @@ -58,7 +58,7 @@
- + @@ -71,13 +71,13 @@ - + - +