@tuki-io/tuki-widgets 0.0.65 → 0.0.67

package/projects/tuki/widgets/user-manage/src/app.constants.ts

@@ -1,50 +1,50 @@
-export const API = {
-  USER_TOKEN: '/api/provision/:siteId/users/:userId/token',
-  UPDATE_USER_FIELDS: '/api/provision/:siteId/userFields/:token',
-  PERSIST_USER_CACHE: '/api/provision/:siteId/saveUser/:token',
-  USER_BY_ID: '/api/provision/:siteId/users/:userId',
-  QUICK_USERS_SEARCH: "/api/search/quickusers",
-  LOCATION: "/api/provision/options/:siteId/locations",
-  USER_LOCALES: "/api/provision/options/:siteId/userlocales",
-  USER_PROFILES: "/api/provision/options/:siteId/userprofiles",
-  AVAILABLE_DN_IN_RANGES: "/api/sites/:siteId/available-dn-in-ranges",
-  DELETE_LINE: "/api/provision/:siteId/deleteLine/:pkid/:token",
-  DISASSOCIATE_LINE: "/api/provision/:siteId/:deviceName/deleteLineAssociation/:linePkid/:token",
-  CHECK_DELETE_LINE: "/api/provision/:siteId/checklinedeletion",
-  ASSOCIATE_LINE: "/api/provision/:siteId/:deviceName/createLineAssociation/:token",
-  CHECK_DESTINATION_NUMBER: "/api/provision/:siteId/check-dn",
-  UPDATE_LINE_FIELDS: "/api/provision/:siteId/lineFields/:pkid/:token",
-  UPDATE_DEVICE_FIELDS: "/api/provision/:siteId/deviceFields/:deviceName/:token"
-};
-export const REGEX_PATTERN = {
-  EMAIL: '^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))' +
-  '@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,62}[a-zA-Z0-9])' +
-  '?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)*$'
-};
-
-export const PAGINATION_DEFAULTS = {
-  SIZE: 10,
-  INDEX: 0
-}
-export const PAGINATION_SIZE_OPTIONS = [
-  10,
-  50,
-  100,
-  500
-];
-export const CUCS_TO_IGNORE = [
-  189,
-  194,
-  191,
-  190
-];
-export const CUCMS_TO_IGNORE = [
-  249,
-  255,
-  251,
-  250
-];
-export const RECORDING_MEDIA_SOURCE = [
-  "Gateway Preferred",
-  "Phone Preferred"
-];
+export const API = {
+  USER_TOKEN: '/api/provision/:siteId/users/:userId/token',
+  UPDATE_USER_FIELDS: '/api/provision/:siteId/userFields/:token',
+  PERSIST_USER_CACHE: '/api/provision/:siteId/saveUser/:token',
+  USER_BY_ID: '/api/provision/:siteId/users/:userId',
+  QUICK_USERS_SEARCH: "/api/search/quickusers",
+  LOCATION: "/api/provision/options/:siteId/locations",
+  USER_LOCALES: "/api/provision/options/:siteId/userlocales",
+  USER_PROFILES: "/api/provision/options/:siteId/userprofiles",
+  AVAILABLE_DN_IN_RANGES: "/api/sites/:siteId/available-dn-in-ranges",
+  DELETE_LINE: "/api/provision/:siteId/deleteLine/:pkid/:token",
+  DISASSOCIATE_LINE: "/api/provision/:siteId/:deviceName/deleteLineAssociation/:linePkid/:token",
+  CHECK_DELETE_LINE: "/api/provision/:siteId/checklinedeletion",
+  ASSOCIATE_LINE: "/api/provision/:siteId/:deviceName/createLineAssociation/:token",
+  CHECK_DESTINATION_NUMBER: "/api/provision/:siteId/check-dn",
+  UPDATE_LINE_FIELDS: "/api/provision/:siteId/lineFields/:pkid/:token",
+  UPDATE_DEVICE_FIELDS: "/api/provision/:siteId/deviceFields/:deviceName/:token"
+};
+export const REGEX_PATTERN = {
+  EMAIL: '^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))' +
+  '@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,62}[a-zA-Z0-9])' +
+  '?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)*$'
+};
+
+export const PAGINATION_DEFAULTS = {
+  SIZE: 10,
+  INDEX: 0
+}
+export const PAGINATION_SIZE_OPTIONS = [
+  10,
+  50,
+  100,
+  500
+];
+export const CUCS_TO_IGNORE = [
+  189,
+  194,
+  191,
+  190
+];
+export const CUCMS_TO_IGNORE = [
+  249,
+  255,
+  251,
+  250
+];
+export const RECORDING_MEDIA_SOURCE = [
+  "Gateway Preferred",
+  "Phone Preferred"
+];

package/projects/tuki/widgets/user-manage/src/assets/icons/arrow-left.svg

@@ -1,5 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="arrow-left">
-<path id="Vector" d="M5.70746 7.99987L11.3539 2.35352C11.4453 2.25928 11.496 2.13287 11.495 2.00159C11.494 1.8703 11.4414 1.74467 11.3486 1.65183C11.2558 1.55899 11.1301 1.50639 10.9988 1.50539C10.8676 1.50438 10.7411 1.55506 10.6469 1.64647L4.64691 7.64647C4.55316 7.74023 4.50049 7.8674 4.50049 7.99999C4.50049 8.13259 4.55316 8.25975 4.64691 8.35352L10.6469 14.3535C10.6931 14.4011 10.7482 14.439 10.8092 14.4651C10.8702 14.4912 10.9357 14.5049 11.002 14.5054C11.0683 14.5059 11.134 14.4932 11.1954 14.468C11.2567 14.4429 11.3125 14.4058 11.3593 14.3589C11.4062 14.312 11.4433 14.2563 11.4685 14.1949C11.4936 14.1336 11.5063 14.0679 11.5058 14.0016C11.5053 13.9353 11.4916 13.8697 11.4655 13.8088C11.4394 13.7478 11.4015 13.6926 11.3539 13.6465L5.70746 7.99987Z" fill="black" fill-opacity="0.95"/>
-</g>
-</svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="arrow-left">
+<path id="Vector" d="M5.70746 7.99987L11.3539 2.35352C11.4453 2.25928 11.496 2.13287 11.495 2.00159C11.494 1.8703 11.4414 1.74467 11.3486 1.65183C11.2558 1.55899 11.1301 1.50639 10.9988 1.50539C10.8676 1.50438 10.7411 1.55506 10.6469 1.64647L4.64691 7.64647C4.55316 7.74023 4.50049 7.8674 4.50049 7.99999C4.50049 8.13259 4.55316 8.25975 4.64691 8.35352L10.6469 14.3535C10.6931 14.4011 10.7482 14.439 10.8092 14.4651C10.8702 14.4912 10.9357 14.5049 11.002 14.5054C11.0683 14.5059 11.134 14.4932 11.1954 14.468C11.2567 14.4429 11.3125 14.4058 11.3593 14.3589C11.4062 14.312 11.4433 14.2563 11.4685 14.1949C11.4936 14.1336 11.5063 14.0679 11.5058 14.0016C11.5053 13.9353 11.4916 13.8697 11.4655 13.8088C11.4394 13.7478 11.4015 13.6926 11.3539 13.6465L5.70746 7.99987Z" fill="black" fill-opacity="0.95"/>
+</g>
+</svg>

package/projects/tuki/widgets/user-manage/src/assets/icons/arrow-right.svg

@@ -1,5 +1,5 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="arrow-right">
-<path id="Vector" d="M14.0812 9.66902L6.58119 2.16902C6.53813 2.12351 6.48638 2.0871 6.429 2.06193C6.37162 2.03677 6.30978 2.02336 6.24713 2.0225C6.18448 2.02165 6.1223 2.03336 6.06425 2.05695C6.00621 2.08053 5.95348 2.11552 5.90919 2.15983C5.8649 2.20415 5.82994 2.25689 5.80638 2.31495C5.78282 2.373 5.77113 2.43519 5.77202 2.49784C5.77291 2.56049 5.78634 2.62232 5.81153 2.67969C5.83673 2.73705 5.87316 2.78879 5.91869 2.83183L13.0874 10.0003L5.91869 17.169C5.87316 17.2121 5.83673 17.2638 5.81153 17.3212C5.78634 17.3785 5.77291 17.4404 5.77202 17.503C5.77113 17.5657 5.78282 17.6279 5.80638 17.6859C5.82994 17.744 5.8649 17.7967 5.90919 17.841C5.95348 17.8853 6.00621 17.9203 6.06425 17.9439C6.1223 17.9675 6.18448 17.9792 6.24713 17.9783C6.30978 17.9775 6.37162 17.9641 6.429 17.9389C6.48638 17.9138 6.53813 17.8773 6.58119 17.8318L14.0812 10.3318C14.1691 10.2439 14.2184 10.1247 14.2184 10.0004C14.2184 9.87613 14.1691 9.75692 14.0812 9.66902Z" fill="#0F0F0F"/>
-</g>
-</svg>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="arrow-right">
+<path id="Vector" d="M14.0812 9.66902L6.58119 2.16902C6.53813 2.12351 6.48638 2.0871 6.429 2.06193C6.37162 2.03677 6.30978 2.02336 6.24713 2.0225C6.18448 2.02165 6.1223 2.03336 6.06425 2.05695C6.00621 2.08053 5.95348 2.11552 5.90919 2.15983C5.8649 2.20415 5.82994 2.25689 5.80638 2.31495C5.78282 2.373 5.77113 2.43519 5.77202 2.49784C5.77291 2.56049 5.78634 2.62232 5.81153 2.67969C5.83673 2.73705 5.87316 2.78879 5.91869 2.83183L13.0874 10.0003L5.91869 17.169C5.87316 17.2121 5.83673 17.2638 5.81153 17.3212C5.78634 17.3785 5.77291 17.4404 5.77202 17.503C5.77113 17.5657 5.78282 17.6279 5.80638 17.6859C5.82994 17.744 5.8649 17.7967 5.90919 17.841C5.95348 17.8853 6.00621 17.9203 6.06425 17.9439C6.1223 17.9675 6.18448 17.9792 6.24713 17.9783C6.30978 17.9775 6.37162 17.9641 6.429 17.9389C6.48638 17.9138 6.53813 17.8773 6.58119 17.8318L14.0812 10.3318C14.1691 10.2439 14.2184 10.1247 14.2184 10.0004C14.2184 9.87613 14.1691 9.75692 14.0812 9.66902Z" fill="#0F0F0F"/>
+</g>
+</svg>

package/projects/tuki/widgets/user-manage/src/assets/icons/delete_icon.svg

@@ -1,5 +1,5 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Icon/Delete">
-<path id="Remove all" d="M9.5835 1.96973C10.9439 1.96973 12.0528 3.09413 12.1036 4.50119L12.1054 4.60217H15.2853C15.588 4.60217 15.8335 4.85838 15.8335 5.17444C15.8335 5.47074 15.6178 5.71444 15.3413 5.74375L15.2853 5.7467H14.8067L14.0597 16.0795C13.9864 17.0944 13.176 17.8788 12.201 17.8788H6.966C5.99094 17.8788 5.18064 17.0944 5.10725 16.0795L4.35981 5.7467H3.88174C3.59788 5.7467 3.3644 5.52152 3.33633 5.23295L3.3335 5.17444C3.3335 4.87813 3.54923 4.63443 3.82569 4.60512L3.88174 4.60217H7.06157C7.06157 3.14831 8.19067 1.96973 9.5835 1.96973ZM13.7072 5.7467L5.45977 5.7467L6.20064 15.9934C6.23085 16.4113 6.56451 16.7343 6.966 16.7343H12.201C12.6025 16.7343 12.9361 16.4113 12.9664 15.9934L13.7072 5.7467ZM11.0089 8.15024C11.2928 8.15024 11.5263 8.37542 11.5543 8.66399L11.5572 8.72251V13.7585C11.5572 14.0745 11.3117 14.3307 11.0089 14.3307C10.7251 14.3307 10.4916 14.1056 10.4635 13.817L10.4607 13.7585L10.4607 8.72251C10.4607 8.40645 10.7061 8.15024 11.0089 8.15024ZM8.15806 8.15024C8.44192 8.15024 8.6754 8.37542 8.70347 8.66399L8.7063 8.72251L8.7063 13.7585C8.7063 14.0745 8.46084 14.3307 8.15806 14.3307C7.87419 14.3307 7.64072 14.1056 7.61264 13.817L7.60981 13.7585L7.60981 8.72251C7.60981 8.40645 7.85527 8.15024 8.15806 8.15024ZM9.5835 3.11427C8.82339 3.11427 8.20225 3.73527 8.16031 4.51773L8.15806 4.60217L11.0089 4.60217C11.0089 3.78042 10.3707 3.11427 9.5835 3.11427Z" fill="#737480"/>
-</g>
-</svg>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon/Delete">
+<path id="Remove all" d="M9.5835 1.96973C10.9439 1.96973 12.0528 3.09413 12.1036 4.50119L12.1054 4.60217H15.2853C15.588 4.60217 15.8335 4.85838 15.8335 5.17444C15.8335 5.47074 15.6178 5.71444 15.3413 5.74375L15.2853 5.7467H14.8067L14.0597 16.0795C13.9864 17.0944 13.176 17.8788 12.201 17.8788H6.966C5.99094 17.8788 5.18064 17.0944 5.10725 16.0795L4.35981 5.7467H3.88174C3.59788 5.7467 3.3644 5.52152 3.33633 5.23295L3.3335 5.17444C3.3335 4.87813 3.54923 4.63443 3.82569 4.60512L3.88174 4.60217H7.06157C7.06157 3.14831 8.19067 1.96973 9.5835 1.96973ZM13.7072 5.7467L5.45977 5.7467L6.20064 15.9934C6.23085 16.4113 6.56451 16.7343 6.966 16.7343H12.201C12.6025 16.7343 12.9361 16.4113 12.9664 15.9934L13.7072 5.7467ZM11.0089 8.15024C11.2928 8.15024 11.5263 8.37542 11.5543 8.66399L11.5572 8.72251V13.7585C11.5572 14.0745 11.3117 14.3307 11.0089 14.3307C10.7251 14.3307 10.4916 14.1056 10.4635 13.817L10.4607 13.7585L10.4607 8.72251C10.4607 8.40645 10.7061 8.15024 11.0089 8.15024ZM8.15806 8.15024C8.44192 8.15024 8.6754 8.37542 8.70347 8.66399L8.7063 8.72251L8.7063 13.7585C8.7063 14.0745 8.46084 14.3307 8.15806 14.3307C7.87419 14.3307 7.64072 14.1056 7.61264 13.817L7.60981 13.7585L7.60981 8.72251C7.60981 8.40645 7.85527 8.15024 8.15806 8.15024ZM9.5835 3.11427C8.82339 3.11427 8.20225 3.73527 8.16031 4.51773L8.15806 4.60217L11.0089 4.60217C11.0089 3.78042 10.3707 3.11427 9.5835 3.11427Z" fill="#737480"/>
+</g>
+</svg>

package/projects/tuki/widgets/user-manage/src/assets/icons/dragger-vertical-icon.svg

@@ -1,3 +1,3 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.125 5C12.7935 5 12.4755 4.8683 12.2411 4.63388C12.0067 4.39946 11.875 4.08152 11.875 3.75C11.875 3.41848 12.0067 3.10054 12.2411 2.86612C12.4755 2.6317 12.7935 2.5 13.125 2.5C13.4565 2.5 13.7745 2.6317 14.0089 2.86612C14.2433 3.10054 14.375 3.41848 14.375 3.75C14.375 4.08152 14.2433 4.39946 14.0089 4.63388C13.7745 4.8683 13.4565 5 13.125 5ZM6.875 5C6.54348 5 6.22554 4.8683 5.99112 4.63388C5.7567 4.39946 5.625 4.08152 5.625 3.75C5.625 3.41848 5.7567 3.10054 5.99112 2.86612C6.22554 2.6317 6.54348 2.5 6.875 2.5C7.20652 2.5 7.52446 2.6317 7.75888 2.86612C7.9933 3.10054 8.125 3.41848 8.125 3.75C8.125 4.08152 7.9933 4.39946 7.75888 4.63388C7.52446 4.8683 7.20652 5 6.875 5ZM13.125 11.25C12.7935 11.25 12.4755 11.1183 12.2411 10.8839C12.0067 10.6495 11.875 10.3315 11.875 10C11.875 9.66848 12.0067 9.35054 12.2411 9.11612C12.4755 8.8817 12.7935 8.75 13.125 8.75C13.4565 8.75 13.7745 8.8817 14.0089 9.11612C14.2433 9.35054 14.375 9.66848 14.375 10C14.375 10.3315 14.2433 10.6495 14.0089 10.8839C13.7745 11.1183 13.4565 11.25 13.125 11.25ZM6.875 11.25C6.54348 11.25 6.22554 11.1183 5.99112 10.8839C5.7567 10.6495 5.625 10.3315 5.625 10C5.625 9.66848 5.7567 9.35054 5.99112 9.11612C6.22554 8.8817 6.54348 8.75 6.875 8.75C7.20652 8.75 7.52446 8.8817 7.75888 9.11612C7.9933 9.35054 8.125 9.66848 8.125 10C8.125 10.3315 7.9933 10.6495 7.75888 10.8839C7.52446 11.1183 7.20652 11.25 6.875 11.25ZM13.125 17.5C12.7935 17.5 12.4755 17.3683 12.2411 17.1339C12.0067 16.8995 11.875 16.5815 11.875 16.25C11.875 15.9185 12.0067 15.6005 12.2411 15.3661C12.4755 15.1317 12.7935 15 13.125 15C13.4565 15 13.7745 15.1317 14.0089 15.3661C14.2433 15.6005 14.375 15.9185 14.375 16.25C14.375 16.5815 14.2433 16.8995 14.0089 17.1339C13.7745 17.3683 13.4565 17.5 13.125 17.5ZM6.875 17.5C6.54348 17.5 6.22554 17.3683 5.99112 17.1339C5.7567 16.8995 5.625 16.5815 5.625 16.25C5.625 15.9185 5.7567 15.6005 5.99112 15.3661C6.22554 15.1317 6.54348 15 6.875 15C7.20652 15 7.52446 15.1317 7.75888 15.3661C7.9933 15.6005 8.125 15.9185 8.125 16.25C8.125 16.5815 7.9933 16.8995 7.75888 17.1339C7.52446 17.3683 7.20652 17.5 6.875 17.5Z" fill="black" fill-opacity="0.95"/>
-</svg>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.125 5C12.7935 5 12.4755 4.8683 12.2411 4.63388C12.0067 4.39946 11.875 4.08152 11.875 3.75C11.875 3.41848 12.0067 3.10054 12.2411 2.86612C12.4755 2.6317 12.7935 2.5 13.125 2.5C13.4565 2.5 13.7745 2.6317 14.0089 2.86612C14.2433 3.10054 14.375 3.41848 14.375 3.75C14.375 4.08152 14.2433 4.39946 14.0089 4.63388C13.7745 4.8683 13.4565 5 13.125 5ZM6.875 5C6.54348 5 6.22554 4.8683 5.99112 4.63388C5.7567 4.39946 5.625 4.08152 5.625 3.75C5.625 3.41848 5.7567 3.10054 5.99112 2.86612C6.22554 2.6317 6.54348 2.5 6.875 2.5C7.20652 2.5 7.52446 2.6317 7.75888 2.86612C7.9933 3.10054 8.125 3.41848 8.125 3.75C8.125 4.08152 7.9933 4.39946 7.75888 4.63388C7.52446 4.8683 7.20652 5 6.875 5ZM13.125 11.25C12.7935 11.25 12.4755 11.1183 12.2411 10.8839C12.0067 10.6495 11.875 10.3315 11.875 10C11.875 9.66848 12.0067 9.35054 12.2411 9.11612C12.4755 8.8817 12.7935 8.75 13.125 8.75C13.4565 8.75 13.7745 8.8817 14.0089 9.11612C14.2433 9.35054 14.375 9.66848 14.375 10C14.375 10.3315 14.2433 10.6495 14.0089 10.8839C13.7745 11.1183 13.4565 11.25 13.125 11.25ZM6.875 11.25C6.54348 11.25 6.22554 11.1183 5.99112 10.8839C5.7567 10.6495 5.625 10.3315 5.625 10C5.625 9.66848 5.7567 9.35054 5.99112 9.11612C6.22554 8.8817 6.54348 8.75 6.875 8.75C7.20652 8.75 7.52446 8.8817 7.75888 9.11612C7.9933 9.35054 8.125 9.66848 8.125 10C8.125 10.3315 7.9933 10.6495 7.75888 10.8839C7.52446 11.1183 7.20652 11.25 6.875 11.25ZM13.125 17.5C12.7935 17.5 12.4755 17.3683 12.2411 17.1339C12.0067 16.8995 11.875 16.5815 11.875 16.25C11.875 15.9185 12.0067 15.6005 12.2411 15.3661C12.4755 15.1317 12.7935 15 13.125 15C13.4565 15 13.7745 15.1317 14.0089 15.3661C14.2433 15.6005 14.375 15.9185 14.375 16.25C14.375 16.5815 14.2433 16.8995 14.0089 17.1339C13.7745 17.3683 13.4565 17.5 13.125 17.5ZM6.875 17.5C6.54348 17.5 6.22554 17.3683 5.99112 17.1339C5.7567 16.8995 5.625 16.5815 5.625 16.25C5.625 15.9185 5.7567 15.6005 5.99112 15.3661C6.22554 15.1317 6.54348 15 6.875 15C7.20652 15 7.52446 15.1317 7.75888 15.3661C7.9933 15.6005 8.125 15.9185 8.125 16.25C8.125 16.5815 7.9933 16.8995 7.75888 17.1339C7.52446 17.3683 7.20652 17.5 6.875 17.5Z" fill="black" fill-opacity="0.95"/>
+</svg>

package/projects/tuki/widgets/user-manage/src/assets/icons/vartical_divider_icon.svg

@@ -1,3 +1,3 @@
-<svg width="1" height="18" viewBox="0 0 1 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="0.5" y1="2.18557e-08" x2="0.499999" y2="18" stroke="#333333"/>
-</svg>
+<svg width="1" height="18" viewBox="0 0 1 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="0.5" y1="2.18557e-08" x2="0.499999" y2="18" stroke="#333333"/>
+</svg>

package/projects/tuki/widgets/user-manage/src/classes/device.ts

@@ -1,232 +1,232 @@
-import { getSavableData } from '../common-functions';
-import { EntityChangeType } from './line';
-import { LineAssociation } from './line-association';
-import { LineAssociationInterface } from './line-association-interface';
-
-export class Device {
-  // simplified TEMP
-  name!: string;
-  pkiid!: string
-  deviceType!: string;
-  lineAssociations!: LineAssociation[] | LineAssociationInterface[];
-  lineAssociationsHasChanges = false;
-  protocol!: string;
-  description!: string;
-  buttonTemplate!: string;
-  softkeyTemplate!: string;
-  devicePoolName!: string;
-  location!: string;
-  callingSearchSpaceName!: string;
-  firmwareVersion!: string;
-  registrationStatus!: string
-  ipAddress!: string;
-  deviceKind!: string;
-  isCtiRoutePoint!: boolean;
-  alreadyUsedName!: string;
-  deviceDefaults: any;
-  availableSlots!: number[];
-  plarService = false;
-
-  constructor(device: any) {
-    if (device) {
-      this.name = device.name;
-      this.pkiid = device.pkiid;
-      this.deviceType = device.deviceType;
-      this.protocol = device.protocol;
-      this.description = device.description;
-      this.buttonTemplate = device.buttonTemplate;
-      this.softkeyTemplate = device.softkeyTemplate;
-      this.devicePoolName = device.devicePoolName;
-      this.location = device.location;
-      this.firmwareVersion = device.firmwareVersion;
-      this.plarService = device.plarService;
-      this.callingSearchSpaceName = device.callingSearchSpaceName;
-      this.registrationStatus = 'Unknown'; // TEMP for demo
-      this.ipAddress = 'None'; // TEMP for demo
-
-      this.lineAssociations = device.lineAssociations?.length ?
-        device.lineAssociations.map((line: any) => new LineAssociation(line)) : [];
-    }
-  }
-
-  getSavableData() {
-    const excludedFields: string[] = ['form'];
-    return getSavableData(this, excludedFields);
-  }
-}
-
-export interface DeviceInterface {
-  name: string;
-  newName: string;
-  pkid: string;
-  entityChangeType: EntityChangeType;
-  deviceType: string;
-  protocol: string;
-  description: string;
-  buttonTemplate: string;
-  softkeyTemplate: string;
-  devicePoolName: string;
-  location: string;
-  userLocale: string;
-  enabledExtensionMobility: boolean;
-  callingSearchSpaceName: string;
-  services: string[];
-  networkLocale: string;
-  securityProfile: string;
-  lineAssociations: LineAssociationInterface[];
-  speedDials: SpeedDialInterface[];
-  sipProfile: string;
-  subscribeCallingSearchSpaceName: string;
-  commonPhoneConfigName: string;
-  ctiRemoteDevice: boolean;
-  firstExpansionModule: string;
-  secondExpansionModule: string;
-  thirdExpansionModule: string;
-  builtInBridge: string;
-  extraOptions: DeviceExtraOptionsInterface;
-  formDisabledControls: string[];
-  sharedUsers: string[];
-  busyLampFields: BusyLampFieldsInterface[];
-  meetMeEnabled: boolean;
-  deviceKind: any;
-  isCtiRoutePoint: boolean;
-  cucmId: string;
-  plarDevice: boolean;
-  firmwareVersion: any;
-  certificateOperation: string;
-  authenticationMode: string;
-  authenticationString: string;
-  rsaKeySize: string;
-  operationCompletesBy: string;
-  certificateStatus: string;
-  day: string;
-  month: string;
-  year: string;
-  hour: string;
-  securityProfileUuid: string;
-  excludeDeviceExtraOptions: boolean;
-  webexUUID: string;
-}
-export interface SpeedDialInterface {
-  index: number;
-  position: number;
-  destination: string;
-  label: string;
-  editMode: boolean;
-}
-export enum RecordingOptions {
-  disabled = 'Call Recording Disabled',
-  auto_enabled = 'Automatic Call Recording Enabled',
-  selective_enabled = 'Selective Call Recording Enabled'
-}
-export interface LineCallInfoDisplayInterface {
-  callerName: string;
-  callerNumber: string;
-  redirectedNumber: string;
-  dialedNumber: string;
-}
-export interface SiteShortDataInterface {
-  id: number;
-  name: string;
-}
-export interface DeviceExtraOptionsInterface {
-  mediaResourceGroupList: string;
-  userHoldMOHAudioSourceId: number;
-  userHoldMOHAudioSourceName: string;
-  networkMOHAudioSourceId: number;
-  networkMOHAudioSourceName: string;
-  aarCss: string;
-  aarGroup: string;
-  privacy: string;
-  deviceMobilityMode: string;
-  mobilityUserId: string;
-  phonePersonalization: string;
-  servicesProvisioning: string;
-  phoneLoadName: string;
-  phoneIdleBLFAlertSetting: string;
-  phoneBusyBLFAlertSetting: string;
-  useTrustedRelayPoint: string;
-  alwaysUsePrimeLine: string;
-  alwaysUsePrimeLineForVoiceMessage: string;
-  geolocation: string;
-  emergencyLocation: string;
-  ignorePresentationIndicators: boolean;
-  loggedIntoHuntGroup: boolean;
-  enabledExtensionMobility: boolean;
-  remoteDevice: boolean;
-  protectedDevice: boolean;
-  hotlineDevice: boolean;
-  useDevicePoolCgpnIngressDN: boolean;
-  cgpnIngressDN: string;
-  useDevicePoolCgpnTransformCss: boolean;
-  cgpnTransformationCss: string;
-  packetCaptureMode: string;
-  packetCaptureDuration: number;
-  blfPresenceGroup: string;
-  sipDialRules: string;
-  mtpPreferredOriginatingCodec: string;
-  rerouteCss: string;
-  subscribeCss: string;
-  mtpRequired: boolean;
-  unattendedPort: boolean;
-  requireDtmfReception: boolean;
-  informationUrl: string;
-  directoryUrl: string;
-  messagesUrl: string;
-  servicesUrl: string;
-  authenticationUrl: string;
-  proxyServerUrl: string;
-  idleUrl: string;
-  idleTimeout: string;
-  secureAuthenticationUrl: string;
-  secureDirectoryUrl: string;
-  secureIdleUrl: string;
-  secureInformationUrl: string;
-  secureMessageUrl: string;
-  secureServicesUrl: string;
-  mlppDomain: string;
-  mlppIndication: string;
-  mlppPreemption: string;
-  confidentialAccessMode: string;
-  confidentialAccessLevel: string;
-  confidentialAccessLevelName: string;
-  doNotDisturb: boolean;
-  dndOption: string;
-  dndIncomingCallAlert: string;
-  disableSpeakerphone: boolean;
-  disableSpeakerphoneAndHeadset: boolean;
-  forwardingDelay: boolean;
-  pcPort: boolean;
-  settingsAccess: string;
-  gratuitousARP: boolean;
-  pcVoiceVlanAccess: boolean;
-  videoCapabilities: boolean;
-  webAccess: boolean;
-  daysDisplayNotActive: string[];
-  displayOnTime: string;
-  displayOnDuration: string;
-  displayIdleTimeout: string;
-  wirelessHeadsetHookswitchControl: boolean;
-  minRingVolume: string;
-  showAllCallsOnPL: boolean;
-  lineMode: string;
-  latentCapabilityRegistration: string;
-  analogGatewayPortInformation: AnalogGatewayPortInformationInterFace;
-}
-export interface AnalogGatewayPortInformationInterFace {
-  portDirection: string;
-  prefixDn: string;
-  numDigits: number;
-  expectedDigits: number;
-  smdiPortNumber: number;
-  trunk: string;
-  unattendedPort: string;
-}
-export interface BusyLampFieldsInterface {
-  index: number;
-  position: number;
-  destination: string;
-  dnWithRoutePartition: string;
-  label: string;
-  callPickup: boolean;
-}
+import { getSavableData } from '../common-functions';
+import { EntityChangeType } from './line';
+import { LineAssociation } from './line-association';
+import { LineAssociationInterface } from './line-association-interface';
+
+export class Device {
+  // simplified TEMP
+  name!: string;
+  pkiid!: string
+  deviceType!: string;
+  lineAssociations!: LineAssociation[] | LineAssociationInterface[];
+  lineAssociationsHasChanges = false;
+  protocol!: string;
+  description!: string;
+  buttonTemplate!: string;
+  softkeyTemplate!: string;
+  devicePoolName!: string;
+  location!: string;
+  callingSearchSpaceName!: string;
+  firmwareVersion!: string;
+  registrationStatus!: string
+  ipAddress!: string;
+  deviceKind!: string;
+  isCtiRoutePoint!: boolean;
+  alreadyUsedName!: string;
+  deviceDefaults: any;
+  availableSlots!: number[];
+  plarService = false;
+
+  constructor(device: any) {
+    if (device) {
+      this.name = device.name;
+      this.pkiid = device.pkiid;
+      this.deviceType = device.deviceType;
+      this.protocol = device.protocol;
+      this.description = device.description;
+      this.buttonTemplate = device.buttonTemplate;
+      this.softkeyTemplate = device.softkeyTemplate;
+      this.devicePoolName = device.devicePoolName;
+      this.location = device.location;
+      this.firmwareVersion = device.firmwareVersion;
+      this.plarService = device.plarService;
+      this.callingSearchSpaceName = device.callingSearchSpaceName;
+      this.registrationStatus = 'Unknown'; // TEMP for demo
+      this.ipAddress = 'None'; // TEMP for demo
+
+      this.lineAssociations = device.lineAssociations?.length ?
+        device.lineAssociations.map((line: any) => new LineAssociation(line)) : [];
+    }
+  }
+
+  getSavableData() {
+    const excludedFields: string[] = ['form'];
+    return getSavableData(this, excludedFields);
+  }
+}
+
+export interface DeviceInterface {
+  name: string;
+  newName: string;
+  pkid: string;
+  entityChangeType: EntityChangeType;
+  deviceType: string;
+  protocol: string;
+  description: string;
+  buttonTemplate: string;
+  softkeyTemplate: string;
+  devicePoolName: string;
+  location: string;
+  userLocale: string;
+  enabledExtensionMobility: boolean;
+  callingSearchSpaceName: string;
+  services: string[];
+  networkLocale: string;
+  securityProfile: string;
+  lineAssociations: LineAssociationInterface[];
+  speedDials: SpeedDialInterface[];
+  sipProfile: string;
+  subscribeCallingSearchSpaceName: string;
+  commonPhoneConfigName: string;
+  ctiRemoteDevice: boolean;
+  firstExpansionModule: string;
+  secondExpansionModule: string;
+  thirdExpansionModule: string;
+  builtInBridge: string;
+  extraOptions: DeviceExtraOptionsInterface;
+  formDisabledControls: string[];
+  sharedUsers: string[];
+  busyLampFields: BusyLampFieldsInterface[];
+  meetMeEnabled: boolean;
+  deviceKind: any;
+  isCtiRoutePoint: boolean;
+  cucmId: string;
+  plarDevice: boolean;
+  firmwareVersion: any;
+  certificateOperation: string;
+  authenticationMode: string;
+  authenticationString: string;
+  rsaKeySize: string;
+  operationCompletesBy: string;
+  certificateStatus: string;
+  day: string;
+  month: string;
+  year: string;
+  hour: string;
+  securityProfileUuid: string;
+  excludeDeviceExtraOptions: boolean;
+  webexUUID: string;
+}
+export interface SpeedDialInterface {
+  index: number;
+  position: number;
+  destination: string;
+  label: string;
+  editMode: boolean;
+}
+export enum RecordingOptions {
+  disabled = 'Call Recording Disabled',
+  auto_enabled = 'Automatic Call Recording Enabled',
+  selective_enabled = 'Selective Call Recording Enabled'
+}
+export interface LineCallInfoDisplayInterface {
+  callerName: string;
+  callerNumber: string;
+  redirectedNumber: string;
+  dialedNumber: string;
+}
+export interface SiteShortDataInterface {
+  id: number;
+  name: string;
+}
+export interface DeviceExtraOptionsInterface {
+  mediaResourceGroupList: string;
+  userHoldMOHAudioSourceId: number;
+  userHoldMOHAudioSourceName: string;
+  networkMOHAudioSourceId: number;
+  networkMOHAudioSourceName: string;
+  aarCss: string;
+  aarGroup: string;
+  privacy: string;
+  deviceMobilityMode: string;
+  mobilityUserId: string;
+  phonePersonalization: string;
+  servicesProvisioning: string;
+  phoneLoadName: string;
+  phoneIdleBLFAlertSetting: string;
+  phoneBusyBLFAlertSetting: string;
+  useTrustedRelayPoint: string;
+  alwaysUsePrimeLine: string;
+  alwaysUsePrimeLineForVoiceMessage: string;
+  geolocation: string;
+  emergencyLocation: string;
+  ignorePresentationIndicators: boolean;
+  loggedIntoHuntGroup: boolean;
+  enabledExtensionMobility: boolean;
+  remoteDevice: boolean;
+  protectedDevice: boolean;
+  hotlineDevice: boolean;
+  useDevicePoolCgpnIngressDN: boolean;
+  cgpnIngressDN: string;
+  useDevicePoolCgpnTransformCss: boolean;
+  cgpnTransformationCss: string;
+  packetCaptureMode: string;
+  packetCaptureDuration: number;
+  blfPresenceGroup: string;
+  sipDialRules: string;
+  mtpPreferredOriginatingCodec: string;
+  rerouteCss: string;
+  subscribeCss: string;
+  mtpRequired: boolean;
+  unattendedPort: boolean;
+  requireDtmfReception: boolean;
+  informationUrl: string;
+  directoryUrl: string;
+  messagesUrl: string;
+  servicesUrl: string;
+  authenticationUrl: string;
+  proxyServerUrl: string;
+  idleUrl: string;
+  idleTimeout: string;
+  secureAuthenticationUrl: string;
+  secureDirectoryUrl: string;
+  secureIdleUrl: string;
+  secureInformationUrl: string;
+  secureMessageUrl: string;
+  secureServicesUrl: string;
+  mlppDomain: string;
+  mlppIndication: string;
+  mlppPreemption: string;
+  confidentialAccessMode: string;
+  confidentialAccessLevel: string;
+  confidentialAccessLevelName: string;
+  doNotDisturb: boolean;
+  dndOption: string;
+  dndIncomingCallAlert: string;
+  disableSpeakerphone: boolean;
+  disableSpeakerphoneAndHeadset: boolean;
+  forwardingDelay: boolean;
+  pcPort: boolean;
+  settingsAccess: string;
+  gratuitousARP: boolean;
+  pcVoiceVlanAccess: boolean;
+  videoCapabilities: boolean;
+  webAccess: boolean;
+  daysDisplayNotActive: string[];
+  displayOnTime: string;
+  displayOnDuration: string;
+  displayIdleTimeout: string;
+  wirelessHeadsetHookswitchControl: boolean;
+  minRingVolume: string;
+  showAllCallsOnPL: boolean;
+  lineMode: string;
+  latentCapabilityRegistration: string;
+  analogGatewayPortInformation: AnalogGatewayPortInformationInterFace;
+}
+export interface AnalogGatewayPortInformationInterFace {
+  portDirection: string;
+  prefixDn: string;
+  numDigits: number;
+  expectedDigits: number;
+  smdiPortNumber: number;
+  trunk: string;
+  unattendedPort: string;
+}
+export interface BusyLampFieldsInterface {
+  index: number;
+  position: number;
+  destination: string;
+  dnWithRoutePartition: string;
+  label: string;
+  callPickup: boolean;
+}