@tuki-io/tuki-widgets 0.0.72 → 0.0.74

package/{user-device-manage → projects/tuki/widgets/user-device-manage}/src/services/device.service.ts

@@ -1,95 +1,95 @@
-import { Injectable, OnInit } from '@angular/core';
-import { APIService } from './api.service';
-import { Observable, of, throwError } from 'rxjs';
-import { API } from '../app.constants';
-import { map } from 'rxjs/operators';
-import { SortingUtilsService } from './sorting-utils.service';
-import { Buttontemplate, Device } from '../classes/device';
-import { LineAssociationInterface } from '../classes/line-association-interface';
-
-@Injectable()
-export class DeviceService {
-  availableSlots!: number[];
-  lineSlotsList!: any;
-  availableLineSlotsList!: any;
-  dataPending = false;
-
-  constructor(
-    private apiService: APIService,
-  ) {
-  }
-
-  public hasUnsavedChanges(device: Device, originDevice: Device): boolean {
-    if (device?.lineAssociationsHasChanges) {
-      return true;
-    }
-    if (device && originDevice) {
-      return JSON.stringify(device.getSavableData()) !== JSON.stringify(originDevice.getSavableData());
-    }
-    return false;
-  }
-
-  public hasDeviceInfoUnsavedChanges(device: Device, originDevice: Device): boolean {
-    if (device && originDevice) {
-      return JSON.stringify(device.getDeviceInfoSavableData()) !== JSON.stringify(originDevice.getDeviceInfoSavableData());
-    }
-    return false;
-  }
-
-  public getDataToUpdateDevice(device: Device, originalDevice: Device) {
-    // --- to exclude newLines from update
-    // const devToUpdate = new Device(device, this.validationService);
-    // const originalDevToUpdate = new Device(originalDevice, this.validationService);
-    // // @ts-ignore
-    // devToUpdate.lineAssociations = devToUpdate.lineAssociations?.filter(line => line.linePkid);
-    // // @ts-ignore
-    // originalDevToUpdate.lineAssociations = originalDevToUpdate.lineAssociations?.filter(line => line.linePkid);
-
-    const body = SortingUtilsService.diff(originalDevice.getDeviceInfoSavableData(), device.getDeviceInfoSavableData(), 'device',
-      ['speedDials', 'busyLampFields']);
-    return body;
-  }
-
-  public fetchLeanUserDevicesConversationById(userId: string, siteId: number) {
-    return this.apiService.fetch(API.LEAN_USER_DEVICES_CONVERSATION_START.replace(':siteId', String(siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(userId))));
-  }
-
-  public getSlotsByButtonTemplate(siteId: number, buttonTemplateName: string): Observable<Buttontemplate> {
-    return this.apiService.fetch(API.LINE_SLOTS.replace(':siteId', String(siteId)), {name: buttonTemplateName}, true)
-      // .pipe(this.handleError(true, true));
-  }
-
-  public putDeviceFields(siteId: number, deviceName: string, token: string, body: any) {
-    console.log('userToken = ', token);
-    const URL = API.UPDATE_DEVICE_FIELDS
-      .replace(':siteId', String(siteId))
-      .replace(':deviceName', deviceName)
-      .replace(':token', token);
-    console.log('url = ', URL);
-    return this.apiService.post(URL, body)
-      // .pipe(this.handleError(true, true));
-  }
-
-  public updateAvailableSlots(siteId: number, device: Device): any {
-    if (!device) {
-      throw throwError(() => new Error('test'));
-    }
-    if (!device.buttonTemplate) {
-      throw throwError(() => new Error('test'));
-    }
-    if (device.buttonTemplate === '') {
-      device.availableSlots = [];
-      return of(device);
-    }
-    const existingPositions = device.lineAssociations.map((lineAssociation: LineAssociationInterface) => lineAssociation.position);
-    return this.getSlotsByButtonTemplate(siteId, device.buttonTemplate)
-      .pipe(map((buttonTemplate: Buttontemplate) => {
-        this.lineSlotsList = buttonTemplate.lineSlots;
-        device.availableSlots = this.lineSlotsList.filter((position: number) => !existingPositions.includes(position));
-        this.availableLineSlotsList = device.availableSlots.slice();
-        return device;
-      }))
-      // .pipe(this.handleError(true, true));
-  }
-
-}
+import { Injectable, OnInit } from '@angular/core';
+import { APIService } from './api.service';
+import { Observable, of, throwError } from 'rxjs';
+import { API } from '../app.constants';
+import { map } from 'rxjs/operators';
+import { SortingUtilsService } from './sorting-utils.service';
+import { Buttontemplate, Device } from '../classes/device';
+import { LineAssociationInterface } from '../classes/line-association-interface';
+
+@Injectable()
+export class DeviceService {
+  availableSlots!: number[];
+  lineSlotsList!: any;
+  availableLineSlotsList!: any;
+  dataPending = false;
+
+  constructor(
+    private apiService: APIService,
+  ) {
+  }
+
+  public hasUnsavedChanges(device: Device, originDevice: Device): boolean {
+    if (device?.lineAssociationsHasChanges) {
+      return true;
+    }
+    if (device && originDevice) {
+      return JSON.stringify(device.getSavableData()) !== JSON.stringify(originDevice.getSavableData());
+    }
+    return false;
+  }
+
+  public hasDeviceInfoUnsavedChanges(device: Device, originDevice: Device): boolean {
+    if (device && originDevice) {
+      return JSON.stringify(device.getDeviceInfoSavableData()) !== JSON.stringify(originDevice.getDeviceInfoSavableData());
+    }
+    return false;
+  }
+
+  public getDataToUpdateDevice(device: Device, originalDevice: Device) {
+    // --- to exclude newLines from update
+    // const devToUpdate = new Device(device, this.validationService);
+    // const originalDevToUpdate = new Device(originalDevice, this.validationService);
+    // // @ts-ignore
+    // devToUpdate.lineAssociations = devToUpdate.lineAssociations?.filter(line => line.linePkid);
+    // // @ts-ignore
+    // originalDevToUpdate.lineAssociations = originalDevToUpdate.lineAssociations?.filter(line => line.linePkid);
+
+    const body = SortingUtilsService.diff(originalDevice.getDeviceInfoSavableData(), device.getDeviceInfoSavableData(), 'device',
+      ['speedDials', 'busyLampFields']);
+    return body;
+  }
+
+  public fetchLeanUserDevicesConversationById(userId: string, siteId: number) {
+    return this.apiService.fetch(API.LEAN_USER_DEVICES_CONVERSATION_START.replace(':siteId', String(siteId)).replace(':userId', encodeURIComponent(encodeURIComponent(userId))));
+  }
+
+  public getSlotsByButtonTemplate(siteId: number, buttonTemplateName: string): Observable<Buttontemplate> {
+    return this.apiService.fetch(API.LINE_SLOTS.replace(':siteId', String(siteId)), {name: buttonTemplateName}, true)
+      // .pipe(this.handleError(true, true));
+  }
+
+  public putDeviceFields(siteId: number, deviceName: string, token: string, body: any) {
+    console.log('userToken = ', token);
+    const URL = API.UPDATE_DEVICE_FIELDS
+      .replace(':siteId', String(siteId))
+      .replace(':deviceName', deviceName)
+      .replace(':token', token);
+    console.log('url = ', URL);
+    return this.apiService.post(URL, body)
+      // .pipe(this.handleError(true, true));
+  }
+
+  public updateAvailableSlots(siteId: number, device: Device): any {
+    if (!device) {
+      throw throwError(() => new Error('test'));
+    }
+    if (!device.buttonTemplate) {
+      throw throwError(() => new Error('test'));
+    }
+    if (device.buttonTemplate === '') {
+      device.availableSlots = [];
+      return of(device);
+    }
+    const existingPositions = device.lineAssociations.map((lineAssociation: LineAssociationInterface) => lineAssociation.position);
+    return this.getSlotsByButtonTemplate(siteId, device.buttonTemplate)
+      .pipe(map((buttonTemplate: Buttontemplate) => {
+        this.lineSlotsList = buttonTemplate.lineSlots;
+        device.availableSlots = this.lineSlotsList.filter((position: number) => !existingPositions.includes(position));
+        this.availableLineSlotsList = device.availableSlots.slice();
+        return device;
+      }))
+      // .pipe(this.handleError(true, true));
+  }
+
+}

package/{user-device-manage → projects/tuki/widgets/user-device-manage}/src/services/dns.service.ts

@@ -1,111 +1,111 @@
-import { Injectable } from '@angular/core';
-import { API } from '../app.constants';
-import { APIService } from './api.service';
-import { map } from 'rxjs/operators';
-import { AvailablePhoneNumberRangeInterface, DnRangeType } from './../classes/line';
-import * as Big from 'big.js';
-import { Observable } from 'rxjs';
-
-
-@Injectable()
-export class DnsService {
-  availableNumbers = {};
-  availableDidPatternsMappedToDn!: any;
-
-  constructor(
-    private apiService: APIService
-  ) {
-
-  }
-  public getNumberRange(siteId: string, routePartition: string, withdids?: boolean, from?: string, pageSize?: number): any {
-    // @ts-ignore
-    if (this.availableNumbers[routePartition]?.length) {
-      return new Observable<any>(observer => {
-        // @ts-ignore
-        observer.next(this.availableNumbers[routePartition]);
-      });
-    }
-
-    this.availableDidPatternsMappedToDn = {};
-    pageSize = pageSize ? pageSize : 20;
-    const params = {dntype: DnRangeType.extension, routepartition: routePartition, size: pageSize, page: 0};
-    if (withdids) {
-      // @ts-ignore
-      params['withdids'] = 'true';
-    }
-    if (from) {
-      // @ts-ignore
-      params['from'] = from;
-    }
-    // @ts-ignore
-    this.availableNumbers[routePartition] = this.availableNumbers[routePartition] || [];
-
-    return this.apiService.fetch(API.AVAILABLE_DN_IN_RANGES.replace(':siteId', siteId), params)
-      .pipe(map((res: any) => {
-          res.availableNumberList.forEach((availableNumber: AvailablePhoneNumberRangeInterface) => {
-            this.setAvailableDidMappedToDn(availableNumber);
-            // @ts-ignore
-            this.availableNumbers[routePartition] = [...this.availableNumbers[routePartition], ...this.getUnwrapNumberRange(availableNumber)];
-          });
-        })
-      )
-      // .pipe(this.handleError(true, false));
-  }
-
-  public setAvailableDidMappedToDn(availableNumber: any): void {
-    if (availableNumber.unUsedNumbersWithDids && availableNumber.unUsedNumbersWithDids.length) {
-
-      availableNumber.unUsedNumbersWithDids.forEach((numberWithDids: any) => {
-        const dn = numberWithDids['unUsedNumber'];
-        this.availableDidPatternsMappedToDn[dn] = [{}];
-        if (numberWithDids['translationPatternList'] && numberWithDids['translationPatternList'].length > 0) {
-          this.availableDidPatternsMappedToDn[dn] = numberWithDids['translationPatternList'];
-          this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] = [{}];
-          if (numberWithDids['mappedDids'] && numberWithDids['mappedDids'].length > 0) {
-            this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] = numberWithDids['mappedDids'];
-          }
-        }
-        this.availableDidPatternsMappedToDn[dn][0]['vm'] = numberWithDids['vm'];
-      });
-    }
-  }
-
-  public getUnwrapNumberRange(availableNumber: any): string[] {
-    let unwrapNumberRange = this.unwrapNumberRange(availableNumber.phoneNumberRange.from, availableNumber.phoneNumberRange.to)
-      .map((unwrappedNumber: string) => {
-        const dn = availableNumber.phoneNumberRange.prefix + unwrappedNumber;
-        let str = dn;
-        if (this.availableDidPatternsMappedToDn[dn] && this.availableDidPatternsMappedToDn[dn].length > 0) {
-          if (this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] && this.availableDidPatternsMappedToDn[dn][0]['mappedDids'].length > 0) {
-            str += '        DID:  ' + (this.availableDidPatternsMappedToDn[dn][0]['mappedDids'].length > 1 ? 'multiple' :
-              this.availableDidPatternsMappedToDn[dn][0]['mappedDids'][0]);
-          }
-          if (this.availableDidPatternsMappedToDn[dn][0]['vm']) {
-            str += '        In Use - VM';
-          }
-        }
-        return str;
-      });
-    unwrapNumberRange = unwrapNumberRange.filter((unwrappedNumber: string) => !availableNumber.usedNumbers.includes(unwrappedNumber));
-    return unwrapNumberRange;
-  }
-
-  public unwrapNumberRange(start: string, end: string): string[] {
-    const regExp = /(^0+)/;
-    let leadingZeros = '';
-    const matches = start.match(regExp);
-    if (matches) {
-      leadingZeros = matches[1];
-    }
-    const startNumeric = new Big(start);
-    const endNumeric = new Big(end);
-    // @ts-ignore
-    return Array.from({length: (endNumeric.minus(startNumeric).plus(new Big(1)).toFixed(0))}, (v, k) => {
-      const number = String(startNumeric.plus(new Big(k)).toFixed(0));
-      if ((leadingZeros + number).length > start.length) {
-        leadingZeros = leadingZeros.substr(1);
-      }
-      return leadingZeros + number;
-    });
-  }
-}
+import { Injectable } from '@angular/core';
+import { API } from '../app.constants';
+import { APIService } from './api.service';
+import { map } from 'rxjs/operators';
+import { AvailablePhoneNumberRangeInterface, DnRangeType } from './../classes/line';
+import * as Big from 'big.js';
+import { Observable } from 'rxjs';
+
+
+@Injectable()
+export class DnsService {
+  availableNumbers = {};
+  availableDidPatternsMappedToDn!: any;
+
+  constructor(
+    private apiService: APIService
+  ) {
+
+  }
+  public getNumberRange(siteId: string, routePartition: string, withdids?: boolean, from?: string, pageSize?: number): any {
+    // @ts-ignore
+    if (this.availableNumbers[routePartition]?.length) {
+      return new Observable<any>(observer => {
+        // @ts-ignore
+        observer.next(this.availableNumbers[routePartition]);
+      });
+    }
+
+    this.availableDidPatternsMappedToDn = {};
+    pageSize = pageSize ? pageSize : 20;
+    const params = {dntype: DnRangeType.extension, routepartition: routePartition, size: pageSize, page: 0};
+    if (withdids) {
+      // @ts-ignore
+      params['withdids'] = 'true';
+    }
+    if (from) {
+      // @ts-ignore
+      params['from'] = from;
+    }
+    // @ts-ignore
+    this.availableNumbers[routePartition] = this.availableNumbers[routePartition] || [];
+
+    return this.apiService.fetch(API.AVAILABLE_DN_IN_RANGES.replace(':siteId', siteId), params)
+      .pipe(map((res: any) => {
+          res.availableNumberList.forEach((availableNumber: AvailablePhoneNumberRangeInterface) => {
+            this.setAvailableDidMappedToDn(availableNumber);
+            // @ts-ignore
+            this.availableNumbers[routePartition] = [...this.availableNumbers[routePartition], ...this.getUnwrapNumberRange(availableNumber)];
+          });
+        })
+      )
+      // .pipe(this.handleError(true, false));
+  }
+
+  public setAvailableDidMappedToDn(availableNumber: any): void {
+    if (availableNumber.unUsedNumbersWithDids && availableNumber.unUsedNumbersWithDids.length) {
+
+      availableNumber.unUsedNumbersWithDids.forEach((numberWithDids: any) => {
+        const dn = numberWithDids['unUsedNumber'];
+        this.availableDidPatternsMappedToDn[dn] = [{}];
+        if (numberWithDids['translationPatternList'] && numberWithDids['translationPatternList'].length > 0) {
+          this.availableDidPatternsMappedToDn[dn] = numberWithDids['translationPatternList'];
+          this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] = [{}];
+          if (numberWithDids['mappedDids'] && numberWithDids['mappedDids'].length > 0) {
+            this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] = numberWithDids['mappedDids'];
+          }
+        }
+        this.availableDidPatternsMappedToDn[dn][0]['vm'] = numberWithDids['vm'];
+      });
+    }
+  }
+
+  public getUnwrapNumberRange(availableNumber: any): string[] {
+    let unwrapNumberRange = this.unwrapNumberRange(availableNumber.phoneNumberRange.from, availableNumber.phoneNumberRange.to)
+      .map((unwrappedNumber: string) => {
+        const dn = availableNumber.phoneNumberRange.prefix + unwrappedNumber;
+        let str = dn;
+        if (this.availableDidPatternsMappedToDn[dn] && this.availableDidPatternsMappedToDn[dn].length > 0) {
+          if (this.availableDidPatternsMappedToDn[dn][0]['mappedDids'] && this.availableDidPatternsMappedToDn[dn][0]['mappedDids'].length > 0) {
+            str += '        DID:  ' + (this.availableDidPatternsMappedToDn[dn][0]['mappedDids'].length > 1 ? 'multiple' :
+              this.availableDidPatternsMappedToDn[dn][0]['mappedDids'][0]);
+          }
+          if (this.availableDidPatternsMappedToDn[dn][0]['vm']) {
+            str += '        In Use - VM';
+          }
+        }
+        return str;
+      });
+    unwrapNumberRange = unwrapNumberRange.filter((unwrappedNumber: string) => !availableNumber.usedNumbers.includes(unwrappedNumber));
+    return unwrapNumberRange;
+  }
+
+  public unwrapNumberRange(start: string, end: string): string[] {
+    const regExp = /(^0+)/;
+    let leadingZeros = '';
+    const matches = start.match(regExp);
+    if (matches) {
+      leadingZeros = matches[1];
+    }
+    const startNumeric = new Big(start);
+    const endNumeric = new Big(end);
+    // @ts-ignore
+    return Array.from({length: (endNumeric.minus(startNumeric).plus(new Big(1)).toFixed(0))}, (v, k) => {
+      const number = String(startNumeric.plus(new Big(k)).toFixed(0));
+      if ((leadingZeros + number).length > start.length) {
+        leadingZeros = leadingZeros.substr(1);
+      }
+      return leadingZeros + number;
+    });
+  }
+}

package/{user-device-manage → projects/tuki/widgets/user-device-manage}/src/services/line.service.ts

@@ -1,89 +1,89 @@
-import { Injectable } from '@angular/core';
-import { APIService } from './api.service';
-import { LineAssociation } from './../classes/line-association';
-import { API } from '../app.constants';
-import { SortingUtilsService } from './sorting-utils.service';
-import { Subject } from 'rxjs';
-import { LineAssociationInterface } from './../classes/line-association-interface';
-
-@Injectable()
-export class LineService {
-  line!: LineAssociation;
-  originLine!: LineAssociation;
-  currentActiveLinePkid!: string | null;
-  onSaveLineAssociationEvent = new Subject();
-
-  constructor(
-    private apiService: APIService
-  ) {
-
-  }
-  public generateLineAssociationFromLine(lineAssociation?: any) {
-   return {
-     directoryNumber: lineAssociation ? this.generateLineDirectory(lineAssociation) : null,
-     didPattern: lineAssociation ? this.generateDidPatternForLineAssociation(lineAssociation) : null,
-     mappedDids: lineAssociation ? '' : 'null',
-     index: lineAssociation ? lineAssociation.index : null,
-     position: lineAssociation ? lineAssociation.position : null,
-     textLabel: lineAssociation ? lineAssociation.textLabel : null,
-     // displayLabel: lineAssociation ? lineAssociation.displayLabel  : 'null',
-     alertingName: lineAssociation ? lineAssociation.alertingName : null,
-     callerNumber: lineAssociation ? '' : 'null'
-   }
-  }
-
-  hasUnsavedChanges(): boolean {
-    if (this.line && this.originLine) {
-      return JSON.stringify(this.line.getSavableData()) !== JSON.stringify(this.originLine.getSavableData())
-    }
-    return false;
-  }
-
-  generateLineDirectory(lineAssociation?: any): any {
-    return {
-      directoryNumber: lineAssociation.directoryNumber.directoryNumber,
-      routePartitionName: lineAssociation.directoryNumber.routePartitionName,
-    }
-  }
-
-  generateDidPatternForLineAssociation(lineAssociation?: any): any {
-    return {
-      calledPartyTransformationMask: lineAssociation.directoryNumber.directoryNumber
-    }
-  }
-
-  public checkLineDeletion(line: LineAssociation, siteId: number): any {
-    const params = {
-      extension: line.directoryNumber.directoryNumber,
-      routePartition: line.directoryNumber.routePartitionName,
-    };
-    return this.apiService.fetch(API.CHECK_DELETE_LINE.replace(':siteId', String(siteId)), params)
-      // .pipe(this.handleError(true, true));
-  }
-
-  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));
-  }
-
-  getLineAssociationBody(originLineAssociation: LineAssociation | LineAssociationInterface, lineAssociation: LineAssociation | LineAssociationInterface) {
-    const body = SortingUtilsService.diff(originLineAssociation.getSavableData(), lineAssociation.getSavableData(),
-      `device.lineAssociations.${lineAssociation.linePkid}`, null);
-    return body;
-  }
-}
+import { Injectable } from '@angular/core';
+import { APIService } from './api.service';
+import { LineAssociation } from './../classes/line-association';
+import { API } from '../app.constants';
+import { SortingUtilsService } from './sorting-utils.service';
+import { Subject } from 'rxjs';
+import { LineAssociationInterface } from './../classes/line-association-interface';
+
+@Injectable()
+export class LineService {
+  line!: LineAssociation;
+  originLine!: LineAssociation;
+  currentActiveLinePkid!: string | null;
+  onSaveLineAssociationEvent = new Subject();
+
+  constructor(
+    private apiService: APIService
+  ) {
+
+  }
+  public generateLineAssociationFromLine(lineAssociation?: any) {
+   return {
+     directoryNumber: lineAssociation ? this.generateLineDirectory(lineAssociation) : null,
+     didPattern: lineAssociation ? this.generateDidPatternForLineAssociation(lineAssociation) : null,
+     mappedDids: lineAssociation ? '' : 'null',
+     index: lineAssociation ? lineAssociation.index : null,
+     position: lineAssociation ? lineAssociation.position : null,
+     textLabel: lineAssociation ? lineAssociation.textLabel : null,
+     // displayLabel: lineAssociation ? lineAssociation.displayLabel  : 'null',
+     alertingName: lineAssociation ? lineAssociation.alertingName : null,
+     callerNumber: lineAssociation ? '' : 'null'
+   }
+  }
+
+  hasUnsavedChanges(): boolean {
+    if (this.line && this.originLine) {
+      return JSON.stringify(this.line.getSavableData()) !== JSON.stringify(this.originLine.getSavableData())
+    }
+    return false;
+  }
+
+  generateLineDirectory(lineAssociation?: any): any {
+    return {
+      directoryNumber: lineAssociation.directoryNumber.directoryNumber,
+      routePartitionName: lineAssociation.directoryNumber.routePartitionName,
+    }
+  }
+
+  generateDidPatternForLineAssociation(lineAssociation?: any): any {
+    return {
+      calledPartyTransformationMask: lineAssociation.directoryNumber.directoryNumber
+    }
+  }
+
+  public checkLineDeletion(line: LineAssociation, siteId: number): any {
+    const params = {
+      extension: line.directoryNumber.directoryNumber,
+      routePartition: line.directoryNumber.routePartitionName,
+    };
+    return this.apiService.fetch(API.CHECK_DELETE_LINE.replace(':siteId', String(siteId)), params)
+      // .pipe(this.handleError(true, true));
+  }
+
+  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));
+  }
+
+  getLineAssociationBody(originLineAssociation: LineAssociation | LineAssociationInterface, lineAssociation: LineAssociation | LineAssociationInterface) {
+    const body = SortingUtilsService.diff(originLineAssociation.getSavableData(), lineAssociation.getSavableData(),
+      `device.lineAssociations.${lineAssociation.linePkid}`, null);
+    return body;
+  }
+}