From 0ea1bd1900f5954b826c79c0464b7886c824bb0d Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 28 Jul 2022 00:57:38 +0300 Subject: [PATCH] some renames --- src/lib/common-ui.module.ts | 16 ++++++++-------- src/lib/help-mode/tokens.ts | 4 ++-- src/lib/services/api-path.interceptor.ts | 2 +- .../services/default-user-preference.service.ts | 4 ++-- src/lib/services/index.ts | 4 ++-- ...config.service.ts => iqser-config.service.ts} | 8 ++++---- ...rvice.ts => iqser-user-preference.service.ts} | 2 +- src/lib/services/language.service.ts | 4 ++-- src/lib/users/guards/iqser-auth-guard.service.ts | 4 ++-- src/lib/users/iqser-users.module.ts | 8 ++++---- src/lib/utils/index.ts | 2 +- .../{base-app-config.ts => iqser-app-config.ts} | 2 +- src/lib/utils/types/common-ui-options.ts | 10 +++++----- 13 files changed, 35 insertions(+), 35 deletions(-) rename src/lib/services/{base-config.service.ts => iqser-config.service.ts} (81%) rename src/lib/services/{base-user-preference.service.ts => iqser-user-preference.service.ts} (95%) rename src/lib/utils/{base-app-config.ts => iqser-app-config.ts} (88%) diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts index f2b32cc..43bb7a8 100644 --- a/src/lib/common-ui.module.ts +++ b/src/lib/common-ui.module.ts @@ -4,7 +4,7 @@ import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { SortByPipe } from './sorting'; -import { BaseAppConfig, CapitalizePipe, CommonUiOptions, HumanizePipe, ModuleWithOptions } from './utils'; +import { CapitalizePipe, CommonUiOptions, HumanizePipe, IqserAppConfig, ModuleWithOptions } from './utils'; import { HiddenActionComponent, LogoComponent, @@ -33,7 +33,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { ConfirmationDialogComponent } from './dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { HumanizeCamelCasePipe } from './utils/pipes/humanize-camel-case.pipe'; -import { ApiPathInterceptor, BaseConfigService, BaseUserPreferenceService } from './services'; +import { ApiPathInterceptor, IqserConfigService, IqserUserPreferenceService } from './services'; import { DefaultUserPreferenceService } from './services/default-user-preference.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; @@ -82,12 +82,12 @@ const pipes = [SortByPipe, HumanizePipe, CapitalizePipe, HumanizeCamelCasePipe]; }) export class CommonUiModule extends ModuleWithOptions { static forRoot< - UserPreference extends BaseUserPreferenceService, - Config extends BaseConfigService, - AppConfig extends BaseAppConfig = BaseAppConfig, + UserPreference extends IqserUserPreferenceService, + Config extends IqserConfigService, + AppConfig extends IqserAppConfig = IqserAppConfig, >(options: CommonUiOptions): ModuleWithProviders { const userPreferenceService = this._getService( - BaseUserPreferenceService, + IqserUserPreferenceService, DefaultUserPreferenceService, options.existingUserPreferenceService, ); @@ -116,7 +116,7 @@ export class CommonUiModule extends ModuleWithOptions { useFactory: configServiceFactory, }, { - provide: BaseConfigService, + provide: IqserConfigService, useExisting: configService, }, ]; @@ -124,7 +124,7 @@ export class CommonUiModule extends ModuleWithOptions { return [ { - provide: BaseConfigService, + provide: IqserConfigService, useFactory: configServiceFactory, }, ]; diff --git a/src/lib/help-mode/tokens.ts b/src/lib/help-mode/tokens.ts index e015696..0965c5a 100644 --- a/src/lib/help-mode/tokens.ts +++ b/src/lib/help-mode/tokens.ts @@ -1,8 +1,8 @@ import { inject, InjectionToken } from '@angular/core'; -import { BaseConfigService } from '../services'; +import { IqserConfigService } from '../services'; import { HelpDocs } from './help-docs'; export const HELP_DOCS = new InjectionToken('Links to user manual or help docs'); export const MANUAL_BASE_URL = new InjectionToken('Base manual URL', { - factory: () => inject(BaseConfigService).values.MANUAL_BASE_URL, + factory: () => inject(IqserConfigService).values.MANUAL_BASE_URL, }); diff --git a/src/lib/services/api-path.interceptor.ts b/src/lib/services/api-path.interceptor.ts index e10395e..9d97ae1 100644 --- a/src/lib/services/api-path.interceptor.ts +++ b/src/lib/services/api-path.interceptor.ts @@ -1,7 +1,7 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { getConfig } from './base-config.service'; +import { getConfig } from './iqser-config.service'; import { BASE_HREF } from '../utils'; @Injectable() diff --git a/src/lib/services/default-user-preference.service.ts b/src/lib/services/default-user-preference.service.ts index e63310f..221d2ef 100644 --- a/src/lib/services/default-user-preference.service.ts +++ b/src/lib/services/default-user-preference.service.ts @@ -1,9 +1,9 @@ import { inject, Injectable } from '@angular/core'; import { BASE_HREF } from '../utils'; -import { BaseUserPreferenceService } from './base-user-preference.service'; +import { IqserUserPreferenceService } from './iqser-user-preference.service'; @Injectable() -export class DefaultUserPreferenceService extends BaseUserPreferenceService { +export class DefaultUserPreferenceService extends IqserUserPreferenceService { protected readonly _defaultModelPath = 'attributes'; protected readonly _devFeaturesEnabledKey = inject(BASE_HREF) + '.enable-dev-features'; } diff --git a/src/lib/services/index.ts b/src/lib/services/index.ts index 8549ef8..f7c3d27 100644 --- a/src/lib/services/index.ts +++ b/src/lib/services/index.ts @@ -5,7 +5,7 @@ export * from './generic.service'; export * from './composite-route.guard'; export * from './stats.service'; export * from './entities-map.service'; -export * from './base-user-preference.service'; +export * from './iqser-user-preference.service'; export * from './language.service'; -export * from './base-config.service'; +export * from './iqser-config.service'; export * from './api-path.interceptor'; diff --git a/src/lib/services/base-config.service.ts b/src/lib/services/iqser-config.service.ts similarity index 81% rename from src/lib/services/base-config.service.ts rename to src/lib/services/iqser-config.service.ts index 49d3462..8628449 100644 --- a/src/lib/services/base-config.service.ts +++ b/src/lib/services/iqser-config.service.ts @@ -1,9 +1,9 @@ import { inject } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { CacheApiService, wipeAllCaches } from '../caching'; -import { BaseAppConfig } from '../utils'; +import { IqserAppConfig } from '../utils'; -export class BaseConfigService { +export class IqserConfigService { protected readonly _cacheApiService = inject(CacheApiService); protected readonly _titleService = inject(Title); @@ -33,6 +33,6 @@ export class BaseConfigService { } } -export function getConfig() { - return inject>(BaseConfigService).values; +export function getConfig() { + return inject>(IqserConfigService).values; } diff --git a/src/lib/services/base-user-preference.service.ts b/src/lib/services/iqser-user-preference.service.ts similarity index 95% rename from src/lib/services/base-user-preference.service.ts rename to src/lib/services/iqser-user-preference.service.ts index 00c0750..43c58c6 100644 --- a/src/lib/services/base-user-preference.service.ts +++ b/src/lib/services/iqser-user-preference.service.ts @@ -11,7 +11,7 @@ const KEYS = { } as const; @Injectable() -export abstract class BaseUserPreferenceService extends GenericService { +export abstract class IqserUserPreferenceService extends GenericService { protected abstract readonly _devFeaturesEnabledKey: string; #userAttributes: UserAttributes = {}; diff --git a/src/lib/services/language.service.ts b/src/lib/services/language.service.ts index f6ac9d3..12e72f0 100644 --- a/src/lib/services/language.service.ts +++ b/src/lib/services/language.service.ts @@ -9,7 +9,7 @@ import arraySupport from 'dayjs/plugin/arraySupport'; import localeData from 'dayjs/plugin/localeData'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/de'; -import { BaseUserPreferenceService } from './base-user-preference.service'; +import { IqserUserPreferenceService } from './iqser-user-preference.service'; dayjs.extend(arraySupport); dayjs.extend(localeData); @@ -20,7 +20,7 @@ dayjs.extend(localeData); export class LanguageService { constructor( private readonly _translateService: TranslateService, - private readonly _userPreferenceService: BaseUserPreferenceService, + private readonly _userPreferenceService: IqserUserPreferenceService, private readonly _dateAdapter: DateAdapter, ) { registerLocaleData(localeDe); diff --git a/src/lib/users/guards/iqser-auth-guard.service.ts b/src/lib/users/guards/iqser-auth-guard.service.ts index ffd7cfc..a68692b 100644 --- a/src/lib/users/guards/iqser-auth-guard.service.ts +++ b/src/lib/users/guards/iqser-auth-guard.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router } from '@angular/router'; import { KeycloakAuthGuard, KeycloakService } from 'keycloak-angular'; -import { BaseConfigService } from '../../services'; +import { IqserConfigService } from '../../services'; import { IqserUserService } from '../services/iqser-user.service'; @Injectable() @@ -9,7 +9,7 @@ export class IqserAuthGuard extends KeycloakAuthGuard { constructor( protected readonly _router: Router, protected readonly _keycloak: KeycloakService, - private readonly _configService: BaseConfigService, + private readonly _configService: IqserConfigService, private readonly _userService: IqserUserService, ) { super(_router, _keycloak); diff --git a/src/lib/users/iqser-users.module.ts b/src/lib/users/iqser-users.module.ts index 8af0043..2809279 100644 --- a/src/lib/users/iqser-users.module.ts +++ b/src/lib/users/iqser-users.module.ts @@ -10,7 +10,7 @@ import { IqserUsersModuleOptions } from './types/iqser-users-module-options'; import { IqserUser } from './iqser-user.model'; import { IqserRoleGuard } from './guards/iqser-role-guard.service'; import { IqserAuthGuard } from './guards/iqser-auth-guard.service'; -import { BaseConfigService } from '../services'; +import { IqserConfigService } from '../services'; import { NamePipe } from './name.pipe'; import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -19,7 +19,7 @@ import { UserButtonComponent } from './components/user-button/user-button.compon import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; -function getKeycloakOptions(baseUrl: string, configService: BaseConfigService): KeycloakOptions { +function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): KeycloakOptions { let url: string = configService.values.OAUTH_URL; url = url.replace(/\/$/, ''); // remove trailing slash const realm = url.substring(url.lastIndexOf('/') + 1, url.length); @@ -48,7 +48,7 @@ function configureAutomaticRedirectToLoginScreen(keyCloakService: KeycloakServic export function keycloakInitializer( keycloakService: KeycloakService, - configService: BaseConfigService, + configService: IqserConfigService, baseUrl: string, ): () => Promise { const x = keycloakService.init(getKeycloakOptions(baseUrl, configService)); @@ -82,7 +82,7 @@ export class IqserUsersModule extends ModuleWithOptions { provide: APP_INITIALIZER, useFactory: keycloakInitializer, multi: true, - deps: [KeycloakService, BaseConfigService, BASE_HREF], + deps: [KeycloakService, IqserConfigService, BASE_HREF], }, ], }; diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index 9cb13af..57abff3 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -19,5 +19,5 @@ export * from './headers-configuration'; export * from './context.component'; export * from './tokens'; export * from './module-with-options'; -export * from './base-app-config'; +export * from './iqser-app-config'; export * from './types/common-ui-options'; diff --git a/src/lib/utils/base-app-config.ts b/src/lib/utils/iqser-app-config.ts similarity index 88% rename from src/lib/utils/base-app-config.ts rename to src/lib/utils/iqser-app-config.ts index b293084..2301fdd 100644 --- a/src/lib/utils/base-app-config.ts +++ b/src/lib/utils/iqser-app-config.ts @@ -1,4 +1,4 @@ -export interface BaseAppConfig { +export interface IqserAppConfig { readonly API_URL: string; readonly APP_NAME: string; readonly FRONTEND_APP_VERSION: string; diff --git a/src/lib/utils/types/common-ui-options.ts b/src/lib/utils/types/common-ui-options.ts index cf96878..130659a 100644 --- a/src/lib/utils/types/common-ui-options.ts +++ b/src/lib/utils/types/common-ui-options.ts @@ -1,11 +1,11 @@ -import { BaseConfigService, BaseUserPreferenceService } from '../../services'; +import { IqserConfigService, IqserUserPreferenceService } from '../../services'; import { Type } from '@angular/core'; -import { BaseAppConfig } from '../base-app-config'; +import { IqserAppConfig } from '../iqser-app-config'; export interface CommonUiOptions< - UserPreference extends BaseUserPreferenceService, - Config extends BaseConfigService, - AppConfig extends BaseAppConfig, + UserPreference extends IqserUserPreferenceService, + Config extends IqserConfigService, + AppConfig extends IqserAppConfig, > { existingUserPreferenceService?: Type; configService?: Type;