@tuki-io/tuki-widgets 0.0.219-dev.58 → 0.0.219-dev.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/esm2020/workspaces/src/services/workspaces.service.mjs +40 -16
  2. package/fesm2015/tuki-io-tuki-widgets-workspaces.mjs +29 -11
  3. package/fesm2015/tuki-io-tuki-widgets-workspaces.mjs.map +1 -1
  4. package/fesm2020/tuki-io-tuki-widgets-workspaces.mjs +39 -15
  5. package/fesm2020/tuki-io-tuki-widgets-workspaces.mjs.map +1 -1
  6. package/package.json +1 -1
package/esm2020/workspaces/src/services/workspaces.service.mjs CHANGED
@@ -66,20 +66,43 @@ function mergeDevices(a, b) {
66
66
  webexUUID: b.webexUUID ?? a.webexUUID,
67
67
  };
68
68
  }
69
- function mergeWorkspacesByDeviceName(workspaces) {
70
- const merged = new Map();
71
- for (const workspace of workspaces) {
72
- const key = withoutSep(workspace.device.name);
73
- const existing = merged.get(key);
74
- merged.set(key, existing ? {
75
- ...existing,
76
- ...workspace,
77
- device: mergeDevices(existing.device, workspace.device),
69
+ function toMacKey(value) {
70
+ return value ? withoutSep(value).replace(/[^0-9A-F]/g, '') : '';
71
+ }
72
+ function mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces) {
73
+ const result = [...cucmWorkspaces];
74
+ const cucmIndexByMac = new Map();
75
+ cucmWorkspaces.forEach((workspace, index) => {
76
+ const key = toMacKey(workspace.device.name);
77
+ if (key && !cucmIndexByMac.has(key)) {
78
+ cucmIndexByMac.set(key, index);
79
+ }
80
+ });
81
+ webexWorkspaces.forEach((webexWorkspace, webexIndex) => {
82
+ const matchedMac = (webexItems[webexIndex].workspaceDevices || [])
83
+ .map(workspaceDevice => toMacKey(workspaceDevice.mac))
84
+ .find(key => key && cucmIndexByMac.has(key));
85
+ if (!matchedMac) {
86
+ result.push(webexWorkspace);
87
+ return;
88
+ }
89
+ const cucmIndex = cucmIndexByMac.get(matchedMac);
90
+ cucmIndexByMac.delete(matchedMac);
91
+ const cucmWorkspace = result[cucmIndex];
92
+ result[cucmIndex] = {
93
+ ...cucmWorkspace,
94
+ ...webexWorkspace,
95
+ displayName: cucmWorkspace.displayName,
96
+ device: {
97
+ ...mergeDevices(cucmWorkspace.device, webexWorkspace.device),
98
+ name: cucmWorkspace.device.name,
99
+ newName: cucmWorkspace.device.newName,
100
+ },
78
101
  isHybrid: true,
79
- cucmDeviceName: existing.cucmDeviceName ?? workspace.cucmDeviceName,
80
- } : workspace);
81
- }
82
- return Array.from(merged.values());
102
+ cucmDeviceName: cucmWorkspace.cucmDeviceName,
103
+ };
104
+ });
105
+ return result;
83
106
  }
84
107
  const FETCH_ALL_SIZE = 9999;
85
108
  export class WorkspacesService {
@@ -105,9 +128,10 @@ export class WorkspacesService {
105
128
  return forkJoin([cucm$, webex$]).pipe(map(([cucmResponse, webexResponse]) => {
106
129
  const cucmParsed = parseResponse(cucmResponse);
107
130
  const webexParsed = parseResponse(webexResponse);
131
+ const webexItems = webexParsed?.pageData || [];
108
132
  const cucmWorkspaces = (cucmParsed?.pageData || []).map((item, index) => toWorkspace(item, index, true));
109
- const webexWorkspaces = (webexParsed?.pageData || []).map((item, index) => toWorkspace(item, index, false));
110
- const workspaces = mergeWorkspacesByDeviceName([...cucmWorkspaces, ...webexWorkspaces]);
133
+ const webexWorkspaces = webexItems.map((item, index) => toWorkspace(item, index, false));
134
+ const workspaces = mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces);
111
135
  return {
112
136
  workspaces,
113
137
  total: workspaces.length,
@@ -123,4 +147,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
123
147
  providedIn: 'root'
124
148
  }]
125
149
  }], ctorParameters: function () { return [{ type: i1.APIService }]; } });
126
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspaces.service.js","sourceRoot":"","sources":["../../../../../../../projects/tuki/widgets/workspaces/src/services/workspaces.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\r\nimport { forkJoin, Observable } from 'rxjs';\r\nimport { map } from 'rxjs/operators';\r\nimport { API } from '../app.constants';\r\nimport { APIService } from './api.service';\r\nimport { Workspace, WorkspaceDevice, WorkspaceListItem, WorkspacesPage, WorkspacesResponse, WorkspaceStatus } from '../types/workspace';\r\nimport { withoutSep } from '../utils/workspace-name';\r\n\r\nfunction parseResponse(response: any): any {\r\n  return typeof response === 'string' ? JSON.parse(response) : response;\r\n}\r\n\r\nfunction toStatus(provisioningStatus: string | null): WorkspaceStatus {\r\n  if (!provisioningStatus) {\r\n    return 'unavailable';\r\n  }\r\n  return provisioningStatus.toLowerCase() === 'active' ? 'active' : 'inactive';\r\n}\r\n\r\nfunction toWorkspaceDevices(item: WorkspaceListItem, index: number): WorkspaceDevice[] {\r\n  if (item.workspaceDevices?.length) {\r\n    return item.workspaceDevices.map(workspaceDevice => ({\r\n      id: workspaceDevice.deviceId,\r\n      kind: 'device' as const,\r\n      label: workspaceDevice.model || workspaceDevice.mac,\r\n      model: workspaceDevice.model,\r\n      mac: workspaceDevice.mac,\r\n    }));\r\n  }\r\n\r\n  const device = item.device;\r\n  if (!device) {\r\n    return [];\r\n  }\r\n\r\n  const model = device.deviceType || device.userDeviceType || undefined;\r\n  return [{\r\n    id: device.pkid || device.webexUUID || device.name || `device-${index}`,\r\n    kind: 'device' as const,\r\n    label: model || device.name || 'Unnamed device',\r\n    model,\r\n    mac: /^SEP/i.test(device.name || '') ? device.name.slice(3) : undefined,\r\n  }];\r\n}\r\n\r\nfunction toWorkspace(item: WorkspaceListItem, index: number, isCucm: boolean): Workspace {\r\n  const device = item.device;\r\n  const firstDirectoryNumber = device.associatedDNs?.[0]?.directoryNumber ?? '';\r\n\r\n  return {\r\n    id: device.pkid || item.workspaceDevices?.[0]?.deviceId || device.name || `workspace-${index}`,\r\n    displayName: device.newName || device.name || 'Unnamed device',\r\n    typeLabel: device.userDeviceType || 'No type',\r\n    capacity: null,\r\n    location: item.site?.name || device.siteName || device.location || '',\r\n    siteId: item.site?.id ?? null,\r\n    devices: toWorkspaceDevices(item, index),\r\n    scheduling: 'Not set',\r\n    callingLicense: firstDirectoryNumber,\r\n    provisioningType: 'On-premises',\r\n    status: toStatus(device.provisioningStatus),\r\n    statusLabel: device.provisioningStatus || 'Status unavailable',\r\n    device,\r\n    isHybrid: false,\r\n    cucmDeviceName: isCucm ? (device.name || null) : null,\r\n  };\r\n}\r\n\r\nfunction mergeDevices(a: Workspace['device'], b: Workspace['device']): Workspace['device'] {\r\n  return {\r\n    ...a,\r\n    ...b,\r\n    cucmId: b.cucmId ?? a.cucmId,\r\n    webexUUID: b.webexUUID ?? a.webexUUID,\r\n  };\r\n}\r\n\r\nfunction mergeWorkspacesByDeviceName(workspaces: Workspace[]): Workspace[] {\r\n  const merged = new Map<string, Workspace>();\r\n\r\n  for (const workspace of workspaces) {\r\n    const key = withoutSep(workspace.device.name);\r\n    const existing = merged.get(key);\r\n    merged.set(key, existing ? {\r\n      ...existing,\r\n      ...workspace,\r\n      device: mergeDevices(existing.device, workspace.device),\r\n      isHybrid: true,\r\n      cucmDeviceName: existing.cucmDeviceName ?? workspace.cucmDeviceName,\r\n    } : workspace);\r\n  }\r\n\r\n  return Array.from(merged.values());\r\n}\r\n\r\nconst FETCH_ALL_SIZE = 9999;\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class WorkspacesService {\r\n  constructor(private apiService: APIService) { }\r\n\r\n  fetchWorkspaces(customerId: string | number): Observable<WorkspacesPage> {\r\n    const baseParams: Record<string, string> = {\r\n      type: 'ORPHAN_DEVICE',\r\n      customerid: customerId.toString(),\r\n      size: FETCH_ALL_SIZE.toString(),\r\n      page: '0',\r\n    };\r\n\r\n    const cucm$ = this.apiService.fetch(API.WORKSPACES.GET_ALL, {\r\n      ...baseParams,\r\n      'device-name': 'SEP',\r\n      provisionType: 'CUCM',\r\n    });\r\n\r\n    const webex$ = this.apiService.fetch(API.WORKSPACES.GET_ALL, {\r\n      ...baseParams,\r\n      provisionType: 'WEBEX',\r\n    });\r\n\r\n    return forkJoin([cucm$, webex$]).pipe(\r\n      map(([cucmResponse, webexResponse]) => {\r\n        const cucmParsed = parseResponse(cucmResponse) as WorkspacesResponse;\r\n        const webexParsed = parseResponse(webexResponse) as WorkspacesResponse;\r\n        const cucmWorkspaces = (cucmParsed?.pageData || []).map((item, index) => toWorkspace(item, index, true));\r\n        const webexWorkspaces = (webexParsed?.pageData || []).map((item, index) => toWorkspace(item, index, false));\r\n        const workspaces = mergeWorkspacesByDeviceName([...cucmWorkspaces, ...webexWorkspaces]);\r\n\r\n        return {\r\n          workspaces,\r\n          total: workspaces.length,\r\n        };\r\n      }),\r\n    );\r\n  }\r\n}\r\n"]}
150
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspaces.service.js","sourceRoot":"","sources":["../../../../../../../projects/tuki/widgets/workspaces/src/services/workspaces.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\r\nimport { forkJoin, Observable } from 'rxjs';\r\nimport { map } from 'rxjs/operators';\r\nimport { API } from '../app.constants';\r\nimport { APIService } from './api.service';\r\nimport { Workspace, WorkspaceDevice, WorkspaceListItem, WorkspacesPage, WorkspacesResponse, WorkspaceStatus } from '../types/workspace';\r\nimport { withoutSep } from '../utils/workspace-name';\r\n\r\nfunction parseResponse(response: any): any {\r\n  return typeof response === 'string' ? JSON.parse(response) : response;\r\n}\r\n\r\nfunction toStatus(provisioningStatus: string | null): WorkspaceStatus {\r\n  if (!provisioningStatus) {\r\n    return 'unavailable';\r\n  }\r\n  return provisioningStatus.toLowerCase() === 'active' ? 'active' : 'inactive';\r\n}\r\n\r\nfunction toWorkspaceDevices(item: WorkspaceListItem, index: number): WorkspaceDevice[] {\r\n  if (item.workspaceDevices?.length) {\r\n    return item.workspaceDevices.map(workspaceDevice => ({\r\n      id: workspaceDevice.deviceId,\r\n      kind: 'device' as const,\r\n      label: workspaceDevice.model || workspaceDevice.mac,\r\n      model: workspaceDevice.model,\r\n      mac: workspaceDevice.mac,\r\n    }));\r\n  }\r\n\r\n  const device = item.device;\r\n  if (!device) {\r\n    return [];\r\n  }\r\n\r\n  const model = device.deviceType || device.userDeviceType || undefined;\r\n  return [{\r\n    id: device.pkid || device.webexUUID || device.name || `device-${index}`,\r\n    kind: 'device' as const,\r\n    label: model || device.name || 'Unnamed device',\r\n    model,\r\n    mac: /^SEP/i.test(device.name || '') ? device.name.slice(3) : undefined,\r\n  }];\r\n}\r\n\r\nfunction toWorkspace(item: WorkspaceListItem, index: number, isCucm: boolean): Workspace {\r\n  const device = item.device;\r\n  const firstDirectoryNumber = device.associatedDNs?.[0]?.directoryNumber ?? '';\r\n\r\n  return {\r\n    id: device.pkid || item.workspaceDevices?.[0]?.deviceId || device.name || `workspace-${index}`,\r\n    displayName: device.newName || device.name || 'Unnamed device',\r\n    typeLabel: device.userDeviceType || 'No type',\r\n    capacity: null,\r\n    location: item.site?.name || device.siteName || device.location || '',\r\n    siteId: item.site?.id ?? null,\r\n    devices: toWorkspaceDevices(item, index),\r\n    scheduling: 'Not set',\r\n    callingLicense: firstDirectoryNumber,\r\n    provisioningType: 'On-premises',\r\n    status: toStatus(device.provisioningStatus),\r\n    statusLabel: device.provisioningStatus || 'Status unavailable',\r\n    device,\r\n    isHybrid: false,\r\n    cucmDeviceName: isCucm ? (device.name || null) : null,\r\n  };\r\n}\r\n\r\nfunction mergeDevices(a: Workspace['device'], b: Workspace['device']): Workspace['device'] {\r\n  return {\r\n    ...a,\r\n    ...b,\r\n    cucmId: b.cucmId ?? a.cucmId,\r\n    webexUUID: b.webexUUID ?? a.webexUUID,\r\n  };\r\n}\r\n\r\n\r\nfunction toMacKey(value: string | null | undefined): string {\r\n  return value ? withoutSep(value).replace(/[^0-9A-F]/g, '') : '';\r\n}\r\n\r\nfunction mergeCucmAndWebexWorkspaces(cucmWorkspaces: Workspace[], webexItems: WorkspaceListItem[], webexWorkspaces: Workspace[]): Workspace[] {\r\n  const result = [...cucmWorkspaces];\r\n  const cucmIndexByMac = new Map<string, number>();\r\n  cucmWorkspaces.forEach((workspace, index) => {\r\n    const key = toMacKey(workspace.device.name);\r\n    if (key && !cucmIndexByMac.has(key)) {\r\n      cucmIndexByMac.set(key, index);\r\n    }\r\n  });\r\n\r\n  webexWorkspaces.forEach((webexWorkspace, webexIndex) => {\r\n    const matchedMac = (webexItems[webexIndex].workspaceDevices || [])\r\n      .map(workspaceDevice => toMacKey(workspaceDevice.mac))\r\n      .find(key => key && cucmIndexByMac.has(key));\r\n\r\n    if (!matchedMac) {\r\n      result.push(webexWorkspace);\r\n      return;\r\n    }\r\n\r\n    const cucmIndex = cucmIndexByMac.get(matchedMac)!;\r\n    cucmIndexByMac.delete(matchedMac);\r\n    const cucmWorkspace = result[cucmIndex];\r\n    result[cucmIndex] = {\r\n      ...cucmWorkspace,\r\n      ...webexWorkspace,\r\n      displayName: cucmWorkspace.displayName,\r\n      device: {\r\n        ...mergeDevices(cucmWorkspace.device, webexWorkspace.device),\r\n        name: cucmWorkspace.device.name,\r\n        newName: cucmWorkspace.device.newName,\r\n      },\r\n      isHybrid: true,\r\n      cucmDeviceName: cucmWorkspace.cucmDeviceName,\r\n    };\r\n  });\r\n\r\n  return result;\r\n}\r\n\r\nconst FETCH_ALL_SIZE = 9999;\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class WorkspacesService {\r\n  constructor(private apiService: APIService) { }\r\n\r\n  fetchWorkspaces(customerId: string | number): Observable<WorkspacesPage> {\r\n    const baseParams: Record<string, string> = {\r\n      type: 'ORPHAN_DEVICE',\r\n      customerid: customerId.toString(),\r\n      size: FETCH_ALL_SIZE.toString(),\r\n      page: '0',\r\n    };\r\n\r\n    const cucm$ = this.apiService.fetch(API.WORKSPACES.GET_ALL, {\r\n      ...baseParams,\r\n      'device-name': 'SEP',\r\n      provisionType: 'CUCM',\r\n    });\r\n\r\n    const webex$ = this.apiService.fetch(API.WORKSPACES.GET_ALL, {\r\n      ...baseParams,\r\n      provisionType: 'WEBEX',\r\n    });\r\n\r\n    return forkJoin([cucm$, webex$]).pipe(\r\n      map(([cucmResponse, webexResponse]) => {\r\n        const cucmParsed = parseResponse(cucmResponse) as WorkspacesResponse;\r\n        const webexParsed = parseResponse(webexResponse) as WorkspacesResponse;\r\n        const webexItems = webexParsed?.pageData || [];\r\n        const cucmWorkspaces = (cucmParsed?.pageData || []).map((item, index) => toWorkspace(item, index, true));\r\n        const webexWorkspaces = webexItems.map((item, index) => toWorkspace(item, index, false));\r\n        const workspaces = mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces);\r\n\r\n        return {\r\n          workspaces,\r\n          total: workspaces.length,\r\n        };\r\n      }),\r\n    );\r\n  }\r\n}\r\n"]}
package/fesm2015/tuki-io-tuki-widgets-workspaces.mjs CHANGED
@@ -293,15 +293,32 @@ function mergeDevices(a, b) {
293
293
  var _a, _b;
294
294
  return Object.assign(Object.assign(Object.assign({}, a), b), { cucmId: (_a = b.cucmId) !== null && _a !== void 0 ? _a : a.cucmId, webexUUID: (_b = b.webexUUID) !== null && _b !== void 0 ? _b : a.webexUUID });
295
295
  }
296
- function mergeWorkspacesByDeviceName(workspaces) {
297
- var _a;
298
- const merged = new Map();
299
- for (const workspace of workspaces) {
300
- const key = withoutSep(workspace.device.name);
301
- const existing = merged.get(key);
302
- merged.set(key, existing ? Object.assign(Object.assign(Object.assign({}, existing), workspace), { device: mergeDevices(existing.device, workspace.device), isHybrid: true, cucmDeviceName: (_a = existing.cucmDeviceName) !== null && _a !== void 0 ? _a : workspace.cucmDeviceName }) : workspace);
303
- }
304
- return Array.from(merged.values());
296
+ function toMacKey(value) {
297
+ return value ? withoutSep(value).replace(/[^0-9A-F]/g, '') : '';
298
+ }
299
+ function mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces) {
300
+ const result = [...cucmWorkspaces];
301
+ const cucmIndexByMac = new Map();
302
+ cucmWorkspaces.forEach((workspace, index) => {
303
+ const key = toMacKey(workspace.device.name);
304
+ if (key && !cucmIndexByMac.has(key)) {
305
+ cucmIndexByMac.set(key, index);
306
+ }
307
+ });
308
+ webexWorkspaces.forEach((webexWorkspace, webexIndex) => {
309
+ const matchedMac = (webexItems[webexIndex].workspaceDevices || [])
310
+ .map(workspaceDevice => toMacKey(workspaceDevice.mac))
311
+ .find(key => key && cucmIndexByMac.has(key));
312
+ if (!matchedMac) {
313
+ result.push(webexWorkspace);
314
+ return;
315
+ }
316
+ const cucmIndex = cucmIndexByMac.get(matchedMac);
317
+ cucmIndexByMac.delete(matchedMac);
318
+ const cucmWorkspace = result[cucmIndex];
319
+ result[cucmIndex] = Object.assign(Object.assign(Object.assign({}, cucmWorkspace), webexWorkspace), { displayName: cucmWorkspace.displayName, device: Object.assign(Object.assign({}, mergeDevices(cucmWorkspace.device, webexWorkspace.device)), { name: cucmWorkspace.device.name, newName: cucmWorkspace.device.newName }), isHybrid: true, cucmDeviceName: cucmWorkspace.cucmDeviceName });
320
+ });
321
+ return result;
305
322
  }
306
323
  const FETCH_ALL_SIZE = 9999;
307
324
  class WorkspacesService {
@@ -320,9 +337,10 @@ class WorkspacesService {
320
337
  return forkJoin([cucm$, webex$]).pipe(map(([cucmResponse, webexResponse]) => {
321
338
  const cucmParsed = parseResponse(cucmResponse);
322
339
  const webexParsed = parseResponse(webexResponse);
340
+ const webexItems = (webexParsed === null || webexParsed === void 0 ? void 0 : webexParsed.pageData) || [];
323
341
  const cucmWorkspaces = ((cucmParsed === null || cucmParsed === void 0 ? void 0 : cucmParsed.pageData) || []).map((item, index) => toWorkspace(item, index, true));
324
- const webexWorkspaces = ((webexParsed === null || webexParsed === void 0 ? void 0 : webexParsed.pageData) || []).map((item, index) => toWorkspace(item, index, false));
325
- const workspaces = mergeWorkspacesByDeviceName([...cucmWorkspaces, ...webexWorkspaces]);
342
+ const webexWorkspaces = webexItems.map((item, index) => toWorkspace(item, index, false));
343
+ const workspaces = mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces);
326
344
  return {
327
345
  workspaces,
328
346
  total: workspaces.length,