@tuki-io/tuki-widgets 0.0.136 → 0.0.138

package/fesm2015/tuki-io-tuki-widgets-user-device-manage.mjs

@@ -995,6 +995,7 @@ class DeviceProfile {
                 return new FormGroup({
                     name: new FormControl({ value: (line === null || line === void 0 ? void 0 : line.name) || undefined, disabled: true }),
                     extension: new FormControl({ value: (line === null || line === void 0 ? void 0 : line.extension) || undefined, disabled: true }),
+                    number: new FormControl({ value: (line === null || line === void 0 ? void 0 : line.extension) || undefined, disabled: true }),
                 });
             })) !== null && _e !== void 0 ? _e : [])),
             activationState: new FormControl({ value: config.activationState || false, disabled: true }),
@@ -1165,9 +1166,11 @@ class UserService {
                 this._userLastName = user.lastName;
                 const foundDevice = user.devices.find((device) => device.deviceType === deviceType);
                 this._userDevice = new DeviceProfile(Object.assign(Object.assign({}, foundDevice), { model: foundDevice === null || foundDevice === void 0 ? void 0 : foundDevice.deviceType, macAddress: this.getMacAddress(foundDevice.name), lines: (_a = foundDevice === null || foundDevice === void 0 ? void 0 : foundDevice.lineAssociations) === null || _a === void 0 ? void 0 : _a.map((line) => {
+                        var _a, _b;
                         return {
-                            name: line && line.directoryNumber && line.directoryNumber.routePartitionName && line.directoryNumber.routePartitionName || '',
+                            name: `${this._userName} ${this._userLastName}`,
                             extension: line && line.directoryNumber && line.directoryNumber.routePartitionName && line.directoryNumber.directoryNumber || '',
+                            number: ((_b = (_a = foundDevice === null || foundDevice === void 0 ? void 0 : foundDevice.lines) === null || _a === void 0 ? void 0 : _a.find((l) => l.pkid === line.pkid)) === null || _b === void 0 ? void 0 : _b.mappedDids[0]) || '',
                         };
                     }), softwareVersion: foundDevice === null || foundDevice === void 0 ? void 0 : foundDevice.firmwareVersion }));
             }
@@ -1175,8 +1178,16 @@ class UserService {
         }));
     }
     getMacAddress(name) {
-        const macAddress = name.match(/\d+/g);
-        return macAddress && macAddress[0] && macAddress[0].length === 12 ? macAddress[0] : undefined;
+        const macRegex = /^[A-Fa-f0-9]{12}$/;
+        let macAddress;
+        if (name.length === 12 && macRegex.test(name)) {
+            macAddress = name;
+        }
+        else {
+            const trimmed = name.slice(3);
+            macAddress = macRegex.test(trimmed) ? trimmed : undefined;
+        }
+        return macAddress;
     }
     fetchWebexUserDevice(customerId, userId, deviceType) {
         return forkJoin([