From ca5b54fd58fc84cbd2e69eff88beb7aa8a89f543 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Tue, 16 Sep 2025 11:33:03 +0300 Subject: [PATCH] refactoring --- .../extensible-table.component.html | 2 +- .../extensible-table.component.ts | 7 ++++--- .../packages/core/src/lib/services/index.ts | 1 - .../core/src/lib/services/ssr.service.ts | 17 ----------------- .../src/lib/components/roles/roles.component.ts | 4 +--- .../nav-items/current-user.component.ts | 11 +++-------- .../nav-items/nav-items.component.html | 2 +- .../components/nav-items/nav-items.component.ts | 9 +++++---- 8 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 npm/ng-packs/packages/core/src/lib/services/ssr.service.ts diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html index 1b243c7de7..1304bca062 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html @@ -1,4 +1,4 @@ -@if (ssrService.isBrowser) { +@if (isBrowser) { implements OnChanges, AfterViewIn protected readonly timeZoneService = inject(TimezoneService); protected readonly entityPropTypeClasses = inject(ENTITY_PROP_TYPE_CLASSES); protected readonly permissionService = inject(PermissionService); - protected readonly ssrService = inject(SSRService); + private platformId = inject(PLATFORM_ID); + protected isBrowser = isPlatformBrowser(this.platformId); protected _actionsText!: string; @Input() diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts index e6821009fe..f415c53abc 100644 --- a/npm/ng-packs/packages/core/src/lib/services/index.ts +++ b/npm/ng-packs/packages/core/src/lib/services/index.ts @@ -25,6 +25,5 @@ export * from './local-storage-listener.service'; export * from './title-strategy.service'; export * from './timezone.service'; export * from './time.service'; -export * from './ssr.service'; export * from './cookie-storage.service'; export * from './dom-strategy.service'; diff --git a/npm/ng-packs/packages/core/src/lib/services/ssr.service.ts b/npm/ng-packs/packages/core/src/lib/services/ssr.service.ts deleted file mode 100644 index 409b8ddb1b..0000000000 --- a/npm/ng-packs/packages/core/src/lib/services/ssr.service.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; -import { isPlatformBrowser, isPlatformServer } from '@angular/common'; - -@Injectable({ - providedIn: 'root', -}) -export class SSRService { - private platformId = Inject(PLATFORM_ID); - - get isBrowser() { - return isPlatformBrowser(this.platformId); - } - - get isServer() { - return isPlatformServer(this.platformId); - } -} diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts index ad8ce9f740..d7d4150a4d 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts @@ -4,8 +4,7 @@ import { LocalizationPipe, PagedAndSortedResultRequestDto, PagedResultDto, - ReplaceableTemplateDirective, - SSRService, + ReplaceableTemplateDirective } from '@abp/ng.core'; import { IdentityRoleDto, IdentityRoleService } from '@abp/ng.identity/proxy'; import { @@ -65,7 +64,6 @@ export class RolesComponent implements OnInit { protected readonly toasterService = inject(ToasterService); private readonly injector = inject(Injector); protected readonly service = inject(IdentityRoleService); - protected readonly ssrService = inject(SSRService); data: PagedResultDto = { items: [], totalCount: 0 }; form!: UntypedFormGroup; diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts index d1d43f4ba8..c6540ba92a 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts @@ -6,13 +6,12 @@ import { NAVIGATE_TO_MANAGE_PROFILE, PermissionDirective, SessionStateService, - SSRService, ToInjectorPipe, } from '@abp/ng.core'; import { AbpVisibleDirective, UserMenu, UserMenuService } from '@abp/ng.theme.shared'; import { Component, TrackByFunction, inject } from '@angular/core'; import { Observable } from 'rxjs'; -import { NgComponentOutlet, AsyncPipe } from '@angular/common'; +import { NgComponentOutlet, AsyncPipe, DOCUMENT } from '@angular/common'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -34,18 +33,14 @@ export class CurrentUserComponent { private authService = inject(AuthService); private configState = inject(ConfigStateService); private sessionState = inject(SessionStateService); + private document = inject(DOCUMENT); currentUser$: Observable = this.configState.getOne$('currentUser'); selectedTenant$ = this.sessionState.getTenant$(); trackByFn: TrackByFunction = (_, element) => element.id; - private ssrService = inject(SSRService); get smallScreen(): boolean { - if (this.ssrService.isServer) { - return false; - } else { - return window.innerWidth < 992; - } + return this.document.defaultView?.innerWidth < 992; } navigateToLogin() { diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.html index 923c255d57..d8d97d6d54 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.html @@ -1,5 +1,5 @@
    - @if (ssrService.isBrowser) { + @if (isBrowser) { @for (item of navItems.items$ | async; track $index) {
  • diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.ts index b22e4a1d6e..82d80bd30a 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.ts @@ -1,7 +1,7 @@ import { AbpVisibleDirective, NavItem, NavItemsService } from '@abp/ng.theme.shared'; -import { Component, TrackByFunction, inject } from '@angular/core'; -import { NgComponentOutlet, AsyncPipe } from '@angular/common'; -import { PermissionDirective, ToInjectorPipe, SSRService } from '@abp/ng.core'; +import { Component, TrackByFunction, inject, PLATFORM_ID } from '@angular/core'; +import { NgComponentOutlet, AsyncPipe, isPlatformBrowser } from '@angular/common'; +import { PermissionDirective, ToInjectorPipe } from '@abp/ng.core'; @Component({ selector: 'abp-nav-items', @@ -9,8 +9,9 @@ import { PermissionDirective, ToInjectorPipe, SSRService } from '@abp/ng.core'; imports: [NgComponentOutlet, AsyncPipe, AbpVisibleDirective, PermissionDirective, ToInjectorPipe], }) export class NavItemsComponent { - protected readonly ssrService = inject(SSRService); readonly navItems = inject(NavItemsService); + private platformId = inject(PLATFORM_ID); + readonly isBrowser = isPlatformBrowser(this.platformId); trackByFn: TrackByFunction = (_, element) => element.id; }