Revert "RDKB-65329 UI MLO Code Development (#58)"#59
Open
umasankar098 wants to merge 1 commit into
Open
Conversation
This reverts commit e691cdf.
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR removes MLO (Multi-Link Operation) support logic from the XB3 JST templates and simplifies host lookups/SSID matching to rely on Layer1Interface directly.
Changes:
- Removed MLO helper functions and stopped appending MLO-specific DM fields to host mapping arrays.
- Reworked connected-devices and captive-portal logic to use
Layer1Interfacewithout MLO-aware selection. - Simplified SSID-to-host matching in wireless configuration handlers by parsing
Layer1Interface.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| source/Styles/xb3/jst/includes/utility.jst | Removes MLO helpers and drops a WiFi 6G (SSID.17) special-case in interface processing. |
| source/Styles/xb3/jst/connected_devices_computers_resi.jst | Removes MLO-aware per-link expansion and simplifies RSSI + instanceID handling. |
| source/Styles/xb3/jst/connected_devices_computers.jst | Formatting/indentation adjustments in connected device host construction. |
| source/Styles/xb3/jst/captiveportal.jst | Stops requesting MLO fields and uses Layer1Interface directly to infer connection type. |
| source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_onewifi.jst | Replaces MLO SSID matching with Layer1Interface token parsing; alters iteration bounds. |
| source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_onestack.jst | Same as onewifi: token parsing and iteration bounds changes for host scanning. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
677
to
683
| function ProcessLay1Interface($interface){ | ||
| $host=[]; | ||
| if (stristr($interface, "WiFi")){ | ||
| if (stristr($interface, "WiFi.SSID.17")) { | ||
| $host['networkType'] = "Private"; | ||
| $host['connectionType'] = "Wi-Fi 6G"; | ||
| } | ||
| else if (stristr($interface, "WiFi.SSID.1")) { | ||
| if (stristr($interface, "WiFi.SSID.1")) { | ||
| $host['networkType'] = "Private"; | ||
| $host['connectionType'] = "Wi-Fi 2.4G"; | ||
| } |
| //This for loop aims to construct online and offline network host arrays based on $Host | ||
| for ($i=0,$j=0,$k=0,$x=0; $i < $HostNum; $i++) { | ||
| $Host[$i.toString()]['instanceID'] = $Host[$i.toString()]['__id']; | ||
| $Host[$i.toString()]['instanceID'] = $i + 1; |
Comment on lines
+150
to
+153
| if (stristr($tmpHost['connectionType'], 'Wi-Fi')) | ||
| $onlinePrivateNetworkHost[$j]['RSSI'] = $clients_RSSI[strtoupper($Host[$i.toString()]['PhysAddress'])]+" dBm"; | ||
| else | ||
| $onlinePrivateNetworkHost[$j]['RSSI'] = "NA"; |
| $offlinePrivateNetworkHost['hostNum'] += 1; | ||
| $offlinePrivateNetworkHost[$k]={}; | ||
| $offlinePrivateNetworkHost[$k.toString()]['instanceID'] = $Host[$i.toString()]['instanceID']; | ||
| $offlinePrivateNetworkHost[$k.toString()]['instanceID'] = $i + 1; |
| } | ||
| else | ||
| { | ||
| $id = getStr("Device.Hosts.HostNumberOfEntries"); |
Comment on lines
+376
to
+379
| $actualTableInstance = getParaValues($rootObjName, $paramNameArray, $mapping_array); | ||
| for ($j=0; $j<$id; $j++) | ||
| { | ||
| if (hasMloSsidMatch($actualTableInstance[$j.toString()], $actualTableInstance[$j.toString()]["__id"], $i)) { | ||
| array_push($at, [$actualTableInstance[$j.toString()]["HostName"], $actualTableInstance[$j.toString()]["PhysAddress"]]/*p2j-array*/); | ||
| $host = explode(".", $actualTableInstance[$j.toString()]["Layer1Interface"]); |
Comment on lines
+379
to
+384
| $host = explode(".", $actualTableInstance[$j.toString()]["Layer1Interface"]); | ||
| // $host = explode(".", "Device.WiFi.SSID.1."); | ||
| if (in_array("WiFi", $host)) | ||
| { | ||
| if ($i == $host[3]) | ||
| { |
| } | ||
| else | ||
| { | ||
| $id = getStr("Device.Hosts.HostNumberOfEntries"); |
Comment on lines
+376
to
+379
| $actualTableInstance = getParaValues($rootObjName, $paramNameArray, $mapping_array); | ||
| for ($j=0; $j<$id; $j++) | ||
| { | ||
| if (hasMloSsidMatch($actualTableInstance[$j.toString()], $actualTableInstance[$j.toString()]["__id"], $i)) { | ||
| array_push($at, [$actualTableInstance[$j.toString()]["HostName"], $actualTableInstance[$j.toString()]["PhysAddress"]]/*p2j-array*/); | ||
| $host = explode(".", $actualTableInstance[$j.toString()]["Layer1Interface"]); |
Comment on lines
+379
to
+384
| $host = explode(".", $actualTableInstance[$j.toString()]["Layer1Interface"]); | ||
| // $host = explode(".", "Device.WiFi.SSID.1."); | ||
| if (in_array("WiFi", $host)) | ||
| { | ||
| if ($i == $host[3]) | ||
| { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reverts commit e691cdf.