Skip to content

fix(ui): initialize unconfigured wireless interface to resolve NPE, fix channel selection on hardware tab, fix validation message on empty password [backport release-5.6.0] #5956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MMaiero merged 1 commit into from
Sep 15, 2025
Merged

fix(ui): initialize unconfigured wireless interface to resolve NPE, fix channel selection on hardware tab, fix validation message on empty password [backport release-5.6.0] #5956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
* Copyright (c) 2011, 2025 Eurotech and/or its affiliates and others
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -1820,7 +1820,7 @@ private void updateChannelListValues(List<GwtWifiChannelFrequency> freqChannels)
if (this.activeConfig != null && this.activeConfig.getChannels() != null
&& !this.activeConfig.getChannels().isEmpty()) {
this.netTabs.hardwareTab.channel
.setText(this.channelList.getItemText(this.activeConfig.getChannels().get(0)));
.setText(this.channelList.getItemText(selectedChannelValue));

this.channelList.setSelectedIndex(selectedChannelValue);
}
Expand Down
6 changes: 3 additions & 3 deletions ...lipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2021, 2024 Eurotech and/or its affiliates and others
* Copyright (c) 2021, 2025 Eurotech and/or its affiliates and others
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -51,9 +51,9 @@ private GwtValidators() {
public static List<Validator<String>> newPassword(final GwtConsoleUserOptions userOptions) {

final List<Validator<String>> defaultValidators = Arrays.asList(
nonEmpty(MSGS.pwdEmpty()),
stringLength(255, MSGS.pwdMaxLength()),
noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()),
nonEmpty(MSGS.pwdEmpty()));
noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()));

return Stream
.concat(PasswordStrengthValidators.fromConfig(userOptions, new PasswordStrengthValidators.Messages() {
Expand Down
5 changes: 3 additions & 2 deletions ....kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtWifiNetInterfaceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
* Copyright (c) 2011, 2025 Eurotech and/or its affiliates and others
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -110,7 +110,8 @@ public void setWifiConfig(GwtWifiConfig wifiConfig) {

public GwtWifiConfig getActiveWifiConfig() {
GwtWifiWirelessMode wifiMode = getWirelessModeEnum();
GwtWifiConfig activeConfig = null;
GwtWifiConfig activeConfig = new GwtWifiConfig();
activeConfig.setWirelessMode(wifiMode.name());

if (wifiMode.equals(GwtWifiWirelessMode.netWifiWirelessModeAccessPoint)) {
activeConfig = this.m_accessPointWifiConfig;
Expand Down