@cleavelandprice/ngx-lib 4.4.9 → 4.4.10

package/active-directory/material/components/user-form-field/user-form-field.component.d.ts

@@ -5,7 +5,7 @@ import { UserChooserData } from '../../model/user-chooser-data';
 import * as i0 from "@angular/core";
 export declare class UserFormFieldComponent implements OnInit {
     #private;
-    usersSelected: import("@angular/core").OutputEmitterRef<string | string[] | UserOrGroup | UserOrGroup[]>;
+    usersSelected: import("@angular/core").OutputEmitterRef<string | UserOrGroup | string[] | UserOrGroup[]>;
     userUnSelected: import("@angular/core").OutputEmitterRef<string>;
     placeholder: import("@angular/core").InputSignal<string>;
     clickable: import("@angular/core").InputSignal<boolean>;

package/active-directory/services/active-directory.service.d.ts

@@ -21,6 +21,8 @@ export declare class ActiveDirectoryService extends NgxLibServiceBase {
     getDistinctUserAttributeValues(attributeName: string): Observable<any[]>;
     getDepartments(): Observable<string[]>;
     getTitles(): Observable<string[]>;
+    getWorkShifts(): Observable<string[]>;
+    getManagementRoles(): Observable<string[]>;
     getComputers(includeDisabled?: boolean, parentOU?: string): Observable<User[]>;
     getServers(includeDisabled?: boolean, parentOU?: string): Observable<User[]>;
     getWorkstations(includeDisabled?: boolean, parentOU?: string): Observable<User[]>;

package/fesm2022/cleavelandprice-ngx-lib-active-directory.mjs

@@ -102,6 +102,12 @@ class ActiveDirectoryService extends NgxLibServiceBase {
     getTitles() {
         return this.#services.http.get(`${this.apiUrl}/activedirectory/titles`);
     }
+    getWorkShifts() {
+        return this.#services.http.get(`${this.apiUrl}/activedirectory/workshifts`);
+    }
+    getManagementRoles() {
+        return this.#services.http.get(`${this.apiUrl}/activedirectory/managementroles`);
+    }
     getComputers(includeDisabled = false, parentOU = '') {
         return this.#services.http.get(`${this.apiUrl}/activedirectory/computers/${includeDisabled}/${parentOU}`);
     }

package/fesm2022/cleavelandprice-ngx-lib-active-directory.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cleavelandprice-ngx-lib-active-directory.mjs","sources":["../../../../projects/cleavelandprice/ngx-lib/active-directory/src/model/active-directory-service-options-token.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/services/active-directory.service.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/active-directory.module.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/cleavelandprice-ngx-lib-active-directory.ts"],"sourcesContent":["import { InjectionToken } from \"@angular/core\";\r\nimport { ActiveDirectoryServiceOptions } from \"./active-directory-service-options\";\r\n\r\nexport const ActiveDirectoryServiceOptionsToken = new InjectionToken<ActiveDirectoryServiceOptions>('');","import { HttpClient } from '@angular/common/http';\r\nimport { Inject, inject, Injectable, Optional } from '@angular/core';\r\nimport { DateTime } from 'luxon';\r\nimport { Observable, of } from 'rxjs';\r\n\r\nimport { NgxLibServiceBase } from '@cleavelandprice/ngx-lib';\r\nimport { ActiveDirectoryServiceOptions } from '../model/active-directory-service-options';\r\nimport { ActiveDirectoryServiceOptionsToken } from '../model/active-directory-service-options-token';\r\nimport { ADObject } from '../model/ad-object';\r\nimport { ADObjectWithChildren } from '../model/ad-object-with-children';\r\nimport { CacheObject } from '../model/cache-object';\r\nimport { CleavelandPriceUser } from '../model/cleaveland-price-user';\r\nimport { Group } from '../model/group';\r\nimport { User } from '../model/user';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class ActiveDirectoryService extends NgxLibServiceBase {\r\n  #services = {\r\n    http: inject(HttpClient)\r\n  };\r\n  #cache?: CacheObject<CleavelandPriceUser>;\r\n  #defaultCacheLifeMinutes = 720;\r\n\r\n  //#region Properties\r\n  get #cacheExpired(): boolean {\r\n    if (!this.#cache) {\r\n      return true;\r\n    }\r\n\r\n    const expiration = this.#cache.lastUpdate.plus({ minutes: this.options.caching!.lifeMinutes});\r\n\r\n    return DateTime.now() > expiration;\r\n  }\r\n  //#endregion\r\n\r\n  constructor(@Optional() @Inject(ActiveDirectoryServiceOptionsToken) private options: ActiveDirectoryServiceOptions) {\r\n    super(options);\r\n\r\n    this.options = {\r\n      ...options,\r\n\r\n      caching: options?.caching ?? {\r\n        enabled: false,\r\n        lifeMinutes: this.#defaultCacheLifeMinutes\r\n      },\r\n\r\n      logging: options?.logging ?? {\r\n        dataCached: false,\r\n        cachedDataReturned: false,\r\n        freshDataReturned: false,\r\n        cacheCleared: false\r\n      }\r\n    };\r\n  }\r\n  \r\n  getUsers(includePhoto = false, includeDisabled = false, parentOU = ''): Observable<CleavelandPriceUser[]> {\r\n    // If caching is enabled, there will be two calls to the API if the cache is null/expired\r\n    // One call is to update the cache and the other is to return the data that the user requested\r\n    // Subsequent calls will bypass the API and returned cached data until it expires\r\n\r\n    const observable$ = this.#services.http.get<CleavelandPriceUser[]>(`${this.apiUrl}/users/${includePhoto}/${includeDisabled}/${parentOU}`);\r\n\r\n    if (this.options.caching!.enabled) {\r\n      if (this.#cacheExpired) {\r\n        // Get the data and cache it\r\n        observable$.subscribe(data => {\r\n          this.#cache = {\r\n            data,\r\n            lastUpdate: DateTime.now()\r\n          };\r\n\r\n          if (this.options.logging!.dataCached) {\r\n            console.log(`Data cached for ${this.options.caching!.lifeMinutes} minutes`);\r\n          }\r\n        });\r\n      } else {\r\n        // Cache exists and hasn't expired yet\r\n        if (this.options.logging!.cachedDataReturned) {\r\n          console.log('Returning cached users');\r\n        }\r\n\r\n        return of(this.#cache!.data);\r\n      }\r\n    }\r\n\r\n    // Cache is either disabled or expired, return data from API\r\n    if (this.options.logging!.freshDataReturned) {\r\n      console.log('Returning fresh users');\r\n    }\r\n\r\n    return observable$;\r\n  }\r\n\r\n  getUser(accountName: string, includePhoto = false): Observable<CleavelandPriceUser> {\r\n    return this.#services.http.get<CleavelandPriceUser>(`${this.apiUrl}/users/name/${accountName}/${includePhoto}`);\r\n  }\r\n\r\n  clearCache(): void {\r\n    this.#cache = undefined;\r\n\r\n    if (this.options.logging!.cacheCleared) {\r\n      console.log('Cache cleared');\r\n    }\r\n  }\r\n\r\n  getDomains(): Observable<ADObject[]> {\r\n    return this.#services.http.get<ADObject[]>(`${this.apiUrl}/activedirectory/domains`);\r\n  }\r\n\r\n  getOUs(parentOU = ''): Observable<ADObjectWithChildren[]> {\r\n    return this.#services.http.get<ADObjectWithChildren[]>(`${this.apiUrl}/activedirectory/ous/${parentOU}`);\r\n  }\r\n\r\n  getContainers(parentOU = ''): Observable<ADObjectWithChildren[]> {\r\n    return this.#services.http.get<ADObjectWithChildren[]>(`${this.apiUrl}/activedirectory/containers/${parentOU}`);\r\n  }\r\n\r\n  getGroups(parentOU = ''): Observable<Group[]> {\r\n    return this.#services.http.get<Group[]>(`${this.apiUrl}/activedirectory/groups/${parentOU}`);\r\n  }\r\n\r\n  getDistinctUserAttributeValues(attributeName: string) : Observable<any[]> {\r\n    return this.#services.http.get<any[]>(`${this.apiUrl}/activedirectory/distinct/${attributeName}`);\r\n  }\r\n\r\n  getDepartments() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/departments`);\r\n  }\r\n\r\n  getTitles() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/titles`);\r\n  }\r\n\r\n  getComputers(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/computers/${includeDisabled}/${parentOU}`);\r\n  }\r\n\r\n  getServers(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/servers/${includeDisabled}/${parentOU}`);\r\n  }\r\n\r\n  getWorkstations(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/workstations/${includeDisabled}/${parentOU}`);\r\n  }\r\n}\r\n","import { CommonModule } from '@angular/common';\r\nimport { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';\r\n\r\nimport { ActiveDirectoryServiceOptions } from './model/active-directory-service-options';\r\nimport { ActiveDirectoryServiceOptionsToken } from './model/active-directory-service-options-token';\r\n\r\n@NgModule({\r\n  declarations: [],\r\n  imports: [\r\n    CommonModule\r\n  ],\r\n  exports: []\r\n})\r\nexport class ActiveDirectoryModule {\r\n  static forRoot(config: ActiveDirectoryServiceOptions): ModuleWithProviders<ActiveDirectoryModule> {\r\n    return {\r\n      ngModule: ActiveDirectoryModule,\r\n      providers: [\r\n        {\r\n          provide: ActiveDirectoryServiceOptionsToken,\r\n          useValue: config\r\n        }\r\n      ]\r\n    };\r\n  }\r\n\r\n  constructor(@Optional() @SkipSelf() parentModule: ActiveDirectoryModule) {\r\n    if (parentModule) {\r\n      throw new Error(\r\n        'ActiveDirectoryModule is already loaded. Import it in the AppModule only');\r\n    }\r\n  }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './active-directory.api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"cleavelandprice-ngx-lib-active-directory.mjs","sources":["../../../../projects/cleavelandprice/ngx-lib/active-directory/src/model/active-directory-service-options-token.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/services/active-directory.service.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/active-directory.module.ts","../../../../projects/cleavelandprice/ngx-lib/active-directory/src/cleavelandprice-ngx-lib-active-directory.ts"],"sourcesContent":["import { InjectionToken } from \"@angular/core\";\r\nimport { ActiveDirectoryServiceOptions } from \"./active-directory-service-options\";\r\n\r\nexport const ActiveDirectoryServiceOptionsToken = new InjectionToken<ActiveDirectoryServiceOptions>('');","import { HttpClient } from '@angular/common/http';\r\nimport { Inject, inject, Injectable, Optional } from '@angular/core';\r\nimport { DateTime } from 'luxon';\r\nimport { Observable, of } from 'rxjs';\r\n\r\nimport { NgxLibServiceBase } from '@cleavelandprice/ngx-lib';\r\nimport { ActiveDirectoryServiceOptions } from '../model/active-directory-service-options';\r\nimport { ActiveDirectoryServiceOptionsToken } from '../model/active-directory-service-options-token';\r\nimport { ADObject } from '../model/ad-object';\r\nimport { ADObjectWithChildren } from '../model/ad-object-with-children';\r\nimport { CacheObject } from '../model/cache-object';\r\nimport { CleavelandPriceUser } from '../model/cleaveland-price-user';\r\nimport { Group } from '../model/group';\r\nimport { User } from '../model/user';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class ActiveDirectoryService extends NgxLibServiceBase {\r\n  #services = {\r\n    http: inject(HttpClient)\r\n  };\r\n  #cache?: CacheObject<CleavelandPriceUser>;\r\n  #defaultCacheLifeMinutes = 720;\r\n\r\n  //#region Properties\r\n  get #cacheExpired(): boolean {\r\n    if (!this.#cache) {\r\n      return true;\r\n    }\r\n\r\n    const expiration = this.#cache.lastUpdate.plus({ minutes: this.options.caching!.lifeMinutes});\r\n\r\n    return DateTime.now() > expiration;\r\n  }\r\n  //#endregion\r\n\r\n  constructor(@Optional() @Inject(ActiveDirectoryServiceOptionsToken) private options: ActiveDirectoryServiceOptions) {\r\n    super(options);\r\n\r\n    this.options = {\r\n      ...options,\r\n\r\n      caching: options?.caching ?? {\r\n        enabled: false,\r\n        lifeMinutes: this.#defaultCacheLifeMinutes\r\n      },\r\n\r\n      logging: options?.logging ?? {\r\n        dataCached: false,\r\n        cachedDataReturned: false,\r\n        freshDataReturned: false,\r\n        cacheCleared: false\r\n      }\r\n    };\r\n  }\r\n  \r\n  getUsers(includePhoto = false, includeDisabled = false, parentOU = ''): Observable<CleavelandPriceUser[]> {\r\n    // If caching is enabled, there will be two calls to the API if the cache is null/expired\r\n    // One call is to update the cache and the other is to return the data that the user requested\r\n    // Subsequent calls will bypass the API and returned cached data until it expires\r\n\r\n    const observable$ = this.#services.http.get<CleavelandPriceUser[]>(`${this.apiUrl}/users/${includePhoto}/${includeDisabled}/${parentOU}`);\r\n\r\n    if (this.options.caching!.enabled) {\r\n      if (this.#cacheExpired) {\r\n        // Get the data and cache it\r\n        observable$.subscribe(data => {\r\n          this.#cache = {\r\n            data,\r\n            lastUpdate: DateTime.now()\r\n          };\r\n\r\n          if (this.options.logging!.dataCached) {\r\n            console.log(`Data cached for ${this.options.caching!.lifeMinutes} minutes`);\r\n          }\r\n        });\r\n      } else {\r\n        // Cache exists and hasn't expired yet\r\n        if (this.options.logging!.cachedDataReturned) {\r\n          console.log('Returning cached users');\r\n        }\r\n\r\n        return of(this.#cache!.data);\r\n      }\r\n    }\r\n\r\n    // Cache is either disabled or expired, return data from API\r\n    if (this.options.logging!.freshDataReturned) {\r\n      console.log('Returning fresh users');\r\n    }\r\n\r\n    return observable$;\r\n  }\r\n\r\n  getUser(accountName: string, includePhoto = false): Observable<CleavelandPriceUser> {\r\n    return this.#services.http.get<CleavelandPriceUser>(`${this.apiUrl}/users/name/${accountName}/${includePhoto}`);\r\n  }\r\n\r\n  clearCache(): void {\r\n    this.#cache = undefined;\r\n\r\n    if (this.options.logging!.cacheCleared) {\r\n      console.log('Cache cleared');\r\n    }\r\n  }\r\n\r\n  getDomains(): Observable<ADObject[]> {\r\n    return this.#services.http.get<ADObject[]>(`${this.apiUrl}/activedirectory/domains`);\r\n  }\r\n\r\n  getOUs(parentOU = ''): Observable<ADObjectWithChildren[]> {\r\n    return this.#services.http.get<ADObjectWithChildren[]>(`${this.apiUrl}/activedirectory/ous/${parentOU}`);\r\n  }\r\n\r\n  getContainers(parentOU = ''): Observable<ADObjectWithChildren[]> {\r\n    return this.#services.http.get<ADObjectWithChildren[]>(`${this.apiUrl}/activedirectory/containers/${parentOU}`);\r\n  }\r\n\r\n  getGroups(parentOU = ''): Observable<Group[]> {\r\n    return this.#services.http.get<Group[]>(`${this.apiUrl}/activedirectory/groups/${parentOU}`);\r\n  }\r\n\r\n  getDistinctUserAttributeValues(attributeName: string) : Observable<any[]> {\r\n    return this.#services.http.get<any[]>(`${this.apiUrl}/activedirectory/distinct/${attributeName}`);\r\n  }\r\n\r\n  getDepartments() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/departments`);\r\n  }\r\n\r\n  getTitles() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/titles`);\r\n  }\r\n\r\n  getWorkShifts() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/workshifts`);\r\n  }\r\n\r\n  getManagementRoles() : Observable<string[]> {\r\n    return this.#services.http.get<string[]>(`${this.apiUrl}/activedirectory/managementroles`);\r\n  }\r\n\r\n  getComputers(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/computers/${includeDisabled}/${parentOU}`);\r\n  }\r\n\r\n  getServers(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/servers/${includeDisabled}/${parentOU}`);\r\n  }\r\n\r\n  getWorkstations(includeDisabled = false, parentOU = ''): Observable<User[]> {\r\n    return this.#services.http.get<User[]>(`${this.apiUrl}/activedirectory/workstations/${includeDisabled}/${parentOU}`);\r\n  }\r\n}\r\n","import { CommonModule } from '@angular/common';\r\nimport { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';\r\n\r\nimport { ActiveDirectoryServiceOptions } from './model/active-directory-service-options';\r\nimport { ActiveDirectoryServiceOptionsToken } from './model/active-directory-service-options-token';\r\n\r\n@NgModule({\r\n  declarations: [],\r\n  imports: [\r\n    CommonModule\r\n  ],\r\n  exports: []\r\n})\r\nexport class ActiveDirectoryModule {\r\n  static forRoot(config: ActiveDirectoryServiceOptions): ModuleWithProviders<ActiveDirectoryModule> {\r\n    return {\r\n      ngModule: ActiveDirectoryModule,\r\n      providers: [\r\n        {\r\n          provide: ActiveDirectoryServiceOptionsToken,\r\n          useValue: config\r\n        }\r\n      ]\r\n    };\r\n  }\r\n\r\n  constructor(@Optional() @SkipSelf() parentModule: ActiveDirectoryModule) {\r\n    if (parentModule) {\r\n      throw new Error(\r\n        'ActiveDirectoryModule is already loaded. Import it in the AppModule only');\r\n    }\r\n  }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './active-directory.api';\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "comment": "NGX-LIB primary entry point package.json",
   "name": "@cleavelandprice/ngx-lib",
-  "version": "4.4.9",
+  "version": "4.4.10",
   "description": "Angular library providing foundational functionality to Cleaveland-Price applications",
   "peerDependencies": {
     "@angular/common": "^19.0.0",
@@ -57,6 +57,10 @@
       "types": "./sharepoint/index.d.ts",
       "default": "./fesm2022/cleavelandprice-ngx-lib-sharepoint.mjs"
     },
+    "./table": {
+      "types": "./table/index.d.ts",
+      "default": "./fesm2022/cleavelandprice-ngx-lib-table.mjs"
+    },
     "./upload": {
       "types": "./upload/index.d.ts",
       "default": "./fesm2022/cleavelandprice-ngx-lib-upload.mjs"
@@ -65,10 +69,6 @@
       "types": "./url-utilities/index.d.ts",
       "default": "./fesm2022/cleavelandprice-ngx-lib-url-utilities.mjs"
     },
-    "./table": {
-      "types": "./table/index.d.ts",
-      "default": "./fesm2022/cleavelandprice-ngx-lib-table.mjs"
-    },
     "./active-directory/material": {
       "types": "./active-directory/material/index.d.ts",
       "default": "./fesm2022/cleavelandprice-ngx-lib-active-directory-material.mjs"