UNIFIAPI v0.2, not ofund mac handling #1132

front/js/common.js

@@ -1032,6 +1032,7 @@ function getDevDataByMac(macAddress, dbColumn) {
       }
   }
 
+  console.error("⚠ Device with MAC not found:" + macAddress)
   return "Unknown"; // Return a default value if MAC address is not found
 }
 

front/js/modal.js

@@ -161,6 +161,91 @@ function showModalFieldInput(
   $(`#${prefix}`).modal("show");
 }
 
+// -----------------------------------------------------------------------------
+function showModalPopupForm(
+  title,
+  message,
+  btnCancel = getString("Gen_Cancel"),
+  btnOK = getString("Gen_Okay"),
+  curValue = "",
+  callbackFunction = null,
+  triggeredBy = null,
+  popupFormJson = null,
+  parentSettingKey = null
+) {
+  // set captions
+  prefix = "modal-form";
+  console.log(popupFormJson);
+
+  $(`#${prefix}-title`).html(title);
+  $(`#${prefix}-message`).html(message);
+  $(`#${prefix}-cancel`).html(btnCancel);
+  $(`#${prefix}-OK`).html(btnOK);
+
+  if (callbackFunction != null) {    
+    modalCallbackFunction = callbackFunction;
+  }
+
+  if (triggeredBy != null) {
+    $('#'+prefix).attr("data-myparam-triggered-by", triggeredBy)
+  }
+
+  outputHtml = "";
+
+  if (Array.isArray(popupFormJson)) {
+    popupFormJson.forEach((field, index) => {
+        // You'll need to define these or map them from `field`
+        const setName = field.name?.find(n => n.language_code === "en_us")?.string || setKey;
+        const labelClasses = "col-sm-2"; // example, or from your obj.labelClasses
+        const inputClasses = "col-sm-10"; // example, or from your obj.inputClasses
+        const fieldData = field.default_value ?? "";
+        const fieldOptionsOverride = field.type?.elements[0]?.elementOptions || [];
+
+        const setKey = field.function || `field_${index}`;
+        const setValue = field.default_value ?? "";
+        const setType = JSON.stringify(field.type); 
+        const setEvents = field.events || [];  // default to empty array if missing
+
+        const setObj = { setKey, setValue, setType, setEvents };
+
+        // Generate the input field HTML
+        const inputFormHtml = `
+                              <div class="form-group col-xs-12">
+                                  <label id="${setKey}_label" class="${labelClasses}"> ${setName}
+                                      <i my-set-key="${parentSettingKey}_popupform_${setKey}"
+                                          title="${getString("Settings_Show_Description")}" 
+                                          class="fa fa-circle-info pointer helpIconSmallTopRight" 
+                                          onclick="showDescriptionPopup(this)">
+                                      </i>
+                                  </label>
+                                  <div class="${inputClasses}">
+                                      ${generateFormHtml(
+                                        null, // settingsData only required for datatables
+                                        setObj, 
+                                        fieldData.toString(), 
+                                        fieldOptionsOverride, 
+                                        null
+                                      )}
+                                  </div>
+                              </div>
+                  `;
+
+        // Append to result
+        outputHtml += inputFormHtml;
+    });
+  }
+  
+  $(`#modal-form-plc`).html(outputHtml);
+
+  // $(`#${prefix}-field`).val(curValue);
+  // setTimeout(function () {
+  //   $(`#${prefix}-field`).focus();
+  // }, 500);
+
+  // Show modal
+  $(`#${prefix}`).modal("show");
+}
+
 // -----------------------------------------------------------------------------
 function modalDefaultOK() {
   // Hide modal

front/js/settings_utils.js

@@ -67,6 +67,15 @@ function getPluginConfig(pluginsData, prefix) {
   return result;
 }
 
+// ----------------------------------------
+// Show the description of a setting
+function showDescriptionPopup(e) {
+
+  console.log($(e).attr("my-set-key"));    
+
+  showModalOK("Info", getString($(e).attr("my-set-key") + '_description'))
+}
+
 // -------------------------------------------------------------------
 // Generate plugin HTML card based on prefixes in an array
 function pluginCards(prefixesOfEnabledPlugins, includeSettings) {
@@ -299,6 +308,45 @@ function removeDataTableRow(el) {
   }
 }
 
+// ---------------------------------------------------------
+// Add item via pop up form dialog
+function addViaPopupForm(element) {
+  console.log(element)
+
+  const fromId = $(element).attr("my-input-from");
+  const toId = $(element).attr("my-input-to");
+  const curValue = $(`#${fromId}`).val();
+  const triggeredBy = $(element).attr("id");
+  const parsed = JSON.parse(atob($(element).data("elementoptionsbase64")));  
+  const popupFormJson = parsed.find(obj => "popupForm" in obj)?.popupForm ?? null;
+  
+  console.log(`fromId | toId | triggeredBy | curValue: ${fromId} | ${toId} | ${triggeredBy} | ${curValue}`);
+
+  showModalPopupForm(
+    `<i class="fa fa-pen-to-square"></i> ${getString(
+      "Gen_Update_Value"
+    )}`,                                        // title
+    getString("settings_update_item_warning"),  // message
+    getString("Gen_Cancel"),                    // btnCancel
+    getString("Gen_Add"),                       // btnOK
+    curValue,                                   // curValue
+    null,                                       // callbackFunction
+    triggeredBy,                                // triggeredBy
+    popupFormJson,                              // popupform
+    toId                                        // parentSettingKey
+  );
+}
+
+// ---------------------------------------------------------
+// Add item to list via popup form
+function addViaPopupFormToList(element, clearInput = true) {
+
+
+  // flag something changes to prevent navigating from page
+  settingsChanged();
+}
+
+
 // ---------------------------------------------------------
 // Add item to list
 function addList(element, clearInput = true) {
@@ -622,8 +670,6 @@ function generateOptionsOrSetOptions(
   // obj.push({ id: item, name: item })
   options = arrayToObject(createArray(overrideOptions ? overrideOptions : getSettingOptions(setKey)))
 
-  
-  
   // Call to render lists
   renderList(
     options,
@@ -633,8 +679,6 @@ function generateOptionsOrSetOptions(
     targetField,
     transformers
   );
-  
-  
 }
 
 
@@ -655,6 +699,13 @@ function applyTransformers(val, transformers) {
           val = btoa(val);
         }
         break;
+      case "name|base64":
+        // // Implement base64  logic
+        // if (!isBase64(val)) {
+        //   val = btoa(val);
+        // }
+        val = val;   // probably TODO ⚠
+        break;
       case "getString":
         // no change
         val = val;        
@@ -681,6 +732,13 @@ function reverseTransformers(val, transformers) {
           val = atob(val);
         }
         break;
+      case "name|base64":
+        // // Implement base64 decoding logic
+        // if (isBase64(val)) {
+        //   val = atob(val);
+        // }
+        val = val;   // probably TODO ⚠
+        break;
       case "getString":
         // retrieve string
         val = getString(val);        
@@ -720,8 +778,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
   let customParams = "";
   let customId = "";
   let columns = [];
-  let base64Regex = "";
-
+  let base64Regex = "";  
+  let elementOptionsBase64 = btoa(JSON.stringify(elementOptions));
 
   elementOptions.forEach((option) => {
     if (option.prefillValue) {
@@ -804,7 +862,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
     customParams,
     customId,
     columns,
-    base64Regex
+    base64Regex,
+    elementOptionsBase64
   };
 };
 
@@ -955,6 +1014,8 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
   // }
 
   // Parse the setType JSON string
+  console.log(processQuotes(setType));
+  
   const setTypeObject = JSON.parse(processQuotes(setType))
   const dataType = setTypeObject.dataType;
   const elements = setTypeObject.elements || [];
@@ -982,7 +1043,8 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
       customParams,
       customId,
       columns,
-      base64Regex
+      base64Regex,
+      elementOptionsBase64
     } = handleElementOptions(setKey, elementOptions, transformers, inVal);
 
     // Override value
@@ -1051,6 +1113,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
                         my-originalSetKey="${originalSetKey}"
                         my-input-from="${sourceIds}" 
                         my-input-to="${setKey}" 
+                        data-elementoptionsbase64="${elementOptionsBase64}"
                         onclick="${onClick}">
                         ${getString(getStringKey)}
                       </button>`;

front/js/ui_components.js

@@ -782,25 +782,17 @@ function initSelect2() {
 // ------------------------------------------
 // Render a device link with hover-over functionality
 function renderDeviceLink(data, container, useName = false) {
-  if (!data.id) return data.text; // default placeholder etc.
+  if (!data.id || !isValidMac(data.id)) return data.text; // default placeholder etc.
 
   const device = getDevDataByMac(data.id);
-
-  console.log('mac 🔽');  
-  console.log(data.id);  
-  console.log('mac 🔼');  
-
-  console.log('device 🔽');  
-  console.log(device);  
-  console.log('device 🔼');  
-
+  
   const badge = getStatusBadgeParts(
     device.devPresentLastScan,
     device.devAlertDown,
     device.devMac
   );
 
-  // Add badge class and hover-info class to container
+  // badge class and hover-info class to container
   $(container)
     .addClass(`${badge.cssClass} hover-node-info`)
     .attr({