@tuki-io/tuki-widgets 0.0.65 → 0.0.67

package/projects/tuki/widgets/user-manage/src/services/user.service.ts

@@ -1,242 +1,242 @@
-import {Injectable, OnInit} from '@angular/core';
-import { of, forkJoin, Subject } from 'rxjs';
-import { SimplifiedUser } from '../classes/simplified-user';
-import { API } from '../app.constants';
-import { APIService } from './api.service';
-import { map } from 'rxjs/operators';
-import { UtilsService } from './utils.service';
-import { LineAssociation } from '../classes/line-association';
-import { LineAssociationInterface } from '../classes/line-association-interface';
-import { LineService } from './line.service';
-import { SortingUtilsService } from './sorting-utils.service';
-
-@Injectable()
-export class UserService implements OnInit{
-  siteId: number = -1;
-  userId: string = '';
-  dataPending = false;
-  userIdExistPending = false;
-  hasExistedUserId = false;
-  user!: SimplifiedUser;
-  originUser!: SimplifiedUser;
-  onUserLineSaved$ = new Subject<any>();
-
-  get lineAssociation(): LineAssociation | LineAssociationInterface {
-    return this.user && this.originUser.devices && this.user.devices[0] && this.user.devices[0].lineAssociations && this.user.devices[0].lineAssociations[0];
-  }
-
-  get originLineAssociation(): LineAssociation | LineAssociationInterface {
-    return this.originUser && this.originUser.devices && this.originUser.devices[0] && this.originUser.devices[0].lineAssociations && this.originUser.devices[0].lineAssociations[0];
-  }
-
-  constructor(
-    private apiService: APIService,
-    private lineService: LineService
-  ) {
-
-  }
-
-  ngOnInit(): void {
-    console.log(this.siteId)
-  }
-
-  public fetchUserToken(siteId: number, userId: string, isLdap?: boolean, isSetNewTokenOnly?: boolean): any {
-    // isLdap TEMP because of token response issue
-    this.siteId = siteId;
-    this.userId = userId;
-    return this.apiService.fetch(API.USER_TOKEN.replace(':siteId', String(this.siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(userId))))
-      .pipe(map((result: any) => {
-        const user = result && Object.values(result)[0];
-        const token = Object.keys(result)[0];
-        if (user) {
-          if (!isSetNewTokenOnly) {
-            this.setSimplifiedUser(user);
-            this.user.token = user.token ;
-          }
-          this.user.token = user.token || token;
-          this.originUser.token = user.token || token;
-        }
-      }))
-    // .pipe(this.handleError(false, true));
-  }
-
-  public updateUserFields(body: any): any {
-    if (!this.siteId ) {
-      return;
-    }
-    return this.apiService.post(API.UPDATE_USER_FIELDS.replace(':siteId', String(this.siteId)).replace(':token', this.user.token), body)
-      // .pipe(this.handleError(false, true));
-  }
-
-  public fetchUserById(id: string) {
-    this.userIdExistPending = true;
-    return this.apiService.fetch(API.USER_BY_ID.replace(':siteId', String(this.siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(id))))
-      .pipe(map(result => {
-        this.userIdExistPending = false;
-        return result;
-      }));
-  }
-
-  public persistCacheChanges() {
-    /*const params = {
-      excludeDeviceExtraOptions: true
-    };*/
-    return this.processUserChangesToCache()
-      .pipe(map((result: any) => {
-        return this.apiService.post(API.PERSIST_USER_CACHE.replace(':siteId', String(this.siteId)).replace(':token', this.user.token), {})
-          .subscribe(() => {
-
-          })
-          // .pipe(map((user) => {
-          //   // this.setUser(user, false, this.user.token);
-          //   this.user.hasModifiedCache = false;
-          // }))
-          // .pipe(this.handleError(true, true));
-      }));
-  }
-
-  public processUserChangesToCache(): any {
-    const calls = [];
-    const body = UtilsService.diff(this.originUser.getUserDetailsSavableData(), this.user.getUserDetailsSavableData(), 'user');
-    if (body?.length) {
-      calls.push(this.updateUserFields(body));
-    }
-    if (!calls?.length) {
-      return of(this.user);
-    }
-
-    return forkJoin(calls)
-      .pipe(map((responses: any) => {
-        // ApiUserResponse
-        this.handleSaveUserResponse(responses);
-      }))
-      // .pipe(this.handleError(false, true));
-
-  }
-
-  public saveNewLine(): any {
-    this.dataPending = true;
-    this.deleteLine(this.user.siteId, this.lineAssociation.linePkid, encodeURIComponent(this.user.token))
-      .subscribe(() => {
-        const URL = API.PERSIST_USER_CACHE.replace(':siteId', String(this.siteId)).replace(':token', this.user.token);
-        this.apiService.post(URL, {}, )
-          .subscribe(() => {
-            this.fetchUserToken(this.siteId, this.user.userid, false, true)
-              .subscribe(() => {
-                this.runNewLineCreation();
-              });
-          });
-      });
-  }
-
-  public runNewLineCreation(): void {
-    // CREATE NEW LINE
-    const newLineBody = SortingUtilsService.diff(
-      this.lineService.generateLineAssociationFromLine(null),
-      this.lineService.generateLineAssociationFromLine(this.lineAssociation),
-      'device.lineAssociations', null
-    );
-    this.associateLineToUserDevice(
-      this.user.siteId,
-      this.user.devices[0].name,
-      newLineBody,
-      null,
-      this.lineAssociation.callingSearchSpace
-    ).subscribe((response: any) => {
-      if (response && response.currentUpdatedUser) {
-        const linePkId = this.getLinePkIdFromUser(response?.currentUpdatedUser, 0);
-        forkJoin([
-          this.updateLineFields(this.siteId, linePkId, this.user.token, this.lineAssociation.alertingName),
-          this.updateDeviceFields(this.siteId, this.user.devices[0]?.name, this.user.token)
-        ]).subscribe((response: any) => {
-          this.originUser.devices[0].lineAssociations[0].directoryNumber.directoryNumber = this.lineAssociation.directoryNumber.directoryNumber;
-          this.onUserLineSaved$.next(true);
-        });
-      }
-    })
-    // -----
-  }
-
-  public getLinePkIdFromUser(user: any, index: number): any {
-    if (user.devices && user.devices[index] && user.devices[index].lineAssociations && user.devices[index].lineAssociations[index]) {
-      return user.devices[index].lineAssociations[index].linePkid || user.devices[index].lineAssociations[index].lineLocalId;
-    }
-  }
-
-  public deleteLine(siteId: number, pkid: string, token: string) {
-    return this.apiService.delete(API.DELETE_LINE.replace(':siteId', String(siteId)).replace(':pkid', pkid).replace(':token', encodeURIComponent(token)), {})
-    // .pipe(this.handleError(true, false));
-  }
-
-  public disassociateLine(siteId: number, linePkid: string, token: string, deviceName: string) {
-    return this.apiService.delete(
-      API.DISASSOCIATE_LINE.replace(':siteId', String(siteId))
-        .replace(':linePkid', linePkid)
-        .replace(':deviceName', deviceName)
-        .replace(':token', encodeURIComponent(token)), {})
-    // .pipe(this.handleError(true, false));
-  }
-
-  public updateLineFields(siteId: number, pkid: string, token: string, alertingName: any) {
-    const body = ['line.description=', `line.alertingName=${alertingName}`];
-    return this.apiService.post(API.UPDATE_LINE_FIELDS.replace(':siteId', String(siteId)).replace(':pkid', encodeURIComponent(pkid)).replace(':token', encodeURIComponent(token)), body)
-    // .pipe(this.handleError(true, false));
-  }
-
-  public updateDeviceFields(siteId: number, deviceName: string, token: string) {
-    const body = ['device.associatedDNs.0=null'];
-    return this.apiService.post(API.UPDATE_DEVICE_FIELDS.replace(':siteId', String(siteId)).replace(':deviceName', deviceName).replace(':token', encodeURIComponent(token)), body)
-    // .pipe(this.handleError(true, false));
-  }
-  public checkDestinationNumber(siteId: string, directoryNumber: string, routePartitionName: string) {
-    const params = {
-      dntype: 'EXTENSION'
-    };
-    const body = {
-      directoryNumber: directoryNumber,
-      routePartitionName: routePartitionName
-    };
-    return this.apiService.post(API.CHECK_DESTINATION_NUMBER.replace(':siteId', siteId), body, params);
-  }
-
-  public associateLineToUserDevice(siteId: number, deviceName: string, body: any, pkid: any, css: any) {
-    let params = {};
-    if (pkid) {
-      params = {linePkid: pkid};
-    }
-    if (css) {
-      // @ts-ignore
-      params['css'] = css;
-    }
-    return this.apiService.post(API.ASSOCIATE_LINE.replace(':siteId', String(siteId)).replace(':deviceName', deviceName)
-      .replace(':token', encodeURIComponent(this.user.token)), body, params)
-    // .pipe(this.handleError(true, true));
-  }
-
-  public hasUnsavedChanges() {
-    if (this.user && this.originUser) {
-      return !this.user.equal(this.originUser);
-    }
-    return false;
-  }
-
-  public setSimplifiedUser(user: any, isLdap?: boolean): void {
-    // isLdap TEMP because of token response issue
-    this.user = new SimplifiedUser(user, isLdap);
-    const copiedUser = JSON.parse(JSON.stringify(user));
-    this.originUser = new SimplifiedUser(copiedUser, isLdap);
-  }
-
-  private handleSaveUserResponse(responses: any) {
-    if (!responses?.length) {
-      return;
-    }
-    for (let len = responses.length, i = len - 1; i >= 0; i--) {
-      if (responses[i] && responses[i].currentUpdatedUser) {
-        // this.setUser(responses[i].currentUpdatedUser, false, this.user.token);
-        this.user.hasModifiedCache = true;
-        return;
-      }
-    }
-  }
-}
+import {Injectable, OnInit} from '@angular/core';
+import { of, forkJoin, Subject } from 'rxjs';
+import { SimplifiedUser } from '../classes/simplified-user';
+import { API } from '../app.constants';
+import { APIService } from './api.service';
+import { map } from 'rxjs/operators';
+import { UtilsService } from './utils.service';
+import { LineAssociation } from '../classes/line-association';
+import { LineAssociationInterface } from '../classes/line-association-interface';
+import { LineService } from './line.service';
+import { SortingUtilsService } from './sorting-utils.service';
+
+@Injectable()
+export class UserService implements OnInit{
+  siteId: number = -1;
+  userId: string = '';
+  dataPending = false;
+  userIdExistPending = false;
+  hasExistedUserId = false;
+  user!: SimplifiedUser;
+  originUser!: SimplifiedUser;
+  onUserLineSaved$ = new Subject<any>();
+
+  get lineAssociation(): LineAssociation | LineAssociationInterface {
+    return this.user && this.originUser.devices && this.user.devices[0] && this.user.devices[0].lineAssociations && this.user.devices[0].lineAssociations[0];
+  }
+
+  get originLineAssociation(): LineAssociation | LineAssociationInterface {
+    return this.originUser && this.originUser.devices && this.originUser.devices[0] && this.originUser.devices[0].lineAssociations && this.originUser.devices[0].lineAssociations[0];
+  }
+
+  constructor(
+    private apiService: APIService,
+    private lineService: LineService
+  ) {
+
+  }
+
+  ngOnInit(): void {
+    console.log(this.siteId)
+  }
+
+  public fetchUserToken(siteId: number, userId: string, isLdap?: boolean, isSetNewTokenOnly?: boolean): any {
+    // isLdap TEMP because of token response issue
+    this.siteId = siteId;
+    this.userId = userId;
+    return this.apiService.fetch(API.USER_TOKEN.replace(':siteId', String(this.siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(userId))))
+      .pipe(map((result: any) => {
+        const user = result && Object.values(result)[0];
+        const token = Object.keys(result)[0];
+        if (user) {
+          if (!isSetNewTokenOnly) {
+            this.setSimplifiedUser(user);
+            this.user.token = user.token ;
+          }
+          this.user.token = user.token || token;
+          this.originUser.token = user.token || token;
+        }
+      }))
+    // .pipe(this.handleError(false, true));
+  }
+
+  public updateUserFields(body: any): any {
+    if (!this.siteId ) {
+      return;
+    }
+    return this.apiService.post(API.UPDATE_USER_FIELDS.replace(':siteId', String(this.siteId)).replace(':token', this.user.token), body)
+      // .pipe(this.handleError(false, true));
+  }
+
+  public fetchUserById(id: string) {
+    this.userIdExistPending = true;
+    return this.apiService.fetch(API.USER_BY_ID.replace(':siteId', String(this.siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(id))))
+      .pipe(map(result => {
+        this.userIdExistPending = false;
+        return result;
+      }));
+  }
+
+  public persistCacheChanges() {
+    /*const params = {
+      excludeDeviceExtraOptions: true
+    };*/
+    return this.processUserChangesToCache()
+      .pipe(map((result: any) => {
+        return this.apiService.post(API.PERSIST_USER_CACHE.replace(':siteId', String(this.siteId)).replace(':token', this.user.token), {})
+          .subscribe(() => {
+
+          })
+          // .pipe(map((user) => {
+          //   // this.setUser(user, false, this.user.token);
+          //   this.user.hasModifiedCache = false;
+          // }))
+          // .pipe(this.handleError(true, true));
+      }));
+  }
+
+  public processUserChangesToCache(): any {
+    const calls = [];
+    const body = UtilsService.diff(this.originUser.getUserDetailsSavableData(), this.user.getUserDetailsSavableData(), 'user');
+    if (body?.length) {
+      calls.push(this.updateUserFields(body));
+    }
+    if (!calls?.length) {
+      return of(this.user);
+    }
+
+    return forkJoin(calls)
+      .pipe(map((responses: any) => {
+        // ApiUserResponse
+        this.handleSaveUserResponse(responses);
+      }))
+      // .pipe(this.handleError(false, true));
+
+  }
+
+  public saveNewLine(): any {
+    this.dataPending = true;
+    this.deleteLine(this.user.siteId, this.lineAssociation.linePkid, encodeURIComponent(this.user.token))
+      .subscribe(() => {
+        const URL = API.PERSIST_USER_CACHE.replace(':siteId', String(this.siteId)).replace(':token', this.user.token);
+        this.apiService.post(URL, {}, )
+          .subscribe(() => {
+            this.fetchUserToken(this.siteId, this.user.userid, false, true)
+              .subscribe(() => {
+                this.runNewLineCreation();
+              });
+          });
+      });
+  }
+
+  public runNewLineCreation(): void {
+    // CREATE NEW LINE
+    const newLineBody = SortingUtilsService.diff(
+      this.lineService.generateLineAssociationFromLine(null),
+      this.lineService.generateLineAssociationFromLine(this.lineAssociation),
+      'device.lineAssociations', null
+    );
+    this.associateLineToUserDevice(
+      this.user.siteId,
+      this.user.devices[0].name,
+      newLineBody,
+      null,
+      this.lineAssociation.callingSearchSpace
+    ).subscribe((response: any) => {
+      if (response && response.currentUpdatedUser) {
+        const linePkId = this.getLinePkIdFromUser(response?.currentUpdatedUser, 0);
+        forkJoin([
+          this.updateLineFields(this.siteId, linePkId, this.user.token, this.lineAssociation.alertingName),
+          this.updateDeviceFields(this.siteId, this.user.devices[0]?.name, this.user.token)
+        ]).subscribe((response: any) => {
+          this.originUser.devices[0].lineAssociations[0].directoryNumber.directoryNumber = this.lineAssociation.directoryNumber.directoryNumber;
+          this.onUserLineSaved$.next(true);
+        });
+      }
+    })
+    // -----
+  }
+
+  public getLinePkIdFromUser(user: any, index: number): any {
+    if (user.devices && user.devices[index] && user.devices[index].lineAssociations && user.devices[index].lineAssociations[index]) {
+      return user.devices[index].lineAssociations[index].linePkid || user.devices[index].lineAssociations[index].lineLocalId;
+    }
+  }
+
+  public deleteLine(siteId: number, pkid: string, token: string) {
+    return this.apiService.delete(API.DELETE_LINE.replace(':siteId', String(siteId)).replace(':pkid', pkid).replace(':token', encodeURIComponent(token)), {})
+    // .pipe(this.handleError(true, false));
+  }
+
+  public disassociateLine(siteId: number, linePkid: string, token: string, deviceName: string) {
+    return this.apiService.delete(
+      API.DISASSOCIATE_LINE.replace(':siteId', String(siteId))
+        .replace(':linePkid', linePkid)
+        .replace(':deviceName', deviceName)
+        .replace(':token', encodeURIComponent(token)), {})
+    // .pipe(this.handleError(true, false));
+  }
+
+  public updateLineFields(siteId: number, pkid: string, token: string, alertingName: any) {
+    const body = ['line.description=', `line.alertingName=${alertingName}`];
+    return this.apiService.post(API.UPDATE_LINE_FIELDS.replace(':siteId', String(siteId)).replace(':pkid', encodeURIComponent(pkid)).replace(':token', encodeURIComponent(token)), body)
+    // .pipe(this.handleError(true, false));
+  }
+
+  public updateDeviceFields(siteId: number, deviceName: string, token: string) {
+    const body = ['device.associatedDNs.0=null'];
+    return this.apiService.post(API.UPDATE_DEVICE_FIELDS.replace(':siteId', String(siteId)).replace(':deviceName', deviceName).replace(':token', encodeURIComponent(token)), body)
+    // .pipe(this.handleError(true, false));
+  }
+  public checkDestinationNumber(siteId: string, directoryNumber: string, routePartitionName: string) {
+    const params = {
+      dntype: 'EXTENSION'
+    };
+    const body = {
+      directoryNumber: directoryNumber,
+      routePartitionName: routePartitionName
+    };
+    return this.apiService.post(API.CHECK_DESTINATION_NUMBER.replace(':siteId', siteId), body, params);
+  }
+
+  public associateLineToUserDevice(siteId: number, deviceName: string, body: any, pkid: any, css: any) {
+    let params = {};
+    if (pkid) {
+      params = {linePkid: pkid};
+    }
+    if (css) {
+      // @ts-ignore
+      params['css'] = css;
+    }
+    return this.apiService.post(API.ASSOCIATE_LINE.replace(':siteId', String(siteId)).replace(':deviceName', deviceName)
+      .replace(':token', encodeURIComponent(this.user.token)), body, params)
+    // .pipe(this.handleError(true, true));
+  }
+
+  public hasUnsavedChanges() {
+    if (this.user && this.originUser) {
+      return !this.user.equal(this.originUser);
+    }
+    return false;
+  }
+
+  public setSimplifiedUser(user: any, isLdap?: boolean): void {
+    // isLdap TEMP because of token response issue
+    this.user = new SimplifiedUser(user, isLdap);
+    const copiedUser = JSON.parse(JSON.stringify(user));
+    this.originUser = new SimplifiedUser(copiedUser, isLdap);
+  }
+
+  private handleSaveUserResponse(responses: any) {
+    if (!responses?.length) {
+      return;
+    }
+    for (let len = responses.length, i = len - 1; i >= 0; i--) {
+      if (responses[i] && responses[i].currentUpdatedUser) {
+        // this.setUser(responses[i].currentUpdatedUser, false, this.user.token);
+        this.user.hasModifiedCache = true;
+        return;
+      }
+    }
+  }
+}

package/projects/tuki/widgets/user-manage/src/services/users-search.service.ts

@@ -1,59 +1,59 @@
-import { Injectable, OnInit } from '@angular/core';
-import { SimplifiedUser } from '../classes/simplified-user';
-import { APIService } from './api.service';
-import { ListUser, ListUserInterface } from '../classes/user-list';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { API, PAGINATION_DEFAULTS, PAGINATION_SIZE_OPTIONS } from '../app.constants';
-import { TableDataInterface } from '../classes/table-data';
-import { map } from 'rxjs/operators';
-import { RemoveKynFromIBMService } from '../removeKynFromIBM.service';
-import { PaginationDataDto } from '../classes/pagination';
-
-
-
-@Injectable()
-export class UsersSearchService  {
-  siteId: number = -1;
-  userId: string = '';
-  customerId!: number;
-  userIdExistPending = false;
-  hasExistedUserId = false;
-  pageSize = PAGINATION_DEFAULTS.SIZE;
-  pageIndex = PAGINATION_DEFAULTS.SIZE;
-  pageSizeOptions = PAGINATION_SIZE_OPTIONS;
-  total!: number;
-  searchParams!: any;
-  foundUsers$!: any;
-
-  constructor(
-    private apiService: APIService,
-    private removeKynFromIBMService: RemoveKynFromIBMService
-  ) {
-    this.foundUsers$ = new BehaviorSubject(null);
-
-  }
-
-  public getPagination(): PaginationDataDto {
-    return {
-      total: this.total,
-      pageSizeOptions: this.pageSizeOptions,
-      pageSize: this.pageSize,
-      pageIndex: this.pageIndex
-    };
-  }
-
-  public quickRegularUsersSearch() {
-    this.searchParams = this.searchParams || {customerid: this.customerId};
-    this.searchParams['provisionType'] = 'CUCM';
-    return this.apiService.fetchPagination(API.QUICK_USERS_SEARCH, this.pageSize, this.pageIndex, this.searchParams)
-      .pipe(map((res: TableDataInterface) => {
-        this.total = res.total;
-        // this.totals = this.totals || {};
-        // this.totals['users'] = res.total;
-        const users = res.pageData && res.pageData.length ? res.pageData.map(user => new ListUser(user)) : [];
-        // this.foundUsers$.next(this.removeKynFromIBMService.removeCUCMS(users, this.customerId));
-        this.foundUsers$.next(users);
-      }));
-      // .pipe(this.handleError(true));
-  }
-}
+import { Injectable, OnInit } from '@angular/core';
+import { SimplifiedUser } from '../classes/simplified-user';
+import { APIService } from './api.service';
+import { ListUser, ListUserInterface } from '../classes/user-list';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { API, PAGINATION_DEFAULTS, PAGINATION_SIZE_OPTIONS } from '../app.constants';
+import { TableDataInterface } from '../classes/table-data';
+import { map } from 'rxjs/operators';
+import { RemoveKynFromIBMService } from '../removeKynFromIBM.service';
+import { PaginationDataDto } from '../classes/pagination';
+
+
+
+@Injectable()
+export class UsersSearchService  {
+  siteId: number = -1;
+  userId: string = '';
+  customerId!: number;
+  userIdExistPending = false;
+  hasExistedUserId = false;
+  pageSize = PAGINATION_DEFAULTS.SIZE;
+  pageIndex = PAGINATION_DEFAULTS.SIZE;
+  pageSizeOptions = PAGINATION_SIZE_OPTIONS;
+  total!: number;
+  searchParams!: any;
+  foundUsers$!: any;
+
+  constructor(
+    private apiService: APIService,
+    private removeKynFromIBMService: RemoveKynFromIBMService
+  ) {
+    this.foundUsers$ = new BehaviorSubject(null);
+
+  }
+
+  public getPagination(): PaginationDataDto {
+    return {
+      total: this.total,
+      pageSizeOptions: this.pageSizeOptions,
+      pageSize: this.pageSize,
+      pageIndex: this.pageIndex
+    };
+  }
+
+  public quickRegularUsersSearch() {
+    this.searchParams = this.searchParams || {customerid: this.customerId};
+    this.searchParams['provisionType'] = 'CUCM';
+    return this.apiService.fetchPagination(API.QUICK_USERS_SEARCH, this.pageSize, this.pageIndex, this.searchParams)
+      .pipe(map((res: TableDataInterface) => {
+        this.total = res.total;
+        // this.totals = this.totals || {};
+        // this.totals['users'] = res.total;
+        const users = res.pageData && res.pageData.length ? res.pageData.map(user => new ListUser(user)) : [];
+        // this.foundUsers$.next(this.removeKynFromIBMService.removeCUCMS(users, this.customerId));
+        this.foundUsers$.next(users);
+      }));
+      // .pipe(this.handleError(true));
+  }
+}