@tuki-io/tuki-widgets 0.0.136 → 0.0.138

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

@@ -987,6 +987,7 @@ class DeviceProfile {
                 return new FormGroup({
                     name: new FormControl({ value: line?.name || undefined, disabled: true }),
                     extension: new FormControl({ value: line?.extension || undefined, disabled: true }),
+                    number: new FormControl({ value: line?.extension || undefined, disabled: true }),
                 });
             }) ?? [])),
             activationState: new FormControl({ value: config.activationState || false, disabled: true }),
@@ -1158,8 +1159,9 @@ class UserService {
                     macAddress: this.getMacAddress(foundDevice.name),
                     lines: foundDevice?.lineAssociations?.map((line) => {
                         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: foundDevice?.lines?.find((l) => l.pkid === line.pkid)?.mappedDids[0] || '',
                         };
                     }),
                     softwareVersion: foundDevice?.firmwareVersion
@@ -1169,8 +1171,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([