From 241091a8c31a7f53ddf04f022ffa2911bbc917ee Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Thu, 19 Dec 2024 09:17:56 +0100 Subject: [PATCH 01/10] feat: added pid filtering searchbox in snapshot download popup Signed-off-by: SimoneFiorani --- .../ui/settings/SnapshotDownloadModal.java | 26 +++++++++++++++++++ .../ui/settings/SnapshotDownloadModal.ui.xml | 10 +++++++ .../web/client/messages/Messages.properties | 1 + 3 files changed, 37 insertions(+) diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java index 8f9dbd013a..12a67071f9 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java @@ -26,10 +26,12 @@ import org.gwtbootstrap3.client.ui.CheckBox; import org.gwtbootstrap3.client.ui.FormLabel; import org.gwtbootstrap3.client.ui.Modal; +import org.gwtbootstrap3.client.ui.TextBox; import org.gwtbootstrap3.client.ui.html.Paragraph; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.KeyUpEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -51,6 +53,8 @@ interface SnapshotDownloadModalUiBinder extends UiBinder consumer, List availa this.noPidSelectedError.setVisible(false); this.modal.setTitle(MSGS.deviceSnapshotDownloadModalTitle()); this.downloadModalDescription.setText(MSGS.deviceSnapshotDownloadModalHint()); + initPidSearch(); initSnapshotPidList(availablePids); initSnapshotSelectAllAnchor(); initSnapshotScrollPanel(); @@ -108,6 +114,12 @@ public void show(Consumer consumer, List availa * Snapshot Download Inits */ + private void initPidSearch() { + this.pidSearch.clear(); + this.pidSearch.setVisible(true); + this.pidSearch.addKeyUpHandler(this::onSearchBoxEvent); + } + private void initSnapshotPidList(List snapshotConfigs) { this.pidPanel.clear(); @@ -183,6 +195,20 @@ private void initWiregraphDownloadButtons() { * Utils */ + private void onSearchBoxEvent(KeyUpEvent event) { + TextBox searchBox = (TextBox) event.getSource(); + String searchedPid = searchBox.getValue(); + + if (searchedPid == null || searchedPid.isEmpty() || searchedPid.equals("")) { + this.pidPanel.iterator().forEachRemaining(widget -> widget.setVisible(true)); + } else { + this.pidPanel.iterator().forEachRemaining(widget -> { + CheckBox box = (CheckBox) widget; + box.setVisible(box.getText().toLowerCase().contains(searchedPid.toLowerCase())); + }); + } + } + private void onCheckboxClick(ClickEvent handler) { if (noPidSelectedError.isVisible()) { noPidSelectedError.setVisible(false); diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml index 32fbabf909..cb43796009 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml @@ -29,6 +29,12 @@ font-size: 0.35cm; font-weight: normal; } + .small-spacing { + padding-bottom: 10px; + } + .big-spacing { + padding-bottom: 20px; + } @@ -38,6 +44,10 @@ + + + diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties index a8a4bb16ca..f78c1a0193 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties @@ -317,6 +317,7 @@ downloadSnapshotJsonButton=Download as JSON downloadSnapshotError=Please select at least one pid from the list selectAllAnchorText=Select All Pids removeAllAnchorText=Remove All Pids +snapshotDownloadSearchBoxPlaceholder=Filter pids by name... netIntro=Select a Network Interface and configure it. DHCP Server and NAT can be configured only for interfaces enabled for LAN usage. When applying your changes, your connection to the gateway may be lost depending on your network configuration changes. netInterfaceName=Interface Name From a4afc89dc64164f928a5a381624f04bd7d392a42 Mon Sep 17 00:00:00 2001 From: sfiorani <109297780+sfiorani@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:23:00 +0100 Subject: [PATCH 02/10] Update SnapshotDownloadModal.ui.xml --- .../ui/settings/SnapshotDownloadModal.ui.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml index cb43796009..a6422af47a 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml @@ -24,17 +24,17 @@ .channel-name-validation-label { - padding-top: 10px; - color: red; - font-size: 0.35cm; - font-weight: normal; - } - .small-spacing { - padding-bottom: 10px; - } - .big-spacing { - padding-bottom: 20px; + padding-top: 10px; + color: red; + font-size: 0.35cm; + font-weight: normal; + } + .small-spacing { + padding-bottom: 10px; } + .big-spacing { + padding-bottom: 20px; + } @@ -46,8 +46,8 @@ - + ui:field="pidSearch" addStyleNames="services-search" /> + From d026a81ed85ff73f4f97704530fbd35be33b4656 Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Mon, 23 Dec 2024 17:33:43 +0100 Subject: [PATCH 03/10] feat: refactored anchor, added selected pid counter Signed-off-by: SimoneFiorani --- .../PartialSnapshotCheckboxStatus.java | 26 ++++ .../ui/settings/SnapshotDownloadModal.java | 125 +++++++++++++++--- .../ui/settings/SnapshotDownloadModal.ui.xml | 37 ++++-- .../web/client/messages/Messages.properties | 2 + .../client/messages/Messages_ja.properties | 3 + 5 files changed, 166 insertions(+), 27 deletions(-) create mode 100644 kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java new file mode 100644 index 0000000000..b7f3dc81e5 --- /dev/null +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java @@ -0,0 +1,26 @@ +package org.eclipse.kura.web.client.ui.settings; + +public enum PartialSnapshotCheckboxStatus { + + ALL_VISIBLE_ALL_SELECTED, + ALL_VISIBLE_PARTIAL_SELECTED, + PARTIAL_VISIBLE_ALL_SELECTED, + PARTIAL_VISIBLE_PARTIAL_SELECTED; + + public static PartialSnapshotCheckboxStatus fromVisibleAndSelectedStatus(boolean allVisible, boolean allSelected) { + if (allVisible) { + if (allSelected) { + return PartialSnapshotCheckboxStatus.ALL_VISIBLE_ALL_SELECTED; + } else { + return PartialSnapshotCheckboxStatus.ALL_VISIBLE_PARTIAL_SELECTED; + } + } else { + if (allSelected) { + return PartialSnapshotCheckboxStatus.PARTIAL_VISIBLE_ALL_SELECTED; + } else { + return PartialSnapshotCheckboxStatus.PARTIAL_VISIBLE_PARTIAL_SELECTED; + } + } + } + +} diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java index 12a67071f9..f5ca958ca6 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java @@ -36,6 +36,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -53,8 +54,12 @@ interface SnapshotDownloadModalUiBinder extends UiBinder consumer) { public void show(Consumer consumer, List availablePids) { this.snapshotDownloadConsumer = consumer; this.noPidSelectedError.setVisible(false); + this.searchBoxSeparatorSmall.setVisible(true); + this.searchBoxSeparatorBig.setVisible(true); this.modal.setTitle(MSGS.deviceSnapshotDownloadModalTitle()); this.downloadModalDescription.setText(MSGS.deviceSnapshotDownloadModalHint()); initPidSearch(); @@ -107,6 +118,7 @@ public void show(Consumer consumer, List availa initSnapshotSelectAllAnchor(); initSnapshotScrollPanel(); initSnapshotDownloadButtons(); + initSelectedPidCounter(); this.modal.show(); } @@ -137,9 +149,8 @@ private void initSnapshotSelectAllAnchor() { if (this.anchorClickHandler != null) { this.anchorClickHandler.removeHandler(); } - this.areAllPidsSelected = true; this.selectOrRemoveAllAnchor.setText(MSGS.removeAllAnchorText()); - this.anchorClickHandler = this.selectOrRemoveAllAnchor.addClickHandler(this::selectOrRemoveAllSelection); + this.anchorClickHandler = this.selectOrRemoveAllAnchor.addClickHandler(this::onSelectOrRemoveAllSelection); this.selectOrRemoveAllAnchor.setVisible(true); } @@ -174,6 +185,11 @@ private void initSnapshotDownloadButtons() { }); } + private void initSelectedPidCounter() { + updateSelectedPidsCounter(); + this.selectedPidCounter.setVisible(true); + } + /* * Wiregraph Snapshot Download Inits */ @@ -192,7 +208,7 @@ private void initWiregraphDownloadButtons() { } /* - * Utils + * OnEvents Methods */ private void onSearchBoxEvent(KeyUpEvent event) { @@ -207,6 +223,12 @@ private void onSearchBoxEvent(KeyUpEvent event) { box.setVisible(box.getText().toLowerCase().contains(searchedPid.toLowerCase())); }); } + + if (this.noPidSelectedError.isVisible()) { + this.noPidSelectedError.setVisible(false); + } + + updateSelectOrRemoveAllText(checkPidsCheckboxStates()); } private void onCheckboxClick(ClickEvent handler) { @@ -214,8 +236,8 @@ private void onCheckboxClick(ClickEvent handler) { noPidSelectedError.setVisible(false); } - checkAllPidsSelected(); - updateSelectOrRemoveAllText(); + updateSelectOrRemoveAllText(checkPidsCheckboxStates()); + updateSelectedPidsCounter(); } @@ -225,6 +247,41 @@ private void onCancelClick(ClickEvent handler) { this.noPidSelectedError.setVisible(false); } + private void onSelectOrRemoveAllSelection(ClickEvent handler) { + PartialSnapshotCheckboxStatus state = checkPidsCheckboxStates(); + switch (state) { + case ALL_VISIBLE_ALL_SELECTED: + case PARTIAL_VISIBLE_ALL_SELECTED: { + pidPanel.iterator().forEachRemaining(widget -> { + if (widget.isVisible()) { + ((CheckBox) widget).setValue(false); + } + }); + break; + } + + case ALL_VISIBLE_PARTIAL_SELECTED: + case PARTIAL_VISIBLE_PARTIAL_SELECTED: + pidPanel.iterator().forEachRemaining(widget -> { + if (widget.isVisible()) { + ((CheckBox) widget).setValue(true); + } + }); + break; + } + + updateSelectOrRemoveAllText(checkPidsCheckboxStates()); + updateSelectedPidsCounter(); + + if (this.noPidSelectedError.isVisible()) { + this.noPidSelectedError.setVisible(false); + } + } + + /* + * Utils + */ + private Optional> getSelectedPids() { List selectedPids = new ArrayList<>(); this.pidPanel.iterator().forEachRemaining(pid -> { @@ -238,12 +295,6 @@ private Optional> getSelectedPids() { return selectedPids.isEmpty() ? Optional.empty() : Optional.of(selectedPids); } - private void selectOrRemoveAllSelection(ClickEvent handler) { - pidPanel.iterator().forEachRemaining(widget -> ((CheckBox) widget).setValue(!this.areAllPidsSelected)); - this.areAllPidsSelected = !this.areAllPidsSelected; - updateSelectOrRemoveAllText(); - } - private boolean isOnePidSelected() { boolean result = false; Iterator pidPanelIterator = this.pidPanel.iterator(); @@ -258,23 +309,43 @@ private boolean isOnePidSelected() { return result; } - private void checkAllPidsSelected() { + private PartialSnapshotCheckboxStatus checkPidsCheckboxStates() { + boolean areAllVisible = true; boolean areAllSelected = true; + Iterator pidPanelIterator = this.pidPanel.iterator(); while (pidPanelIterator.hasNext()) { - if (!((CheckBox) pidPanelIterator.next()).getValue().booleanValue()) { + Widget widget = pidPanelIterator.next(); + if (!widget.isVisible()) { + areAllVisible = false; + } + + if (widget.isVisible() && !((CheckBox) widget).getValue().booleanValue()) { areAllSelected = false; - break; } } - this.areAllPidsSelected = areAllSelected; + + return PartialSnapshotCheckboxStatus.fromVisibleAndSelectedStatus(areAllVisible, areAllSelected); } - private void updateSelectOrRemoveAllText() { - if (this.areAllPidsSelected) { + private void updateSelectOrRemoveAllText(PartialSnapshotCheckboxStatus state) { + + switch (state) { + case ALL_VISIBLE_ALL_SELECTED: this.selectOrRemoveAllAnchor.setText(MSGS.removeAllAnchorText()); - } else { + break; + + case ALL_VISIBLE_PARTIAL_SELECTED: this.selectOrRemoveAllAnchor.setText(MSGS.selectAllAnchorText()); + break; + + case PARTIAL_VISIBLE_ALL_SELECTED: + this.selectOrRemoveAllAnchor.setText(MSGS.removeAllVisibleAnchorText()); + break; + + case PARTIAL_VISIBLE_PARTIAL_SELECTED: + this.selectOrRemoveAllAnchor.setText(MSGS.selectAllVisibleAnchorText()); + break; } } @@ -284,4 +355,20 @@ private void resetScrollPanel() { this.noPidSelectedError.setVisible(false); } + private void updateSelectedPidsCounter() { + + int selectedPids = 0; + + Iterator pidPanelIterator = this.pidPanel.iterator(); + while (pidPanelIterator.hasNext()) { + if (((CheckBox) pidPanelIterator.next()).getValue().booleanValue()) { + selectedPids++; + } + } + + StringBuilder counterTextBuilder = new StringBuilder("Pids Selected ").append(selectedPids).append("/") + .append(this.pidPanel.getWidgetCount()); + + this.selectedPidCounter.setText(counterTextBuilder.toString()); + } } diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml index a6422af47a..99ec095831 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml @@ -28,13 +28,31 @@ color: red; font-size: 0.35cm; font-weight: normal; - } - .small-spacing { + } + .small-spacing { padding-bottom: 10px; } - .big-spacing { + .big-spacing { padding-bottom: 20px; - } + } + + .text-button { + background: none; + border: none; + color: blue; + text-decoration: underline; + cursor: pointer; + float: left; + } + + .right-label { + margin-left: auto; + float: right; + font-weight: bold; + } + .horizontal-panel { + width: 100%; + } @@ -44,16 +62,19 @@ - + - + ui:field="pidSearch" addStyleNames="services-search" /> + - + + + + diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties index f78c1a0193..fb1010e0f2 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties @@ -316,7 +316,9 @@ downloadSnapshotXmlButton=Download as XML downloadSnapshotJsonButton=Download as JSON downloadSnapshotError=Please select at least one pid from the list selectAllAnchorText=Select All Pids +selectAllVisibleAnchorText=Select All Visible Pids removeAllAnchorText=Remove All Pids +removeAllVisibleAnchorText=Remove All Visible Pids snapshotDownloadSearchBoxPlaceholder=Filter pids by name... netIntro=Select a Network Interface and configure it. DHCP Server and NAT can be configured only for interfaces enabled for LAN usage. When applying your changes, your connection to the gateway may be lost depending on your network configuration changes. diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties index 98527c1b1b..7eb4df92d1 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties @@ -305,7 +305,10 @@ downloadSnapshotXmlButton=XML としてダウンロード downloadSnapshotJsonButton=JSON としてダウンロード downloadSnapshotError=リストから少なくとも一つの PID を選択してください selectAllAnchorText=すべての Pid を選択します +selectAllVisibleAnchorText=すべての可視 PID を選択 removeAllAnchorText=すべての PID を削除する +removeAllVisibleAnchorText=すべての目に見える PID を取除いて下さい +snapshotDownloadSearchBoxPlaceholder=名前でピドをフィルター... netIntro=ネットワークインターフェースを選択して設定を変更します。DHCPサーバーとNATはLANの使用が可能なインターフェースに対してのみ設定変更が可能です。変更を適用した際、新しいネットワーク環境設定の内容によっては、ゲートウェイへの接続が遮断される場合があります。 netInterfaceName=インターフェースの名称 From 88e0e14f9fe7e9624ad541bf1e132d3e30c75c95 Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Fri, 27 Dec 2024 08:21:06 +0100 Subject: [PATCH 04/10] Trigger Build From 147880fe3603438cb3120f6326a102526a1cd8c1 Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Fri, 27 Dec 2024 11:43:53 +0100 Subject: [PATCH 05/10] fix: fixed wrong visible and selected check method Signed-off-by: SimoneFiorani --- .../web/client/ui/settings/SnapshotDownloadModal.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java index f5ca958ca6..f393cacef1 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java @@ -313,15 +313,17 @@ private PartialSnapshotCheckboxStatus checkPidsCheckboxStates() { boolean areAllVisible = true; boolean areAllSelected = true; - Iterator pidPanelIterator = this.pidPanel.iterator(); - while (pidPanelIterator.hasNext()) { - Widget widget = pidPanelIterator.next(); + for (Widget widget : pidPanel) { if (!widget.isVisible()) { areAllVisible = false; + break; } + } + for (Widget widget : pidPanel) { if (widget.isVisible() && !((CheckBox) widget).getValue().booleanValue()) { areAllSelected = false; + break; } } From 8a92dd87727c41d5bbc3e63f6b55b2ea8d17abc4 Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Tue, 7 Jan 2025 10:00:25 +0100 Subject: [PATCH 06/10] feat: updated copyright and messages Signed-off-by: SimoneFiorani --- .../ui/settings/PartialSnapshotCheckboxStatus.java | 13 +++++++++++++ .../client/ui/settings/SnapshotDownloadModal.java | 2 +- .../kura/web/client/messages/Messages.properties | 12 ++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java index b7f3dc81e5..3d69e53fef 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2024 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 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Eurotech + *******************************************************************************/ + package org.eclipse.kura.web.client.ui.settings; public enum PartialSnapshotCheckboxStatus { diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java index f393cacef1..38527e8bef 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java @@ -368,7 +368,7 @@ private void updateSelectedPidsCounter() { } } - StringBuilder counterTextBuilder = new StringBuilder("Pids Selected ").append(selectedPids).append("/") + StringBuilder counterTextBuilder = new StringBuilder("PIDs Selected ").append(selectedPids).append("/") .append(this.pidPanel.getWidgetCount()); this.selectedPidCounter.setText(counterTextBuilder.toString()); diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties index fb1010e0f2..6f45777122 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties @@ -314,12 +314,12 @@ deviceWiregraphDownloadModalHint=A partial snapshot containing the current wireg formatDownloadHint=The configurations can be exported either as JSON or XML format. downloadSnapshotXmlButton=Download as XML downloadSnapshotJsonButton=Download as JSON -downloadSnapshotError=Please select at least one pid from the list -selectAllAnchorText=Select All Pids -selectAllVisibleAnchorText=Select All Visible Pids -removeAllAnchorText=Remove All Pids -removeAllVisibleAnchorText=Remove All Visible Pids -snapshotDownloadSearchBoxPlaceholder=Filter pids by name... +downloadSnapshotError=Please select at least one PID from the list +selectAllAnchorText=Select All PIDs +selectAllVisibleAnchorText=Select All Visible PIDs +removeAllAnchorText=Remove All PIDs +removeAllVisibleAnchorText=Remove All Visible PIDs +snapshotDownloadSearchBoxPlaceholder=Filter PIDs by name... netIntro=Select a Network Interface and configure it. DHCP Server and NAT can be configured only for interfaces enabled for LAN usage. When applying your changes, your connection to the gateway may be lost depending on your network configuration changes. netInterfaceName=Interface Name From 7199e9509ca3a4188adfb638fba22252005f8e7d Mon Sep 17 00:00:00 2001 From: SimoneFiorani Date: Tue, 7 Jan 2025 10:38:11 +0100 Subject: [PATCH 07/10] feat: updated copyrights to 2025 Signed-off-by: SimoneFiorani --- .../web/client/ui/settings/PartialSnapshotCheckboxStatus.java | 2 +- .../kura/web/client/ui/settings/SnapshotDownloadModal.java | 2 +- .../kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml | 2 +- .../org/eclipse/kura/web/client/messages/Messages.properties | 2 +- .../eclipse/kura/web/client/messages/Messages_ja.properties | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java index 3d69e53fef..443654a139 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/PartialSnapshotCheckboxStatus.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Eurotech and/or its affiliates and others + * Copyright (c) 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 diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java index 38527e8bef..aadefc1fb7 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Eurotech and/or its affiliates and others + * Copyright (c) 2024, 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 diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml index 99ec095831..9e042ad8bb 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotDownloadModal.ui.xml @@ -2,7 +2,7 @@