From c842dadad9a534586d2677d69fc27efb8a042077 Mon Sep 17 00:00:00 2001 From: Sercan Yemen <117369+srcn@users.noreply.github.com> Date: Sun, 26 May 2024 12:11:11 +0300 Subject: [PATCH] (@fuse) Moved dependency injections out of the constructors and removed unnecessary 'constructor()' calls --- src/@fuse/components/alert/alert.component.ts | 17 ++++------- src/@fuse/components/alert/alert.service.ts | 7 ----- src/@fuse/components/card/card.component.ts | 7 ----- .../components/drawer/drawer.component.ts | 27 +++++------------ src/@fuse/components/drawer/drawer.service.ts | 7 ----- .../fullscreen/fullscreen.component.ts | 9 ++---- .../highlight/highlight.component.ts | 21 ++++---------- .../components/highlight/highlight.service.ts | 7 ----- .../loading-bar/loading-bar.component.ts | 11 ++----- .../components/masonry/masonry.component.ts | 8 ----- .../components/basic/basic.component.ts | 29 +++++++------------ .../components/branch/branch.component.ts | 15 +++------- .../components/divider/divider.component.ts | 15 +++------- .../components/spacer/spacer.component.ts | 15 +++------- .../horizontal/horizontal.component.ts | 17 ++++------- .../navigation/navigation.service.ts | 7 ----- .../components/aside/aside.component.ts | 17 ++++------- .../components/basic/basic.component.ts | 29 +++++++------------ .../collapsable/collapsable.component.ts | 17 ++++------- .../components/divider/divider.component.ts | 15 +++------- .../components/group/group.component.ts | 15 +++------- .../components/spacer/spacer.component.ts | 15 +++------- .../navigation/vertical/vertical.component.ts | 24 +++++++-------- .../scroll-reset/scroll-reset.directive.ts | 15 +++------- .../scrollbar/scrollbar.directive.ts | 17 +++-------- src/@fuse/lib/mock-api/mock-api.service.ts | 7 ----- src/@fuse/lib/mock-api/mock-api.utils.ts | 7 ----- .../pipes/find-by-key/find-by-key.pipe.ts | 7 ----- src/@fuse/services/config/config.service.ts | 13 ++------- .../confirmation/confirmation.service.ts | 7 ----- .../confirmation/dialog/dialog.component.ts | 10 ++----- src/@fuse/services/loading/loading.service.ts | 8 ----- .../media-watcher/media-watcher.service.ts | 10 +++---- .../services/platform/platform.service.ts | 6 ++-- .../splash-screen/splash-screen.service.ts | 10 +++---- src/@fuse/services/utils/utils.service.ts | 7 ----- 36 files changed, 124 insertions(+), 351 deletions(-) diff --git a/src/@fuse/components/alert/alert.component.ts b/src/@fuse/components/alert/alert.component.ts index 67b6efe1..d5c21009 100644 --- a/src/@fuse/components/alert/alert.component.ts +++ b/src/@fuse/components/alert/alert.component.ts @@ -1,6 +1,6 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; import { NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, inject, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { fuseAnimations } from '@fuse/animations'; @@ -28,6 +28,10 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy static ngAcceptInputType_showIcon: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseAlertService = inject(FuseAlertService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() appearance: FuseAlertAppearance = 'soft'; @Input() dismissed: boolean = false; @Input() dismissible: boolean = false; @@ -38,17 +42,6 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseAlertService: FuseAlertService, - private _fuseUtilsService: FuseUtilsService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/alert/alert.service.ts b/src/@fuse/components/alert/alert.service.ts index 5d29f7a5..4490d9dd 100644 --- a/src/@fuse/components/alert/alert.service.ts +++ b/src/@fuse/components/alert/alert.service.ts @@ -7,13 +7,6 @@ export class FuseAlertService private readonly _onDismiss: ReplaySubject = new ReplaySubject(1); private readonly _onShow: ReplaySubject = new ReplaySubject(1); - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/card/card.component.ts b/src/@fuse/components/card/card.component.ts index 84c6b2fb..eb920f59 100644 --- a/src/@fuse/components/card/card.component.ts +++ b/src/@fuse/components/card/card.component.ts @@ -25,13 +25,6 @@ export class FuseCardComponent implements OnChanges @Input() face: FuseCardFace = 'front'; @Input() flippable: boolean = false; - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/drawer/drawer.component.ts b/src/@fuse/components/drawer/drawer.component.ts index aec268a2..c972fc97 100644 --- a/src/@fuse/components/drawer/drawer.component.ts +++ b/src/@fuse/components/drawer/drawer.component.ts @@ -1,6 +1,6 @@ import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations'; import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; -import { Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, Renderer2, SimpleChanges, ViewEncapsulation } from '@angular/core'; +import { Component, ElementRef, EventEmitter, HostBinding, HostListener, inject, Input, OnChanges, OnDestroy, OnInit, Output, Renderer2, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { FuseDrawerService } from '@fuse/components/drawer/drawer.service'; import { FuseDrawerMode, FuseDrawerPosition } from '@fuse/components/drawer/drawer.types'; import { FuseUtilsService } from '@fuse/services/utils/utils.service'; @@ -21,6 +21,12 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy static ngAcceptInputType_transparentOverlay: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _animationBuilder = inject(AnimationBuilder); + private _elementRef = inject(ElementRef); + private _renderer2 = inject(Renderer2); + private _fuseDrawerService = inject(FuseDrawerService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() fixed: boolean = false; @Input() mode: FuseDrawerMode = 'side'; @Input() name: string = this._fuseUtilsService.randomId(); @@ -33,28 +39,11 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy @Output() readonly positionChanged: EventEmitter = new EventEmitter(); private _animationsEnabled: boolean = false; - private readonly _handleOverlayClick: any; + private readonly _handleOverlayClick = (): void => this.close(); private _hovered: boolean = false; private _overlay: HTMLElement; private _player: AnimationPlayer; - /** - * Constructor - */ - constructor( - private _animationBuilder: AnimationBuilder, - private _elementRef: ElementRef, - private _renderer2: Renderer2, - private _fuseDrawerService: FuseDrawerService, - private _fuseUtilsService: FuseUtilsService, - ) - { - this._handleOverlayClick = (): void => - { - this.close(); - }; - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/drawer/drawer.service.ts b/src/@fuse/components/drawer/drawer.service.ts index efc5a760..d6aea4e9 100644 --- a/src/@fuse/components/drawer/drawer.service.ts +++ b/src/@fuse/components/drawer/drawer.service.ts @@ -6,13 +6,6 @@ export class FuseDrawerService { private _componentRegistry: Map = new Map(); - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/fullscreen/fullscreen.component.ts b/src/@fuse/components/fullscreen/fullscreen.component.ts index b78e0424..fbf31e8c 100644 --- a/src/@fuse/components/fullscreen/fullscreen.component.ts +++ b/src/@fuse/components/fullscreen/fullscreen.component.ts @@ -1,5 +1,5 @@ import { DOCUMENT, NgTemplateOutlet } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Inject, Input, TemplateRef, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, Input, TemplateRef, ViewEncapsulation } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -15,14 +15,11 @@ import { MatTooltipModule } from '@angular/material/tooltip'; }) export class FuseFullscreenComponent { + private _document = inject(DOCUMENT); + @Input() iconTpl: TemplateRef; @Input() tooltip: string; - /** - * Constructor - */ - constructor(@Inject(DOCUMENT) private _document: Document) { } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/highlight/highlight.component.ts b/src/@fuse/components/highlight/highlight.component.ts index a45da103..76143ca0 100644 --- a/src/@fuse/components/highlight/highlight.component.ts +++ b/src/@fuse/components/highlight/highlight.component.ts @@ -1,5 +1,5 @@ import { NgClass } from '@angular/common'; -import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EmbeddedViewRef, Input, OnChanges, Renderer2, SecurityContext, SimpleChanges, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EmbeddedViewRef, inject, Input, OnChanges, SecurityContext, SimpleChanges, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { FuseHighlightService } from '@fuse/components/highlight/highlight.service'; @@ -15,6 +15,11 @@ import { FuseHighlightService } from '@fuse/components/highlight/highlight.servi }) export class FuseHighlightComponent implements OnChanges, AfterViewInit { + private _domSanitizer = inject(DomSanitizer); + private _elementRef = inject(ElementRef); + private _fuseHighlightService = inject(FuseHighlightService); + private _viewContainerRef = inject(ViewContainerRef); + @Input() code: string; @Input() lang: string; @ViewChild(TemplateRef) templateRef: TemplateRef; @@ -22,20 +27,6 @@ export class FuseHighlightComponent implements OnChanges, AfterViewInit highlightedCode: string; private _viewRef: EmbeddedViewRef; - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _domSanitizer: DomSanitizer, - private _elementRef: ElementRef, - private _renderer2: Renderer2, - private _fuseHighlightService: FuseHighlightService, - private _viewContainerRef: ViewContainerRef, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/highlight/highlight.service.ts b/src/@fuse/components/highlight/highlight.service.ts index e5039902..f2a86e13 100644 --- a/src/@fuse/components/highlight/highlight.service.ts +++ b/src/@fuse/components/highlight/highlight.service.ts @@ -4,13 +4,6 @@ import hljs from 'highlight.js'; @Injectable({providedIn: 'root'}) export class FuseHighlightService { - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/loading-bar/loading-bar.component.ts b/src/@fuse/components/loading-bar/loading-bar.component.ts index 3c0c939b..220925d3 100644 --- a/src/@fuse/components/loading-bar/loading-bar.component.ts +++ b/src/@fuse/components/loading-bar/loading-bar.component.ts @@ -1,6 +1,6 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion'; import { NgIf } from '@angular/common'; -import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; +import { Component, inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { FuseLoadingService } from '@fuse/services/loading'; import { Subject, takeUntil } from 'rxjs'; @@ -16,19 +16,14 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseLoadingBarComponent implements OnChanges, OnInit, OnDestroy { + private _fuseLoadingService = inject(FuseLoadingService); + @Input() autoMode: boolean = true; mode: 'determinate' | 'indeterminate'; progress: number = 0; show: boolean = false; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor(private _fuseLoadingService: FuseLoadingService) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/masonry/masonry.component.ts b/src/@fuse/components/masonry/masonry.component.ts index 4c86020f..f61b0bba 100644 --- a/src/@fuse/components/masonry/masonry.component.ts +++ b/src/@fuse/components/masonry/masonry.component.ts @@ -1,7 +1,6 @@ import { NgTemplateOutlet } from '@angular/common'; import { AfterViewInit, Component, Input, OnChanges, SimpleChanges, TemplateRef, ViewEncapsulation } from '@angular/core'; import { fuseAnimations } from '@fuse/animations'; -import { FuseMediaWatcherService } from '@fuse/services/media-watcher'; @Component({ selector : 'fuse-masonry', @@ -19,13 +18,6 @@ export class FuseMasonryComponent implements OnChanges, AfterViewInit @Input() items: any[] = []; distributedColumns: any[] = []; - /** - * Constructor - */ - constructor(private _fuseMediaWatcherService: FuseMediaWatcherService) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts index 10f4b87f..5879692d 100644 --- a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts @@ -1,5 +1,5 @@ import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -19,29 +19,22 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() item: FuseNavigationItem; @Input() name: string; - isActiveMatchOptions: IsActiveMatchOptions; + // Set the equivalent of {exact: false} as default for active match options. + // We are not assigning the item.isActiveMatchOptions directly to the + // [routerLinkActiveOptions] because if it's "undefined" initially, the router + // will throw an error and stop working. + isActiveMatchOptions: IsActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions; + private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - private _fuseUtilsService: FuseUtilsService, - ) - { - // Set the equivalent of {exact: false} as default for active match options. - // We are not assigning the item.isActiveMatchOptions directly to the - // [routerLinkActiveOptions] because if it's "undefined" initially, the router - // will throw an error and stop working. - this.isActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions; - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts b/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts index 99077be6..a696b832 100644 --- a/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts @@ -1,6 +1,6 @@ import { BooleanInput } from '@angular/cdk/coercion'; import { NgClass, NgFor, NgIf, NgTemplateOutlet } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, inject, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatMenu, MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -24,6 +24,9 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe static ngAcceptInputType_child: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() child: boolean = false; @Input() item: FuseNavigationItem; @Input() name: string; @@ -32,16 +35,6 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/horizontal/components/divider/divider.component.ts b/src/@fuse/components/navigation/horizontal/components/divider/divider.component.ts index 631faa50..ee810c32 100644 --- a/src/@fuse/components/navigation/horizontal/components/divider/divider.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/divider/divider.component.ts @@ -1,5 +1,5 @@ import { NgClass } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; @@ -14,22 +14,15 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() item: FuseNavigationItem; @Input() name: string; private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/horizontal/components/spacer/spacer.component.ts b/src/@fuse/components/navigation/horizontal/components/spacer/spacer.component.ts index 05f953af..3c5bdcf3 100644 --- a/src/@fuse/components/navigation/horizontal/components/spacer/spacer.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/spacer/spacer.component.ts @@ -1,5 +1,5 @@ import { NgClass } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; @@ -14,22 +14,15 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() item: FuseNavigationItem; @Input() name: string; private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/horizontal/horizontal.component.ts b/src/@fuse/components/navigation/horizontal/horizontal.component.ts index 440108cd..f9c7c6cf 100644 --- a/src/@fuse/components/navigation/horizontal/horizontal.component.ts +++ b/src/@fuse/components/navigation/horizontal/horizontal.component.ts @@ -1,5 +1,5 @@ import { NgFor, NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { fuseAnimations } from '@fuse/animations'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; @@ -22,23 +22,16 @@ import { FuseHorizontalNavigationSpacerItemComponent } from './components/spacer }) export class FuseHorizontalNavigationComponent implements OnChanges, OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() name: string = this._fuseUtilsService.randomId(); @Input() navigation: FuseNavigationItem[]; onRefreshed: ReplaySubject = new ReplaySubject(1); private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - private _fuseUtilsService: FuseUtilsService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/navigation.service.ts b/src/@fuse/components/navigation/navigation.service.ts index 53ee89b1..d7ee641e 100644 --- a/src/@fuse/components/navigation/navigation.service.ts +++ b/src/@fuse/components/navigation/navigation.service.ts @@ -7,13 +7,6 @@ export class FuseNavigationService private _componentRegistry: Map = new Map(); private _navigationStore: Map = new Map(); - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts b/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts index 429fb4a7..1479401a 100644 --- a/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts +++ b/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts @@ -1,6 +1,6 @@ import { BooleanInput } from '@angular/cdk/coercion'; import { NgClass, NgFor, NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; import { NavigationEnd, Router } from '@angular/router'; @@ -28,6 +28,10 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn static ngAcceptInputType_skipChildren: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _changeDetectorRef = inject(ChangeDetectorRef); + private _router = inject(Router); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() activeItemId: string; @Input() autoCollapse: boolean; @Input() item: FuseNavigationItem; @@ -38,17 +42,6 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _router: Router, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts b/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts index e4092de1..bd9fd8ab 100644 --- a/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts +++ b/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts @@ -1,5 +1,5 @@ import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; import { IsActiveMatchOptions, RouterLink, RouterLinkActive } from '@angular/router'; @@ -18,29 +18,22 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() item: FuseNavigationItem; @Input() name: string; - isActiveMatchOptions: IsActiveMatchOptions; + // Set the equivalent of {exact: false} as default for active match options. + // We are not assigning the item.isActiveMatchOptions directly to the + // [routerLinkActiveOptions] because if it's "undefined" initially, the router + // will throw an error and stop working. + isActiveMatchOptions: IsActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions; + private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - private _fuseUtilsService: FuseUtilsService, - ) - { - // Set the equivalent of {exact: false} as default for active match options. - // We are not assigning the item.isActiveMatchOptions directly to the - // [routerLinkActiveOptions] because if it's "undefined" initially, the router - // will throw an error and stop working. - this.isActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions; - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts b/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts index deb7e403..c6a67d06 100644 --- a/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts +++ b/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts @@ -1,6 +1,6 @@ import { BooleanInput } from '@angular/cdk/coercion'; import { NgClass, NgFor, NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, HostBinding, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, HostBinding, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; import { NavigationEnd, Router } from '@angular/router'; @@ -28,6 +28,10 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O static ngAcceptInputType_autoCollapse: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _changeDetectorRef = inject(ChangeDetectorRef); + private _router = inject(Router); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() autoCollapse: boolean; @Input() item: FuseNavigationItem; @Input() name: string; @@ -37,17 +41,6 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _router: Router, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/divider/divider.component.ts b/src/@fuse/components/navigation/vertical/components/divider/divider.component.ts index 2ea1bad4..002a4b36 100644 --- a/src/@fuse/components/navigation/vertical/components/divider/divider.component.ts +++ b/src/@fuse/components/navigation/vertical/components/divider/divider.component.ts @@ -1,5 +1,5 @@ import { NgClass } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component'; @@ -14,22 +14,15 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() item: FuseNavigationItem; @Input() name: string; private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/group/group.component.ts b/src/@fuse/components/navigation/vertical/components/group/group.component.ts index ef4ed319..6931750e 100644 --- a/src/@fuse/components/navigation/vertical/components/group/group.component.ts +++ b/src/@fuse/components/navigation/vertical/components/group/group.component.ts @@ -1,6 +1,6 @@ import { BooleanInput } from '@angular/cdk/coercion'; import { NgClass, NgFor, NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; @@ -24,6 +24,9 @@ export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestr static ngAcceptInputType_autoCollapse: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() autoCollapse: boolean; @Input() item: FuseNavigationItem; @Input() name: string; @@ -31,16 +34,6 @@ export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestr private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/components/spacer/spacer.component.ts b/src/@fuse/components/navigation/vertical/components/spacer/spacer.component.ts index f1b61c50..5448b54f 100644 --- a/src/@fuse/components/navigation/vertical/components/spacer/spacer.component.ts +++ b/src/@fuse/components/navigation/vertical/components/spacer/spacer.component.ts @@ -1,5 +1,5 @@ import { NgClass } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component'; @@ -14,22 +14,15 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDestroy { + private _changeDetectorRef = inject(ChangeDetectorRef); + private _fuseNavigationService = inject(FuseNavigationService); + @Input() item: FuseNavigationItem; @Input() name: string; private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseNavigationService: FuseNavigationService, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/components/navigation/vertical/vertical.component.ts b/src/@fuse/components/navigation/vertical/vertical.component.ts index ced92e2e..bf8f0052 100644 --- a/src/@fuse/components/navigation/vertical/vertical.component.ts +++ b/src/@fuse/components/navigation/vertical/vertical.component.ts @@ -2,7 +2,7 @@ import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/anim import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay'; import { DOCUMENT, NgFor, NgIf } from '@angular/common'; -import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Inject, Input, OnChanges, OnDestroy, OnInit, Output, QueryList, Renderer2, SimpleChanges, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, inject, Input, OnChanges, OnDestroy, OnInit, Output, QueryList, Renderer2, SimpleChanges, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { fuseAnimations } from '@fuse/animations'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; @@ -36,6 +36,16 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After static ngAcceptInputType_transparentOverlay: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _animationBuilder = inject(AnimationBuilder); + private _changeDetectorRef = inject(ChangeDetectorRef); + private _document = inject(DOCUMENT); + private _elementRef = inject(ElementRef); + private _renderer2 = inject(Renderer2); + private _router = inject(Router); + private _scrollStrategyOptions = inject(ScrollStrategyOptions); + private _fuseNavigationService = inject(FuseNavigationService); + private _fuseUtilsService = inject(FuseUtilsService); + @Input() appearance: FuseVerticalNavigationAppearance = 'default'; @Input() autoCollapse: boolean = true; @Input() inner: boolean = false; @@ -71,17 +81,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After /** * Constructor */ - constructor( - private _animationBuilder: AnimationBuilder, - private _changeDetectorRef: ChangeDetectorRef, - @Inject(DOCUMENT) private _document: Document, - private _elementRef: ElementRef, - private _renderer2: Renderer2, - private _router: Router, - private _scrollStrategyOptions: ScrollStrategyOptions, - private _fuseNavigationService: FuseNavigationService, - private _fuseUtilsService: FuseUtilsService, - ) + constructor() { this._handleAsideOverlayClick = (): void => { diff --git a/src/@fuse/directives/scroll-reset/scroll-reset.directive.ts b/src/@fuse/directives/scroll-reset/scroll-reset.directive.ts index 59b793b3..17fae846 100644 --- a/src/@fuse/directives/scroll-reset/scroll-reset.directive.ts +++ b/src/@fuse/directives/scroll-reset/scroll-reset.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core'; +import { Directive, ElementRef, inject, OnDestroy, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { filter, Subject, takeUntil } from 'rxjs'; @@ -9,17 +9,10 @@ import { filter, Subject, takeUntil } from 'rxjs'; }) export class FuseScrollResetDirective implements OnInit, OnDestroy { - private _unsubscribeAll: Subject = new Subject(); + private _elementRef = inject(ElementRef); + private _router = inject(Router); - /** - * Constructor - */ - constructor( - private _elementRef: ElementRef, - private _router: Router, - ) - { - } + private _unsubscribeAll: Subject = new Subject(); // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks diff --git a/src/@fuse/directives/scrollbar/scrollbar.directive.ts b/src/@fuse/directives/scrollbar/scrollbar.directive.ts index dbde4e5f..5d6a643e 100644 --- a/src/@fuse/directives/scrollbar/scrollbar.directive.ts +++ b/src/@fuse/directives/scrollbar/scrollbar.directive.ts @@ -1,7 +1,6 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; import { Platform } from '@angular/cdk/platform'; -import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; -import { Router } from '@angular/router'; +import { Directive, ElementRef, inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { ScrollbarGeometry, ScrollbarPosition } from '@fuse/directives/scrollbar/scrollbar.types'; import { merge } from 'lodash-es'; import PerfectScrollbar from 'perfect-scrollbar'; @@ -21,6 +20,9 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy static ngAcceptInputType_fuseScrollbar: BooleanInput; /* eslint-enable @typescript-eslint/naming-convention */ + private _elementRef = inject(ElementRef); + private _platform = inject(Platform); + @Input() fuseScrollbar: boolean = true; @Input() fuseScrollbarOptions: PerfectScrollbar.Options; @@ -29,17 +31,6 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy private _ps: PerfectScrollbar; private _unsubscribeAll: Subject = new Subject(); - /** - * Constructor - */ - constructor( - private _elementRef: ElementRef, - private _platform: Platform, - private _router: Router, - ) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/lib/mock-api/mock-api.service.ts b/src/@fuse/lib/mock-api/mock-api.service.ts index eee5210f..1bec5873 100644 --- a/src/@fuse/lib/mock-api/mock-api.service.ts +++ b/src/@fuse/lib/mock-api/mock-api.service.ts @@ -17,13 +17,6 @@ export class FuseMockApiService 'options': new Map(), }; - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/lib/mock-api/mock-api.utils.ts b/src/@fuse/lib/mock-api/mock-api.utils.ts index ba3c5b81..70ad8200 100644 --- a/src/@fuse/lib/mock-api/mock-api.utils.ts +++ b/src/@fuse/lib/mock-api/mock-api.utils.ts @@ -1,12 +1,5 @@ export class FuseMockApiUtils { - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts b/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts index 4a7a9a9d..a3c8f64f 100644 --- a/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts +++ b/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts @@ -10,13 +10,6 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class FuseFindByKeyPipe implements PipeTransform { - /** - * Constructor - */ - constructor() - { - } - /** * Transform * diff --git a/src/@fuse/services/config/config.service.ts b/src/@fuse/services/config/config.service.ts index b192bd10..3f586f8c 100644 --- a/src/@fuse/services/config/config.service.ts +++ b/src/@fuse/services/config/config.service.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { FUSE_CONFIG } from '@fuse/services/config/config.constants'; import { merge } from 'lodash-es'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -6,16 +6,7 @@ import { BehaviorSubject, Observable } from 'rxjs'; @Injectable({providedIn: 'root'}) export class FuseConfigService { - private _config: BehaviorSubject; - - /** - * Constructor - */ - constructor(@Inject(FUSE_CONFIG) config: any) - { - // Private - this._config = new BehaviorSubject(config); - } + private _config = new BehaviorSubject(inject(FUSE_CONFIG)); // ----------------------------------------------------------------------------------------------------- // @ Accessors diff --git a/src/@fuse/services/confirmation/confirmation.service.ts b/src/@fuse/services/confirmation/confirmation.service.ts index 080c789d..0e55fe64 100644 --- a/src/@fuse/services/confirmation/confirmation.service.ts +++ b/src/@fuse/services/confirmation/confirmation.service.ts @@ -30,13 +30,6 @@ export class FuseConfirmationService dismissible: false, }; - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/services/confirmation/dialog/dialog.component.ts b/src/@fuse/services/confirmation/dialog/dialog.component.ts index 995da16b..cc12f452 100644 --- a/src/@fuse/services/confirmation/dialog/dialog.component.ts +++ b/src/@fuse/services/confirmation/dialog/dialog.component.ts @@ -1,5 +1,5 @@ import { NgClass, NgIf } from '@angular/common'; -import { Component, Inject, ViewEncapsulation } from '@angular/core'; +import { Component, inject, ViewEncapsulation } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; @@ -31,11 +31,5 @@ import { FuseConfirmationConfig } from '@fuse/services/confirmation/confirmation }) export class FuseConfirmationDialogComponent { - /** - * Constructor - */ - constructor(@Inject(MAT_DIALOG_DATA) public data: FuseConfirmationConfig) - { - } - + data: FuseConfirmationConfig = inject(MAT_DIALOG_DATA); } diff --git a/src/@fuse/services/loading/loading.service.ts b/src/@fuse/services/loading/loading.service.ts index d761714e..99370f5d 100644 --- a/src/@fuse/services/loading/loading.service.ts +++ b/src/@fuse/services/loading/loading.service.ts @@ -1,4 +1,3 @@ -import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -11,13 +10,6 @@ export class FuseLoadingService private _show$: BehaviorSubject = new BehaviorSubject(false); private _urlMap: Map = new Map(); - /** - * Constructor - */ - constructor(private _httpClient: HttpClient) - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/services/media-watcher/media-watcher.service.ts b/src/@fuse/services/media-watcher/media-watcher.service.ts index bf4d91fe..a2ce7ba0 100644 --- a/src/@fuse/services/media-watcher/media-watcher.service.ts +++ b/src/@fuse/services/media-watcher/media-watcher.service.ts @@ -1,5 +1,5 @@ import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { FuseConfigService } from '@fuse/services/config'; import { fromPairs } from 'lodash-es'; import { map, Observable, ReplaySubject, switchMap } from 'rxjs'; @@ -7,15 +7,15 @@ import { map, Observable, ReplaySubject, switchMap } from 'rxjs'; @Injectable({providedIn: 'root'}) export class FuseMediaWatcherService { + private _breakpointObserver = inject(BreakpointObserver); + private _fuseConfigService = inject(FuseConfigService); + private _onMediaChange: ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }> = new ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }>(1); /** * Constructor */ - constructor( - private _breakpointObserver: BreakpointObserver, - private _fuseConfigService: FuseConfigService, - ) + constructor() { this._fuseConfigService.config$.pipe( map(config => fromPairs(Object.entries(config.screens).map(([alias, screen]) => ([alias, `(min-width: ${screen})`])))), diff --git a/src/@fuse/services/platform/platform.service.ts b/src/@fuse/services/platform/platform.service.ts index 1553c99d..3bfb8a74 100644 --- a/src/@fuse/services/platform/platform.service.ts +++ b/src/@fuse/services/platform/platform.service.ts @@ -1,15 +1,17 @@ import { Platform } from '@angular/cdk/platform'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; @Injectable({providedIn: 'root'}) export class FusePlatformService { + private _platform = inject(Platform); + osName = 'os-unknown'; /** * Constructor */ - constructor(private _platform: Platform) + constructor() { // If the platform is not a browser, return immediately if ( !this._platform.isBrowser ) diff --git a/src/@fuse/services/splash-screen/splash-screen.service.ts b/src/@fuse/services/splash-screen/splash-screen.service.ts index 76f41e58..ee708a9c 100644 --- a/src/@fuse/services/splash-screen/splash-screen.service.ts +++ b/src/@fuse/services/splash-screen/splash-screen.service.ts @@ -1,18 +1,18 @@ import { DOCUMENT } from '@angular/common'; -import { Inject, Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { filter, take } from 'rxjs'; @Injectable({providedIn: 'root'}) export class FuseSplashScreenService { + private _document = inject(DOCUMENT); + private _router = inject(Router); + /** * Constructor */ - constructor( - @Inject(DOCUMENT) private _document: any, - private _router: Router, - ) + constructor() { // Hide it on the first NavigationEnd event this._router.events diff --git a/src/@fuse/services/utils/utils.service.ts b/src/@fuse/services/utils/utils.service.ts index 815e53c5..84ae7cce 100644 --- a/src/@fuse/services/utils/utils.service.ts +++ b/src/@fuse/services/utils/utils.service.ts @@ -4,13 +4,6 @@ import { IsActiveMatchOptions } from '@angular/router'; @Injectable({providedIn: 'root'}) export class FuseUtilsService { - /** - * Constructor - */ - constructor() - { - } - // ----------------------------------------------------------------------------------------------------- // @ Accessors // -----------------------------------------------------------------------------------------------------