From 0ada522db565ede08d4241be4ec6a78b0910ee76 Mon Sep 17 00:00:00 2001 From: Alexandre Caron Date: Fri, 23 Aug 2024 12:28:35 -0400 Subject: [PATCH] chore: fix lint --- e2e/support/component.ts | 9 ++--- .../expansion-panel-header.component.ts | 2 - .../expansion-panel.component.ts | 4 +- .../map-overlay/map-overlay.component.ts | 2 +- .../map-overlay/map-overlay.interface.ts | 2 +- src/app/pages/portal/portal.component.ts | 33 +++++++--------- .../toast-panel-for-expansion.component.ts | 2 - .../toast-panel/toast-panel.component.ts | 38 +++++++------------ .../welcome-window.component.ts | 4 +- src/app/services/pwa.service.ts | 2 +- src/main.ts | 2 +- 11 files changed, 38 insertions(+), 62 deletions(-) diff --git a/e2e/support/component.ts b/e2e/support/component.ts index 9772a6440..e814ff8fa 100644 --- a/e2e/support/component.ts +++ b/e2e/support/component.ts @@ -12,23 +12,22 @@ // You can read more here: // https://on.cypress.io/configuration // *********************************************************** - // Import commands.js using ES2015 syntax: -import './commands'; - // Alternatively you can use CommonJS syntax: // require('./commands') - import { mount } from 'cypress/angular'; +import './commands'; + // Augment the Cypress namespace to include type definitions for // your custom command. // Alternatively, can be defined in cypress/support/component.d.ts // with a at the top of your spec. declare global { + // eslint-disable-next-line @typescript-eslint/no-namespace namespace Cypress { interface Chainable { - mount: typeof mount + mount: typeof mount; } } } diff --git a/src/app/pages/portal/expansion-panel/expansion-panel-header.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel-header.component.ts index f2a13fd4e..ee53999bf 100644 --- a/src/app/pages/portal/expansion-panel/expansion-panel-header.component.ts +++ b/src/app/pages/portal/expansion-panel/expansion-panel-header.component.ts @@ -27,8 +27,6 @@ export class ExpansionPanelHeaderComponent { return this.expanded; } - constructor() {} - handleClose(): void { this.expandedChange.emit(false); } diff --git a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts index d9eeb1fbd..8561f36cf 100644 --- a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts +++ b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts @@ -36,7 +36,7 @@ export class ExpansionPanelComponent { } private _expanded: boolean; - @Input() maximized: Boolean = false; + @Input() maximized = false; @Input() get backdropShown(): boolean { @@ -59,8 +59,6 @@ export class ExpansionPanelComponent { return this.expanded && this.maximized; } - constructor() {} - onBackdropClick() { this.expanded = false; this.backdropShown = false; diff --git a/src/app/pages/portal/map-overlay/map-overlay.component.ts b/src/app/pages/portal/map-overlay/map-overlay.component.ts index a4d5634d0..28d1ec6d9 100644 --- a/src/app/pages/portal/map-overlay/map-overlay.component.ts +++ b/src/app/pages/portal/map-overlay/map-overlay.component.ts @@ -33,7 +33,7 @@ export class MapOverlayComponent implements AfterViewInit, OnDestroy { this.handleContextChange(context); this.context = context; }); - this.media$$ = this.mediaService.media$.subscribe((media) => + this.media$$ = this.mediaService.media$.subscribe(() => this.handleContextChange(this.context) ); } diff --git a/src/app/pages/portal/map-overlay/map-overlay.interface.ts b/src/app/pages/portal/map-overlay/map-overlay.interface.ts index 10f800a53..0aae78087 100644 --- a/src/app/pages/portal/map-overlay/map-overlay.interface.ts +++ b/src/app/pages/portal/map-overlay/map-overlay.interface.ts @@ -7,7 +7,7 @@ export interface MapOverlay { * Media device to display the mapOverlay * Desktop is the default value. */ - media: Array; + media: Media[]; /** * Css class to define position of the element */ diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts index 4a2c48ecb..2c0b5f70f 100644 --- a/src/app/pages/portal/portal.component.ts +++ b/src/app/pages/portal/portal.component.ts @@ -215,18 +215,15 @@ import { WelcomeWindowService } from './welcome-window/welcome-window.service'; }) export class PortalComponent implements OnInit, OnDestroy { public appConfig: EnvironmentOptions; - public toastPanelOffsetX$: BehaviorSubject = new BehaviorSubject( - undefined - ); - public sidenavOpened$: BehaviorSubject = new BehaviorSubject(false); + public toastPanelOffsetX$ = new BehaviorSubject(undefined); + public sidenavOpened$ = new BehaviorSubject(false); public minSearchTermLength = 2; public hasGeolocateButton = true; public showMenuButton = true; public showSearchBar = true; - public workspaceNotAvailableMessage: string = 'workspace.disabled.resolution'; + public workspaceNotAvailableMessage = 'workspace.disabled.resolution'; public workspacePaginator: MatPaginator; - public workspaceEntitySortChange$: BehaviorSubject = - new BehaviorSubject(false); + public workspaceEntitySortChange$ = new BehaviorSubject(false); public workspaceSwitchDisabled = false; public paginatorOptions: EntityTablePaginatorOptions = { pageSize: 50, // Number of items to display on a page. @@ -260,9 +257,7 @@ export class PortalComponent implements OnInit, OnDestroy { public toastPanelForExpansionOpened = true; private activeWidget$$: Subscription; public showToastPanelForExpansionToggle = false; - public selectedWorkspace$: BehaviorSubject = new BehaviorSubject( - undefined - ); + public selectedWorkspace$ = new BehaviorSubject(undefined); private routeParams: Params; public toastPanelHtmlDisplay = false; @@ -460,7 +455,7 @@ export class PortalComponent implements OnInit, OnDestroy { this.readLanguageParam(params); }); - this.authService.authenticate$.subscribe((authenticated) => { + this.authService.authenticate$.subscribe(() => { this.contextLoaded = false; }); @@ -537,7 +532,7 @@ export class PortalComponent implements OnInit, OnDestroy { }); this.workspaceMaximize$$.push( - this.workspaceState.workspaceMaximize$.subscribe((workspaceMaximize) => { + this.workspaceState.workspaceMaximize$.subscribe(() => { this.updateMapBrowserClass(); }) ); @@ -596,7 +591,7 @@ export class PortalComponent implements OnInit, OnDestroy { this.mediaService.orientation$ ]) .pipe(debounceTime(50)) - .subscribe((sidenavMediaAndOrientation: [boolean, string, string]) => { + .subscribe(() => { this.computeToastPanelOffsetX(); }); @@ -667,7 +662,7 @@ export class PortalComponent implements OnInit, OnDestroy { } addFeature(workspace: EditionWorkspace) { - let feature = { + const feature = { type: 'Feature', properties: {} }; @@ -677,7 +672,7 @@ export class PortalComponent implements OnInit, OnDestroy { } createFeatureProperties(layer: ImageLayer | VectorLayer) { - let properties = {}; + const properties = {}; layer.options.sourceOptions.sourceFields.forEach((field) => { if (!field.primary && field.visible) { properties[field.name] = ''; @@ -1575,7 +1570,7 @@ export class PortalComponent implements OnInit, OnDestroy { name: string, type: 'wms' | 'wmts' | 'arcgisrest' | 'imagearcgisrest' | 'tilearcgisrest', version: string, - visibility: boolean = true, + visibility = true, zIndex: number ) { if (!this.contextLoaded) { @@ -1687,7 +1682,7 @@ export class PortalComponent implements OnInit, OnDestroy { this.dialogWindow.open(WelcomeWindowComponent, welcomWindowConfig) ); - this.matDialogRef$.value.afterClosed().subscribe((result) => { + this.matDialogRef$.value.afterClosed().subscribe(() => { this.welcomeWindowService.afterClosedWelcomeWindow(); this.matDialogRef$.next(undefined); }); @@ -1744,7 +1739,7 @@ export class PortalComponent implements OnInit, OnDestroy { } zoomToSelectedFeatureWks() { - let format = new olFormatGeoJSON(); + const format = new olFormatGeoJSON(); const featuresSelected = this.workspaceState.workspaceSelection.map( (rec) => rec.entity as Feature ); @@ -1753,7 +1748,7 @@ export class PortalComponent implements OnInit, OnDestroy { } const olFeaturesSelected = []; for (const feat of featuresSelected) { - let localOlFeature = format.readFeature(feat, { + const localOlFeature = format.readFeature(feat, { dataProjection: feat.projection, featureProjection: this.map.projection }); diff --git a/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts b/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts index 30a91425f..df85005c2 100644 --- a/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts +++ b/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts @@ -49,6 +49,4 @@ export class ToastPanelForExpansionComponent { get displayStyle() { return this.withHeader || this.opened ? 'visible' : 'hidden'; } - - constructor() {} } diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.ts b/src/app/pages/portal/toast-panel/toast-panel.component.ts index 721fc7bc7..64bae9411 100644 --- a/src/app/pages/portal/toast-panel/toast-panel.component.ts +++ b/src/app/pages/portal/toast-panel/toast-panel.component.ts @@ -120,7 +120,7 @@ export class ToastPanelComponent implements OnInit, OnDestroy { } set store(value: EntityStore>) { this._store = value; - this.store.entities$.subscribe((_entities) => { + this.store.entities$.subscribe(() => { this.unselectResult(); }); } @@ -140,7 +140,7 @@ export class ToastPanelComponent implements OnInit, OnDestroy { } private _opened = true; - @Input() hasFeatureEmphasisOnSelection: Boolean = false; + @Input() hasFeatureEmphasisOnSelection = false; get zoomAuto(): boolean { return this._zoomAuto; @@ -170,15 +170,10 @@ export class ToastPanelComponent implements OnInit, OnDestroy { } private _fullExtent = false; - public potententialLayerToAdd$: BehaviorSubject = new BehaviorSubject( - undefined - ); - public potententialLayerisAdded$: BehaviorSubject = - new BehaviorSubject(false); + public potententialLayerToAdd$ = new BehaviorSubject(undefined); + public potententialLayerisAdded$ = new BehaviorSubject(false); - public fullExtent$: BehaviorSubject = new BehaviorSubject( - this.fullExtent - ); + public fullExtent$ = new BehaviorSubject(this.fullExtent); public isHtmlDisplay = false; public iconResizeWindows = ''; @@ -197,12 +192,13 @@ export class ToastPanelComponent implements OnInit, OnDestroy { private format = new olFormatGeoJSON(); private resultOrResolution$$: Subscription; - private focusedResult$: BehaviorSubject> = - new BehaviorSubject(undefined); + private focusedResult$ = new BehaviorSubject>( + undefined + ); private abstractFocusedOrSelectedResult: Feature; public withZoomButton = true; - zoomAuto$: BehaviorSubject = new BehaviorSubject(false); + zoomAuto$ = new BehaviorSubject(false); @Output() openedChange = new EventEmitter(); @@ -283,21 +279,15 @@ export class ToastPanelComponent implements OnInit, OnDestroy { // return this.opened && this.fullExtent; // } - @HostListener('document:keydown.escape', ['$event']) onEscapeHandler( - event: KeyboardEvent - ) { + @HostListener('document:keydown.escape', ['$event']) onEscapeHandler() { this.clear(); } - @HostListener('document:keydown.backspace', ['$event']) onBackHandler( - event: KeyboardEvent - ) { + @HostListener('document:keydown.backspace', ['$event']) onBackHandler() { this.unselectResult(); } - @HostListener('document:keydown.z', ['$event']) onZoomHandler( - event: KeyboardEvent - ) { + @HostListener('document:keydown.z', ['$event']) onZoomHandler() { if (this.isResultSelected$.getValue() === true) { const localOlFeature = this.format.readFeature( this.resultSelected$.getValue().data, @@ -858,7 +848,7 @@ export class ToastPanelComponent implements OnInit, OnDestroy { } private computeSourceOptionsFromProperties( - properties: {}, + properties: unknown, geoService: ExtendedGeoServiceDefinition ) { const keys = Object.keys(properties); @@ -866,7 +856,7 @@ export class ToastPanelComponent implements OnInit, OnDestroy { geoService.propertiesForLayerName.includes(p) ); // providing the the first matching regex; - let layerName = properties[propertiesForLayerName[0]]; + const layerName = properties[propertiesForLayerName[0]]; const url = properties[geoService.propertyForUrl]; let appliedLayerName = layerName; let arcgisLayerName = undefined; diff --git a/src/app/pages/portal/welcome-window/welcome-window.component.ts b/src/app/pages/portal/welcome-window/welcome-window.component.ts index 71257d3b2..b8dfecea5 100644 --- a/src/app/pages/portal/welcome-window/welcome-window.component.ts +++ b/src/app/pages/portal/welcome-window/welcome-window.component.ts @@ -21,8 +21,6 @@ import { getAppVersion } from 'src/app/app.utils'; import { WelcomeWindowService } from './welcome-window.service'; -('@igo2/core'); - @Component({ selector: 'app-welcome-window', templateUrl: './welcome-window.component.html', @@ -47,7 +45,7 @@ export class WelcomeWindowComponent implements OnInit, OnDestroy { showAgain = false; public discoverTitleInLocale$: Observable; private title$$: Subscription; - public html$: BehaviorSubject = new BehaviorSubject(undefined); + public html$ = new BehaviorSubject(undefined); constructor( public dialog: MatDialog, diff --git a/src/app/services/pwa.service.ts b/src/app/services/pwa.service.ts index b43052191..dbe4c342c 100644 --- a/src/app/services/pwa.service.ts +++ b/src/app/services/pwa.service.ts @@ -11,7 +11,7 @@ import { skip, tap } from 'rxjs/operators'; providedIn: 'root' }) export class PwaService { - private confirmOpened: boolean = false; + private confirmOpened = false; constructor( private updates: SwUpdate, private languageService: LanguageService, diff --git a/src/main.ts b/src/main.ts index 8e53d67ad..d11991820 100644 --- a/src/main.ts +++ b/src/main.ts @@ -32,7 +32,7 @@ import { AppComponent } from './app/app.component'; import { PortalModule } from './app/pages'; import { environment } from './environments/environment'; -const DEFAULT_THEME: string = 'blue-theme'; +const DEFAULT_THEME = 'blue-theme'; const TOOLTIP_OPTIONS: MatTooltipDefaultOptions = { showDelay: 500,