From 25ddf05f7fbcc7bd70ed0e79542ad0d3e01b4fd7 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Tue, 10 Dec 2024 12:46:30 +0100
Subject: [PATCH 1/9] feat: first ui implementation of partial snapshot
 download

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../ui/settings/SnapshotDownloadModal.java    | 57 +++++++++++++++++--
 .../ui/settings/SnapshotDownloadModal.ui.xml  | 14 ++---
 .../client/ui/settings/SnapshotsTabUi.java    | 23 ++++++--
 .../web/server/GwtSnapshotServiceImpl.java    | 25 +++++++-
 .../shared/service/GwtSnapshotService.java    |  4 +-
 .../web/client/messages/Messages.properties   |  5 +-
 6 files changed, 106 insertions(+), 22 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 821eb3cd42b..bdb844a1ded 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) 2021 Eurotech and/or its affiliates and others
+ * 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
@@ -12,44 +12,84 @@
  *******************************************************************************/
 package org.eclipse.kura.web.client.ui.settings;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.gwtbootstrap3.client.ui.Button;
-import org.gwtbootstrap3.client.ui.ListBox;
+import org.gwtbootstrap3.client.ui.CheckBox;
 import org.gwtbootstrap3.client.ui.Modal;
 
 import com.google.gwt.core.client.GWT;
 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.ScrollPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 public class SnapshotDownloadModal extends Composite {
 
     private static SnapshotDownloadModalUiBinder uiBinder = GWT.create(SnapshotDownloadModalUiBinder.class);
+    // private static final Logger logger = Logger.getLogger(SnapshotDownloadModal.class.getSimpleName());
 
     interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloadModal> {
     }
 
+    private List<String> snapshotConfigs = new ArrayList<>();
+
+    @UiField
+    ScrollPanel scrollPanel;
     @UiField
     Modal modal;
     @UiField
-    ListBox formatList;
+    Button downloadXml;
     @UiField
-    Button download;
+    Button downloadJson;
+
+    VerticalPanel pidPanel = new VerticalPanel();
 
     private Listener listener = format -> {
     };
 
     public SnapshotDownloadModal() {
+
         initWidget(uiBinder.createAndBindUi(this));
 
-        this.download.addClickHandler(e -> {
+        initPidList();
+
+        initScrollPanel();
+
+        this.downloadJson.addClickHandler(e -> {
+            this.modal.hide();
+            this.listener.onDonwload("TEST");
+        });
+
+        this.downloadXml.addClickHandler(e -> {
             this.modal.hide();
-            this.listener.onDonwload(this.formatList.getSelectedValue());
+            this.listener.onDonwload("TEST");
         });
     }
 
+    private void initPidList() {
+
+        this.pidPanel.clear();
+
+        this.snapshotConfigs.forEach(pid -> {
+            CheckBox box = new CheckBox(pid);
+            this.pidPanel.add(box);
+        });
+    }
+
+    private void initScrollPanel() {
+        this.scrollPanel.setAlwaysShowScrollBars(false);
+        this.scrollPanel.setHeight("500px");
+        this.scrollPanel.clear();
+        this.scrollPanel.add(pidPanel);
+    }
+
     public void show(final Listener listener) {
         this.listener = listener;
+        initPidList();
         this.modal.show();
     }
 
@@ -58,4 +98,9 @@ public interface Listener {
         public void onDonwload(String format);
     }
 
+    public void setSnapshotConfigurations(List<String> configs) {
+        this.snapshotConfigs = configs;
+
+    }
+
 }
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 abdb7b71741..a6b3d834a48 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 @@
 
 <!--
     
-    Copyright (c) 2021 Eurotech and/or its affiliates and others
+    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
@@ -27,19 +27,17 @@
                 <g:FormPanel>
                     <b:FieldSet>
                         <b:FormGroup>
-                            <b.html:Paragraph text="{msgs.deviceSnapshotDownloadModalLabel}" />
-                            <b:ListBox b:id="formatList" ui:field="formatList">
-					          <g:item>XML</g:item>
-					          <g:item>JSON</g:item>
-					        </b:ListBox>
+                            <b.html:Paragraph text="{msgs.deviceSnapshotDownloadModalHint}" />
+                            <g:ScrollPanel ui:field="scrollPanel"></g:ScrollPanel>
                         </b:FormGroup>
                     </b:FieldSet>
                 </g:FormPanel>
             </b:ModalBody>
             <b:ModalFooter>
                 <b:Button addStyleNames="fa" type="PRIMARY" dataDismiss="MODAL" text="{msgs.cancelButton}" />
-                <b:Button addStyleNames="fa" type="PRIMARY" ui:field="download" text="{msgs.download}" />
+                <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadJson" text="{msgs.downloadSnapshotJsonButton}" />
+                <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadXml" text="{msgs.downloadSnapshotXmlButton}" />
             </b:ModalFooter>
         </b:Modal>
 
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder> 
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
index b8aa18f4f36..aa85289e9e6 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2021 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 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
@@ -353,12 +353,25 @@ private void downloadSnapshot(GwtXSRFToken token) {
         final StringBuilder sbUrl = new StringBuilder();
 
         Long snapshot = this.selected.getSnapshotId();
+        this.gwtSnapshotService.getSnapshotConfigurationFromSid(token, snapshot.longValue(),
+                new AsyncCallback<List<String>>() {
 
-        downloadModal.show(format -> {
-            sbUrl.append("/device_snapshots?snapshotId=").append(snapshot).append("&format=").append(format);
+                    @Override
+                    public void onFailure(Throwable ex) {
+                        FailureHandler.handle(ex);
+                    }
 
-            DownloadHelper.instance().startDownload(token, sbUrl.toString());
-        });
+                    @Override
+                    public void onSuccess(List<String> configs) {
+                        downloadModal.setSnapshotConfigurations(configs);
+                        downloadModal.show(format -> {
+                            sbUrl.append("/device_snapshots?snapshotId=").append(snapshot).append("&format=")
+                                    .append(format);
+
+                            DownloadHelper.instance().startDownload(token, sbUrl.toString());
+                        });
+                    }
+                });
 
     }
 
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtSnapshotServiceImpl.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtSnapshotServiceImpl.java
index 5d7c90ad385..bdd69557280 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtSnapshotServiceImpl.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtSnapshotServiceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2021 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 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
@@ -76,4 +76,27 @@ public void rollbackDeviceSnapshot(GwtXSRFToken xsrfToken, GwtSnapshot snapshot)
             KuraExceptionHandler.handle(e);
         }
     }
+
+    @Override
+    public List<String> getSnapshotConfigurationFromSid(GwtXSRFToken xsrfToken, long sid) throws GwtKuraException {
+
+        checkXSRFToken(xsrfToken);
+
+        List<String> configurationList = new ArrayList<>();
+
+        try {
+
+            ServiceLocator locator = ServiceLocator.getInstance();
+            ConfigurationService cs = locator.getService(ConfigurationService.class);
+            cs.getSnapshot(sid).forEach(configuration -> {
+                configurationList.add(configuration.getPid());
+            });
+
+        } catch (Exception e) {
+            KuraExceptionHandler.handle(e);
+        }
+
+        return configurationList;
+
+    }
 }
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtSnapshotService.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtSnapshotService.java
index 100a490c370..27b8b334608 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtSnapshotService.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtSnapshotService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2021 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 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
@@ -30,6 +30,8 @@ public interface GwtSnapshotService extends RemoteService {
 
     public List<GwtSnapshot> findDeviceSnapshots(GwtXSRFToken xsrfToken) throws GwtKuraException;
 
+    public List<String> getSnapshotConfigurationFromSid(GwtXSRFToken xsrfToken, long sid) throws GwtKuraException;
+
     @Audit(componentName = "UI Snapshots", description = "Rollback device snapshot")
     public void rollbackDeviceSnapshot(GwtXSRFToken xsrfToken, GwtSnapshot snapshot) throws GwtKuraException;
 }
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 609f7e36793..e6eb2b6b673 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
@@ -308,7 +308,10 @@ deviceSnapshotCreatedOn=Created On
 deviceSnapshotsNone=No Snapshots Available
 deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous configuration? During the rollback operation, the device will disconnect and reconnect. If a timeout is encountered during the reload of the device configuration, please refresh it manually. 
 deviceSnapshotDownloadModalTitle=Download snapshot
-deviceSnapshotDownloadModalLabel=Select the format to be used for the downloaded snapshot
+deviceSnapshotDownloadModalHint=Download all the snapshot in XML or JSON format
+deviceSnapshotDownloadModalPids=Or select which bundle configurations will be included in the snapshot 
+downloadSnapshotXmlButton=Download as XML
+downloadSnapshotJsonButton=Download as JSON
 
 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 acce55f23ec718a5ab643191b61557e9a70f3e65 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Thu, 12 Dec 2024 11:03:32 +0100
Subject: [PATCH 2/9] feat: working frontend

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../ui/settings/SnapshotDownloadModal.java    | 155 +++++++++++++++---
 .../ui/settings/SnapshotDownloadModal.ui.xml  |  11 ++
 .../client/ui/settings/SnapshotsTabUi.java    |  16 +-
 .../ui/wires/SnapshotDownloadOptions.java     |  30 ++++
 .../kura/web/client/ui/wires/WiresRPC.java    |   5 +-
 .../kura/web/client/util/DownloadHelper.java  |  17 ++
 .../web/client/messages/Messages.properties   |   4 +-
 7 files changed, 205 insertions(+), 33 deletions(-)
 create mode 100644 kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java

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 bdb844a1ded..07bfec9b507 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
@@ -13,13 +13,25 @@
 package org.eclipse.kura.web.client.ui.settings;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
+import org.eclipse.kura.web.client.ui.wires.SnapshotDownloadOptions;
+import org.gwtbootstrap3.client.ui.Anchor;
 import org.gwtbootstrap3.client.ui.Button;
 import org.gwtbootstrap3.client.ui.CheckBox;
+import org.gwtbootstrap3.client.ui.FormLabel;
 import org.gwtbootstrap3.client.ui.Modal;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
@@ -30,77 +42,174 @@
 public class SnapshotDownloadModal extends Composite {
 
     private static SnapshotDownloadModalUiBinder uiBinder = GWT.create(SnapshotDownloadModalUiBinder.class);
-    // private static final Logger logger = Logger.getLogger(SnapshotDownloadModal.class.getSimpleName());
+
+    private static final String SELECT_ALL_PIDS_SELECTION = "Select All Pids";
+    private static final String REMOVE_ALL_PIDS_SELECTION = "Remove All Pids";
+    private static final List<String> DEFAULT_PID_SELECTION = Arrays.asList("org.eclipse.kura.cloud.CloudService",
+            "org.eclipse.kura.internal.rest.provider.RestService",
+            "org.eclipse.kura.net.admin.FirewallConfigurationService",
+            "org.eclipse.kura.net.admin.NetworkConfigurationService",
+            "org.eclipse.kura.net.admin.ipv6.FirewallConfigurationServiceIPv6", "org.eclipse.kura.web.Console");
 
     interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloadModal> {
     }
 
-    private List<String> snapshotConfigs = new ArrayList<>();
-
     @UiField
     ScrollPanel scrollPanel;
     @UiField
+    Anchor resetColumnsAnchor;
+    @UiField
     Modal modal;
     @UiField
     Button downloadXml;
     @UiField
     Button downloadJson;
+    @UiField
+    FormLabel noPidSelectedError;
 
     VerticalPanel pidPanel = new VerticalPanel();
 
-    private Listener listener = format -> {
-    };
+    Consumer<SnapshotDownloadOptions> snapshotDownloadConsumer;
 
     public SnapshotDownloadModal() {
 
         initWidget(uiBinder.createAndBindUi(this));
 
-        initPidList();
+        this.scrollPanel.setVisible(false);
 
-        initScrollPanel();
+        this.noPidSelectedError.setVisible(false);
+        this.noPidSelectedError.setText("Please select at least one pid from the list");
+
+        initResetAnchor();
 
+        initDownloadButtons();
+
+    }
+
+    private void initDownloadButtons() {
         this.downloadJson.addClickHandler(e -> {
-            this.modal.hide();
-            this.listener.onDonwload("TEST");
+            if (isOnePidSelected()) {
+                this.modal.hide();
+                this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("JSON", getSelectedPids()));
+            } else {
+                this.noPidSelectedError.setVisible(true);
+            }
+
         });
 
         this.downloadXml.addClickHandler(e -> {
-            this.modal.hide();
-            this.listener.onDonwload("TEST");
+            if (isOnePidSelected()) {
+                this.modal.hide();
+                this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("XML", getSelectedPids()));
+            } else {
+                this.noPidSelectedError.setVisible(true);
+            }
         });
     }
 
-    private void initPidList() {
+    private void initResetAnchor() {
+        this.resetColumnsAnchor.addClickHandler(new ClickHandler() {
+
+            @Override
+            public void onClick(ClickEvent event) {
+
+                pidPanel.iterator().forEachRemaining(widget -> {
+                    CheckBox checkBox = (CheckBox) widget;
+                    if (DEFAULT_PID_SELECTION.contains(checkBox.getText())) {
+                        checkBox.setValue(true);
+                    } else {
+                        checkBox.setValue(false);
+                    }
+                });
+            }
+        });
+    }
+
+    private void initPidList(List<String> snapshotConfigs) {
 
         this.pidPanel.clear();
 
-        this.snapshotConfigs.forEach(pid -> {
+        List<String> orderedPids = snapshotConfigs.stream().sorted().collect(Collectors.toList());
+        orderedPids.forEach(pid -> {
             CheckBox box = new CheckBox(pid);
             this.pidPanel.add(box);
         });
+
+        CheckBox selectAll = new CheckBox(SELECT_ALL_PIDS_SELECTION);
+        selectAll.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
+
+            @Override
+            public void onValueChange(ValueChangeEvent<Boolean> event) {
+
+                Iterator<Widget> widgetIterator = pidPanel.iterator();
+
+                widgetIterator.forEachRemaining(widget -> {
+
+                    CheckBox checkBox = (CheckBox) widget;
+                    checkBox.setValue(event.getValue());
+
+                    boolean isSelectOrRemoveAll = checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
+                            || checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION);
+
+                    if (isSelectOrRemoveAll && event.getValue().booleanValue()) {
+                        checkBox.setText(REMOVE_ALL_PIDS_SELECTION);
+                    } else if (isSelectOrRemoveAll && !event.getValue().booleanValue()) {
+                        checkBox.setText(SELECT_ALL_PIDS_SELECTION);
+                    }
+                });
+            }
+        });
+
+        this.pidPanel.insert(selectAll, 0);
     }
 
     private void initScrollPanel() {
         this.scrollPanel.setAlwaysShowScrollBars(false);
-        this.scrollPanel.setHeight("500px");
+        this.scrollPanel.setHeight("350px");
         this.scrollPanel.clear();
         this.scrollPanel.add(pidPanel);
+        this.scrollPanel.setVerticalScrollPosition(1);
+        this.scrollPanel.setVisible(true);
     }
 
-    public void show(final Listener listener) {
-        this.listener = listener;
-        initPidList();
-        this.modal.show();
-    }
+    private Optional<List<String>> getSelectedPids() {
+        List<String> selectedPids = new ArrayList<>();
+        this.pidPanel.iterator().forEachRemaining(pid -> {
+            CheckBox checkBox = (CheckBox) pid;
+            if (checkBox.getValue().booleanValue()) {
+                selectedPids.add(checkBox.getText());
+            }
+        });
 
-    public interface Listener {
+        return selectedPids.isEmpty() ? Optional.empty() : Optional.of(selectedPids);
+    }
 
-        public void onDonwload(String format);
+    private boolean isOnePidSelected() {
+        boolean result = false;
+        Iterator<Widget> pidPanelIterator = this.pidPanel.iterator();
+        while (pidPanelIterator.hasNext()) {
+            CheckBox box = (CheckBox) pidPanelIterator.next();
+            if (box.getValue().booleanValue()) {
+                result = true;
+                break;
+            }
+        }
+
+        return result;
     }
 
-    public void setSnapshotConfigurations(List<String> configs) {
-        this.snapshotConfigs = configs;
+    public void show(Consumer<SnapshotDownloadOptions> consumer) {
+        this.snapshotDownloadConsumer = consumer;
+        this.scrollPanel.setVisible(false);
+        this.modal.show();
+    }
 
+    public void show(Consumer<SnapshotDownloadOptions> consumer, List<String> availablePids) {
+        this.snapshotDownloadConsumer = consumer;
+        this.noPidSelectedError.setVisible(false);
+        initPidList(availablePids);
+        initScrollPanel();
+        this.modal.show();
     }
 
 }
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 a6b3d834a48..b03339800f8 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
@@ -22,6 +22,15 @@
 
     <ui:with field="msgs" type="org.eclipse.kura.web.client.messages.Messages" />
 
+	<ui:style>
+		.channel-name-validation-label {
+	        padding-top: 5px;
+	        color: red;
+	        font-size: 0.35cm;
+	        font-weight: normal;
+	    }
+	</ui:style>
+
     <b:Modal closable="false" fade="true" dataBackdrop="STATIC" ui:field="modal" title="{msgs.deviceSnapshotDownloadModalTitle}">
             <b:ModalBody>
                 <g:FormPanel>
@@ -29,9 +38,11 @@
                         <b:FormGroup>
                             <b.html:Paragraph text="{msgs.deviceSnapshotDownloadModalHint}" />
                             <g:ScrollPanel ui:field="scrollPanel"></g:ScrollPanel>
+                            <b:FormLabel addStyleNames="{style.channel-name-validation-label}" ui:field="noPidSelectedError" />
                         </b:FormGroup>
                     </b:FieldSet>
                 </g:FormPanel>
+                <b:Anchor text="{msgs.downloadSnapshotResetSelection}" ui:field="resetColumnsAnchor" />
             </b:ModalBody>
             <b:ModalFooter>
                 <b:Button addStyleNames="fa" type="PRIMARY" dataDismiss="MODAL" text="{msgs.cancelButton}" />
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
index aa85289e9e6..b6580688cf6 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
@@ -363,16 +363,20 @@ public void onFailure(Throwable ex) {
 
                     @Override
                     public void onSuccess(List<String> configs) {
-                        downloadModal.setSnapshotConfigurations(configs);
-                        downloadModal.show(format -> {
+                        downloadModal.show(snapshotDownloadOptions -> {
+
                             sbUrl.append("/device_snapshots?snapshotId=").append(snapshot).append("&format=")
-                                    .append(format);
+                                    .append(snapshotDownloadOptions.getFormat());
 
-                            DownloadHelper.instance().startDownload(token, sbUrl.toString());
-                        });
+                            if (snapshotDownloadOptions.getSelectedPids().isPresent()) {
+                                DownloadHelper.instance().startDownload(token, sbUrl.toString(),
+                                        snapshotDownloadOptions.getSelectedPids().get());
+                            } else {
+                                DownloadHelper.instance().startDownload(token, sbUrl.toString());
+                            }
+                        }, configs);
                     }
                 });
-
     }
 
     private void uploadAndApply() {
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java
new file mode 100644
index 00000000000..152223cf797
--- /dev/null
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java
@@ -0,0 +1,30 @@
+package org.eclipse.kura.web.client.ui.wires;
+
+import java.util.List;
+import java.util.Optional;
+
+public class SnapshotDownloadOptions {
+
+    private String format;
+    private Optional<List<String>> selectedPids;
+
+    public SnapshotDownloadOptions(String format, Optional<List<String>> selectedPids) {
+        super();
+        this.format = format;
+        this.selectedPids = selectedPids;
+    }
+
+    public SnapshotDownloadOptions(String format) {
+        super();
+        this.format = format;
+        this.selectedPids = Optional.empty();
+    }
+
+    public String getFormat() {
+        return this.format;
+    }
+
+    public Optional<List<String>> getSelectedPids() {
+        return selectedPids;
+    }
+}
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
index d1d35ec2a93..2e4a02b4488 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
@@ -219,7 +219,7 @@ public void onSuccess(GwtConfigComponent result) {
         });
     }
 
-    public static void downloadWiresSnapshot(final String format) {
+    public static void downloadWiresSnapshot(final SnapshotDownloadOptions snapshotDownloadOptions) {
         EntryClassUi.showWaitModal();
         gwtXSRFService.generateSecurityToken(new AsyncCallback<GwtXSRFToken>() {
 
@@ -232,7 +232,8 @@ public void onFailure(Throwable ex) {
             @Override
             public void onSuccess(GwtXSRFToken token) {
                 EntryClassUi.hideWaitModal();
-                DownloadHelper.instance().startDownload(token, "/wiresSnapshot?format=" + format);
+                DownloadHelper.instance().startDownload(token,
+                        "/wiresSnapshot?format=" + snapshotDownloadOptions.getFormat());
             }
         });
     }
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
index 29c0ef3f9f8..edad53a8ad0 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
@@ -12,6 +12,9 @@
  *******************************************************************************/
 package org.eclipse.kura.web.client.util;
 
+import java.util.List;
+import java.util.logging.Logger;
+
 import org.eclipse.kura.web.Console;
 import org.eclipse.kura.web.shared.model.GwtXSRFToken;
 
@@ -21,6 +24,8 @@
 
 public final class DownloadHelper {
 
+    private static final Logger logger = Logger.getLogger(DownloadHelper.class.getSimpleName());
+
     private static DownloadHelper instance;
     private Element downloadIframe;
 
@@ -52,6 +57,18 @@ public void startDownload(GwtXSRFToken token, String resource) {
         startDownload(sbUrl.toString());
     }
 
+    public void startDownload(GwtXSRFToken token, String resource, List<String> selectedPids) {
+        final StringBuilder sbUrl = new StringBuilder();
+
+        sbUrl.append(Console.ADMIN_ROOT).append("/").append(GWT.getModuleName()).append(resource)
+                .append(resource.indexOf('?') != -1 ? '&' : '?').append("xsrfToken=")
+                .append(URL.encodeQueryString(token.getToken()));
+
+        logger.info("\n\nPIDS: " + selectedPids + "\n\n");
+
+        startDownload(sbUrl.toString());
+    }
+
     public static DownloadHelper instance() {
         if (instance == null) {
             instance = new DownloadHelper();
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 e6eb2b6b673..32aaae26f0f 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
@@ -308,10 +308,10 @@ deviceSnapshotCreatedOn=Created On
 deviceSnapshotsNone=No Snapshots Available
 deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous configuration? During the rollback operation, the device will disconnect and reconnect. If a timeout is encountered during the reload of the device configuration, please refresh it manually. 
 deviceSnapshotDownloadModalTitle=Download snapshot
-deviceSnapshotDownloadModalHint=Download all the snapshot in XML or JSON format
-deviceSnapshotDownloadModalPids=Or select which bundle configurations will be included in the snapshot 
+deviceSnapshotDownloadModalHint=Chose which service configurations will be included in the downloaded snapshot.
 downloadSnapshotXmlButton=Download as XML
 downloadSnapshotJsonButton=Download as JSON
+downloadSnapshotResetSelection=Reset selection to default
 
 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 d32ecad7c19f1a4d822115078243aaf63427731f Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Fri, 13 Dec 2024 11:28:41 +0100
Subject: [PATCH 3/9] feat: feature completed

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../ui/settings/SnapshotDownloadModal.java    | 148 ++++++++++--------
 .../ui/settings/SnapshotDownloadModal.ui.xml  |  10 +-
 .../client/ui/settings/SnapshotsTabUi.java    |   5 +-
 .../kura/web/client/util/DownloadHelper.java  |   8 +-
 .../servlet/DeviceSnapshotsServlet.java       |  19 ++-
 .../web/client/messages/Messages.properties   |   4 +-
 6 files changed, 121 insertions(+), 73 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 07bfec9b507..f64005192ae 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
@@ -20,18 +20,18 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import org.eclipse.kura.web.client.messages.Messages;
 import org.eclipse.kura.web.client.ui.wires.SnapshotDownloadOptions;
 import org.gwtbootstrap3.client.ui.Anchor;
 import org.gwtbootstrap3.client.ui.Button;
 import org.gwtbootstrap3.client.ui.CheckBox;
 import org.gwtbootstrap3.client.ui.FormLabel;
 import org.gwtbootstrap3.client.ui.Modal;
+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.ClickHandler;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
@@ -42,6 +42,7 @@
 public class SnapshotDownloadModal extends Composite {
 
     private static SnapshotDownloadModalUiBinder uiBinder = GWT.create(SnapshotDownloadModalUiBinder.class);
+    private static final Messages MSGS = GWT.create(Messages.class);
 
     private static final String SELECT_ALL_PIDS_SELECTION = "Select All Pids";
     private static final String REMOVE_ALL_PIDS_SELECTION = "Remove All Pids";
@@ -55,9 +56,11 @@ interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloa
     }
 
     @UiField
-    ScrollPanel scrollPanel;
+    Paragraph downloadModalDescription;
     @UiField
-    Anchor resetColumnsAnchor;
+    ScrollPanel pidSelectionScrollPanel;
+    @UiField
+    Anchor resetPidSelection;
     @UiField
     Modal modal;
     @UiField
@@ -75,21 +78,51 @@ public SnapshotDownloadModal() {
 
         initWidget(uiBinder.createAndBindUi(this));
 
-        this.scrollPanel.setVisible(false);
-
+        this.pidSelectionScrollPanel.setVisible(false);
+        this.resetPidSelection.setVisible(false);
         this.noPidSelectedError.setVisible(false);
         this.noPidSelectedError.setText("Please select at least one pid from the list");
 
-        initResetAnchor();
+    }
 
-        initDownloadButtons();
+    public void show(Consumer<SnapshotDownloadOptions> consumer) {
+        this.snapshotDownloadConsumer = consumer;
+        this.modal.setTitle(MSGS.deviceWiregraphDownloadModalTitle());
+        this.downloadModalDescription.setText(MSGS.deviceWiregraphDownloadModalHint());
+        initWiregraphDownloadButtons();
+        this.modal.show();
+    }
 
+    public void show(Consumer<SnapshotDownloadOptions> consumer, List<String> availablePids) {
+        this.snapshotDownloadConsumer = consumer;
+        this.noPidSelectedError.setVisible(false);
+        this.modal.setTitle(MSGS.deviceSnapshotDownloadModalTitle());
+        this.downloadModalDescription.setText(MSGS.deviceSnapshotDownloadModalHint());
+        initSnapshotPidList(availablePids);
+        initSnapshotScrollPanel();
+        initSnapshotDownloadButtons();
+        initSnapshotResetAnchor();
+        this.modal.show();
     }
 
-    private void initDownloadButtons() {
+    private void initWiregraphDownloadButtons() {
+
+        this.downloadJson.addClickHandler(e -> {
+            this.modal.hide();
+            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("JSON"));
+        });
+
+        this.downloadXml.addClickHandler(e -> {
+            this.modal.hide();
+            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("XML"));
+        });
+    }
+
+    private void initSnapshotDownloadButtons() {
         this.downloadJson.addClickHandler(e -> {
             if (isOnePidSelected()) {
                 this.modal.hide();
+                resetScrollPanel();
                 this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("JSON", getSelectedPids()));
             } else {
                 this.noPidSelectedError.setVisible(true);
@@ -100,6 +133,7 @@ private void initDownloadButtons() {
         this.downloadXml.addClickHandler(e -> {
             if (isOnePidSelected()) {
                 this.modal.hide();
+                resetScrollPanel();
                 this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("XML", getSelectedPids()));
             } else {
                 this.noPidSelectedError.setVisible(true);
@@ -107,76 +141,76 @@ private void initDownloadButtons() {
         });
     }
 
-    private void initResetAnchor() {
-        this.resetColumnsAnchor.addClickHandler(new ClickHandler() {
-
-            @Override
-            public void onClick(ClickEvent event) {
+    private void initSnapshotResetAnchor() {
+        this.resetPidSelection.addClickHandler(event -> {
 
-                pidPanel.iterator().forEachRemaining(widget -> {
-                    CheckBox checkBox = (CheckBox) widget;
-                    if (DEFAULT_PID_SELECTION.contains(checkBox.getText())) {
-                        checkBox.setValue(true);
-                    } else {
-                        checkBox.setValue(false);
-                    }
-                });
-            }
+            pidPanel.iterator().forEachRemaining(widget -> {
+                CheckBox checkBox = (CheckBox) widget;
+                checkBox.setValue(DEFAULT_PID_SELECTION.contains(checkBox.getText()));
+            });
         });
     }
 
-    private void initPidList(List<String> snapshotConfigs) {
+    private void initSnapshotPidList(List<String> snapshotConfigs) {
 
         this.pidPanel.clear();
 
         List<String> orderedPids = snapshotConfigs.stream().sorted().collect(Collectors.toList());
         orderedPids.forEach(pid -> {
             CheckBox box = new CheckBox(pid);
+            box.addClickHandler(this::hideErrorMessageOnSelection);
             this.pidPanel.add(box);
         });
 
-        CheckBox selectAll = new CheckBox(SELECT_ALL_PIDS_SELECTION);
-        selectAll.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
+        CheckBox allChannelsButton = new CheckBox(SELECT_ALL_PIDS_SELECTION);
+        allChannelsButton.addValueChangeHandler(this::selectOrRemoveAllSelection);
+        allChannelsButton.addClickHandler(this::hideErrorMessageOnSelection);
+        this.pidPanel.insert(allChannelsButton, 0);
 
-            @Override
-            public void onValueChange(ValueChangeEvent<Boolean> event) {
+    }
 
-                Iterator<Widget> widgetIterator = pidPanel.iterator();
+    private void hideErrorMessageOnSelection(ClickEvent handler) {
+        if (noPidSelectedError.isVisible()) {
+            noPidSelectedError.setVisible(false);
+        }
+    }
+
+    private void selectOrRemoveAllSelection(ValueChangeEvent<Boolean> event) {
+        Iterator<Widget> widgetIterator = pidPanel.iterator();
 
-                widgetIterator.forEachRemaining(widget -> {
+        widgetIterator.forEachRemaining(widget -> {
 
-                    CheckBox checkBox = (CheckBox) widget;
-                    checkBox.setValue(event.getValue());
+            CheckBox checkBox = (CheckBox) widget;
+            checkBox.setValue(event.getValue());
 
-                    boolean isSelectOrRemoveAll = checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
-                            || checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION);
+            if (checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
+                    || checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION)) {
 
-                    if (isSelectOrRemoveAll && event.getValue().booleanValue()) {
-                        checkBox.setText(REMOVE_ALL_PIDS_SELECTION);
-                    } else if (isSelectOrRemoveAll && !event.getValue().booleanValue()) {
-                        checkBox.setText(SELECT_ALL_PIDS_SELECTION);
-                    }
-                });
+                if (event.getValue().booleanValue()) {
+                    checkBox.setText(REMOVE_ALL_PIDS_SELECTION);
+                } else {
+                    checkBox.setText(SELECT_ALL_PIDS_SELECTION);
+                }
             }
         });
-
-        this.pidPanel.insert(selectAll, 0);
     }
 
-    private void initScrollPanel() {
-        this.scrollPanel.setAlwaysShowScrollBars(false);
-        this.scrollPanel.setHeight("350px");
-        this.scrollPanel.clear();
-        this.scrollPanel.add(pidPanel);
-        this.scrollPanel.setVerticalScrollPosition(1);
-        this.scrollPanel.setVisible(true);
+    private void initSnapshotScrollPanel() {
+        this.pidSelectionScrollPanel.setAlwaysShowScrollBars(false);
+        this.pidSelectionScrollPanel.setHeight("350px");
+        this.pidSelectionScrollPanel.clear();
+        this.pidSelectionScrollPanel.add(pidPanel);
+        this.pidSelectionScrollPanel.setVisible(true);
+
+        this.resetPidSelection.setVisible(true);
     }
 
     private Optional<List<String>> getSelectedPids() {
         List<String> selectedPids = new ArrayList<>();
         this.pidPanel.iterator().forEachRemaining(pid -> {
             CheckBox checkBox = (CheckBox) pid;
-            if (checkBox.getValue().booleanValue()) {
+            if (checkBox.getValue().booleanValue() && !checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
+                    && !checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION)) {
                 selectedPids.add(checkBox.getText());
             }
         });
@@ -198,18 +232,10 @@ private boolean isOnePidSelected() {
         return result;
     }
 
-    public void show(Consumer<SnapshotDownloadOptions> consumer) {
-        this.snapshotDownloadConsumer = consumer;
-        this.scrollPanel.setVisible(false);
-        this.modal.show();
-    }
-
-    public void show(Consumer<SnapshotDownloadOptions> consumer, List<String> availablePids) {
-        this.snapshotDownloadConsumer = consumer;
+    private void resetScrollPanel() {
+        this.pidSelectionScrollPanel.setVerticalScrollPosition(0);
+        this.pidSelectionScrollPanel.setHorizontalScrollPosition(0);
         this.noPidSelectedError.setVisible(false);
-        initPidList(availablePids);
-        initScrollPanel();
-        this.modal.show();
     }
 
 }
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 b03339800f8..64468e9a0b3 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,25 +24,25 @@
 
 	<ui:style>
 		.channel-name-validation-label {
-	        padding-top: 5px;
+	        padding-top: 10px;
 	        color: red;
 	        font-size: 0.35cm;
 	        font-weight: normal;
 	    }
 	</ui:style>
 
-    <b:Modal closable="false" fade="true" dataBackdrop="STATIC" ui:field="modal" title="{msgs.deviceSnapshotDownloadModalTitle}">
+    <b:Modal closable="false" fade="true" dataBackdrop="STATIC" ui:field="modal">
             <b:ModalBody>
                 <g:FormPanel>
                     <b:FieldSet>
                         <b:FormGroup>
-                            <b.html:Paragraph text="{msgs.deviceSnapshotDownloadModalHint}" />
-                            <g:ScrollPanel ui:field="scrollPanel"></g:ScrollPanel>
+                            <b.html:Paragraph ui:field="downloadModalDescription" />
+                            <g:ScrollPanel ui:field="pidSelectionScrollPanel"></g:ScrollPanel>
                             <b:FormLabel addStyleNames="{style.channel-name-validation-label}" ui:field="noPidSelectedError" />
                         </b:FormGroup>
                     </b:FieldSet>
                 </g:FormPanel>
-                <b:Anchor text="{msgs.downloadSnapshotResetSelection}" ui:field="resetColumnsAnchor" />
+                <b:Anchor text="{msgs.downloadSnapshotResetSelection}" ui:field="resetPidSelection" />
             </b:ModalBody>
             <b:ModalFooter>
                 <b:Button addStyleNames="fa" type="PRIMARY" dataDismiss="MODAL" text="{msgs.cancelButton}" />
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
index b6580688cf6..55261ac0683 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/settings/SnapshotsTabUi.java
@@ -350,7 +350,6 @@ public void onSuccess(Void result) {
     }
 
     private void downloadSnapshot(GwtXSRFToken token) {
-        final StringBuilder sbUrl = new StringBuilder();
 
         Long snapshot = this.selected.getSnapshotId();
         this.gwtSnapshotService.getSnapshotConfigurationFromSid(token, snapshot.longValue(),
@@ -365,12 +364,16 @@ public void onFailure(Throwable ex) {
                     public void onSuccess(List<String> configs) {
                         downloadModal.show(snapshotDownloadOptions -> {
 
+                            final StringBuilder sbUrl = new StringBuilder();
+
                             sbUrl.append("/device_snapshots?snapshotId=").append(snapshot).append("&format=")
                                     .append(snapshotDownloadOptions.getFormat());
 
                             if (snapshotDownloadOptions.getSelectedPids().isPresent()) {
+
                                 DownloadHelper.instance().startDownload(token, sbUrl.toString(),
                                         snapshotDownloadOptions.getSelectedPids().get());
+
                             } else {
                                 DownloadHelper.instance().startDownload(token, sbUrl.toString());
                             }
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
index edad53a8ad0..3948953b2fb 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
@@ -60,11 +60,13 @@ public void startDownload(GwtXSRFToken token, String resource) {
     public void startDownload(GwtXSRFToken token, String resource, List<String> selectedPids) {
         final StringBuilder sbUrl = new StringBuilder();
 
+        final StringBuilder sbPids = new StringBuilder();
+        selectedPids.forEach(pid -> sbPids.append(pid + ","));
+        selectedPids.remove(selectedPids.size() - 1);
+
         sbUrl.append(Console.ADMIN_ROOT).append("/").append(GWT.getModuleName()).append(resource)
                 .append(resource.indexOf('?') != -1 ? '&' : '?').append("xsrfToken=")
-                .append(URL.encodeQueryString(token.getToken()));
-
-        logger.info("\n\nPIDS: " + selectedPids + "\n\n");
+                .append(URL.encodeQueryString(token.getToken())).append("&selectedPids=").append(sbPids.toString());
 
         startDownload(sbUrl.toString());
     }
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/DeviceSnapshotsServlet.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/DeviceSnapshotsServlet.java
index a90e558b315..a4b29a4dc48 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/DeviceSnapshotsServlet.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/DeviceSnapshotsServlet.java
@@ -13,7 +13,9 @@
 package org.eclipse.kura.web.server.servlet;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +44,7 @@ public DeviceSnapshotsServlet() {
 
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-            KuraRemoteServiceServlet.requirePermissions(request, Mode.ALL, new String[] { KuraPermission.ADMIN });
+        KuraRemoteServiceServlet.requirePermissions(request, Mode.ALL, new String[] { KuraPermission.ADMIN });
 
         // BEGIN XSRF - Servlet dependent code
 
@@ -63,7 +65,20 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             if (snapshotId != null) {
 
                 long sid = Long.parseLong(snapshotId);
-                List<ComponentConfiguration> configs = cs.getSnapshot(sid);
+
+                List<ComponentConfiguration> configs;
+
+                String optionalSelectedPids = request.getParameter("selectedPids");
+                if (optionalSelectedPids != null) {
+
+                    List<String> selectedPids = Arrays.asList(optionalSelectedPids.split(","));
+                    configs = cs.getSnapshot(sid).stream().filter(config -> {
+                        return selectedPids.contains(config.getPid());
+                    }).collect(Collectors.toList());
+
+                } else {
+                    configs = cs.getSnapshot(sid);
+                }
 
                 GwtServerUtil.writeSnapshot(request, response, configs, "snapshot_" + sid);
 
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 32aaae26f0f..24b6853e582 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
@@ -308,7 +308,9 @@ deviceSnapshotCreatedOn=Created On
 deviceSnapshotsNone=No Snapshots Available
 deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous configuration? During the rollback operation, the device will disconnect and reconnect. If a timeout is encountered during the reload of the device configuration, please refresh it manually. 
 deviceSnapshotDownloadModalTitle=Download snapshot
-deviceSnapshotDownloadModalHint=Chose which service configurations will be included in the downloaded snapshot.
+deviceWiregraphDownloadModalTitle=Download wiregraph
+deviceSnapshotDownloadModalHint=Chose the format and which service configurations will be included in the downloaded snapshot.
+deviceWiregraphDownloadModalHint=Chose in which format the wiregraph will be downloaded.
 downloadSnapshotXmlButton=Download as XML
 downloadSnapshotJsonButton=Download as JSON
 downloadSnapshotResetSelection=Reset selection to default

From 6b6265f1e2cf2c1ede5d21bc6bee829f1a771eb2 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Fri, 13 Dec 2024 11:44:22 +0100
Subject: [PATCH 4/9] feat: updated copyrights

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../client/ui/wires/SnapshotDownloadOptions.java    | 13 +++++++++++++
 .../eclipse/kura/web/client/ui/wires/WiresRPC.java  |  2 +-
 .../kura/web/client/util/DownloadHelper.java        |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java
index 152223cf797..607aa156ecd 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/SnapshotDownloadOptions.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.wires;
 
 import java.util.List;
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
index 2e4a02b4488..bcdcd9f06dc 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/wires/WiresRPC.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2021 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
index 3948953b2fb..8abc22e06e1 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
+++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/DownloadHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 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

From a9d144c821a3e5bf04ef28d10dfac2effe64e5f8 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Fri, 13 Dec 2024 16:04:23 +0100
Subject: [PATCH 5/9] feat: changed anchor and added details

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../ui/settings/SnapshotDownloadModal.java    | 157 ++++++++++--------
 .../ui/settings/SnapshotDownloadModal.ui.xml  |   5 +-
 .../web/client/messages/Messages.properties   |   8 +-
 3 files changed, 95 insertions(+), 75 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 f64005192ae..ba8dd8a681e 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
@@ -13,7 +13,6 @@
 package org.eclipse.kura.web.client.ui.settings;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -31,7 +30,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
@@ -46,11 +45,6 @@ public class SnapshotDownloadModal extends Composite {
 
     private static final String SELECT_ALL_PIDS_SELECTION = "Select All Pids";
     private static final String REMOVE_ALL_PIDS_SELECTION = "Remove All Pids";
-    private static final List<String> DEFAULT_PID_SELECTION = Arrays.asList("org.eclipse.kura.cloud.CloudService",
-            "org.eclipse.kura.internal.rest.provider.RestService",
-            "org.eclipse.kura.net.admin.FirewallConfigurationService",
-            "org.eclipse.kura.net.admin.NetworkConfigurationService",
-            "org.eclipse.kura.net.admin.ipv6.FirewallConfigurationServiceIPv6", "org.eclipse.kura.web.Console");
 
     interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloadModal> {
     }
@@ -60,7 +54,7 @@ interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloa
     @UiField
     ScrollPanel pidSelectionScrollPanel;
     @UiField
-    Anchor resetPidSelection;
+    Anchor selectOrRemoveAllAnchor;
     @UiField
     Modal modal;
     @UiField
@@ -68,10 +62,15 @@ interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloa
     @UiField
     Button downloadJson;
     @UiField
+    Button cancelButton;
+    @UiField
     FormLabel noPidSelectedError;
 
+    boolean areAllPidsSelected = true;
     VerticalPanel pidPanel = new VerticalPanel();
 
+    HandlerRegistration anchorClickHandler;
+
     Consumer<SnapshotDownloadOptions> snapshotDownloadConsumer;
 
     public SnapshotDownloadModal() {
@@ -79,16 +78,17 @@ public SnapshotDownloadModal() {
         initWidget(uiBinder.createAndBindUi(this));
 
         this.pidSelectionScrollPanel.setVisible(false);
-        this.resetPidSelection.setVisible(false);
+        this.selectOrRemoveAllAnchor.setVisible(false);
         this.noPidSelectedError.setVisible(false);
         this.noPidSelectedError.setText("Please select at least one pid from the list");
 
+        this.cancelButton.addClickHandler(this::onCancelClick);
+
     }
 
     public void show(Consumer<SnapshotDownloadOptions> consumer) {
         this.snapshotDownloadConsumer = consumer;
         this.modal.setTitle(MSGS.deviceWiregraphDownloadModalTitle());
-        this.downloadModalDescription.setText(MSGS.deviceWiregraphDownloadModalHint());
         initWiregraphDownloadButtons();
         this.modal.show();
     }
@@ -99,25 +99,47 @@ public void show(Consumer<SnapshotDownloadOptions> consumer, List<String> availa
         this.modal.setTitle(MSGS.deviceSnapshotDownloadModalTitle());
         this.downloadModalDescription.setText(MSGS.deviceSnapshotDownloadModalHint());
         initSnapshotPidList(availablePids);
+        initSnapshotSelectAllAnchor();
         initSnapshotScrollPanel();
         initSnapshotDownloadButtons();
-        initSnapshotResetAnchor();
         this.modal.show();
     }
 
-    private void initWiregraphDownloadButtons() {
+    /*
+     * Snapshot Download Inits
+     */
 
-        this.downloadJson.addClickHandler(e -> {
-            this.modal.hide();
-            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("JSON"));
-        });
+    private void initSnapshotPidList(List<String> snapshotConfigs) {
 
-        this.downloadXml.addClickHandler(e -> {
-            this.modal.hide();
-            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("XML"));
+        this.pidPanel.clear();
+
+        List<String> orderedPids = snapshotConfigs.stream().sorted().collect(Collectors.toList());
+        orderedPids.forEach(pid -> {
+            CheckBox box = new CheckBox(pid);
+            box.setValue(true);
+            box.addClickHandler(this::onCheckboxClick);
+            this.pidPanel.add(box);
         });
     }
 
+    private void initSnapshotSelectAllAnchor() {
+        if (this.anchorClickHandler != null) {
+            this.anchorClickHandler.removeHandler();
+        }
+        this.areAllPidsSelected = true;
+        this.selectOrRemoveAllAnchor.setText(REMOVE_ALL_PIDS_SELECTION);
+        this.anchorClickHandler = this.selectOrRemoveAllAnchor.addClickHandler(this::selectOrRemoveAllSelection);
+        this.selectOrRemoveAllAnchor.setVisible(true);
+    }
+
+    private void initSnapshotScrollPanel() {
+        this.pidSelectionScrollPanel.setAlwaysShowScrollBars(false);
+        this.pidSelectionScrollPanel.setHeight("350px");
+        this.pidSelectionScrollPanel.clear();
+        this.pidSelectionScrollPanel.add(pidPanel);
+        this.pidSelectionScrollPanel.setVisible(true);
+    }
+
     private void initSnapshotDownloadButtons() {
         this.downloadJson.addClickHandler(e -> {
             if (isOnePidSelected()) {
@@ -141,68 +163,41 @@ private void initSnapshotDownloadButtons() {
         });
     }
 
-    private void initSnapshotResetAnchor() {
-        this.resetPidSelection.addClickHandler(event -> {
+    /*
+     * Wiregraph Snapshot Download Inits
+     */
 
-            pidPanel.iterator().forEachRemaining(widget -> {
-                CheckBox checkBox = (CheckBox) widget;
-                checkBox.setValue(DEFAULT_PID_SELECTION.contains(checkBox.getText()));
-            });
-        });
-    }
-
-    private void initSnapshotPidList(List<String> snapshotConfigs) {
-
-        this.pidPanel.clear();
+    private void initWiregraphDownloadButtons() {
 
-        List<String> orderedPids = snapshotConfigs.stream().sorted().collect(Collectors.toList());
-        orderedPids.forEach(pid -> {
-            CheckBox box = new CheckBox(pid);
-            box.addClickHandler(this::hideErrorMessageOnSelection);
-            this.pidPanel.add(box);
+        this.downloadJson.addClickHandler(e -> {
+            this.modal.hide();
+            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("JSON"));
         });
 
-        CheckBox allChannelsButton = new CheckBox(SELECT_ALL_PIDS_SELECTION);
-        allChannelsButton.addValueChangeHandler(this::selectOrRemoveAllSelection);
-        allChannelsButton.addClickHandler(this::hideErrorMessageOnSelection);
-        this.pidPanel.insert(allChannelsButton, 0);
-
+        this.downloadXml.addClickHandler(e -> {
+            this.modal.hide();
+            this.snapshotDownloadConsumer.accept(new SnapshotDownloadOptions("XML"));
+        });
     }
 
-    private void hideErrorMessageOnSelection(ClickEvent handler) {
+    /*
+     * Utils
+     */
+
+    private void onCheckboxClick(ClickEvent handler) {
         if (noPidSelectedError.isVisible()) {
             noPidSelectedError.setVisible(false);
         }
-    }
-
-    private void selectOrRemoveAllSelection(ValueChangeEvent<Boolean> event) {
-        Iterator<Widget> widgetIterator = pidPanel.iterator();
-
-        widgetIterator.forEachRemaining(widget -> {
-
-            CheckBox checkBox = (CheckBox) widget;
-            checkBox.setValue(event.getValue());
 
-            if (checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
-                    || checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION)) {
+        checkAllPidsSelected();
+        updateSelectOrRemoveAllText();
 
-                if (event.getValue().booleanValue()) {
-                    checkBox.setText(REMOVE_ALL_PIDS_SELECTION);
-                } else {
-                    checkBox.setText(SELECT_ALL_PIDS_SELECTION);
-                }
-            }
-        });
     }
 
-    private void initSnapshotScrollPanel() {
-        this.pidSelectionScrollPanel.setAlwaysShowScrollBars(false);
-        this.pidSelectionScrollPanel.setHeight("350px");
-        this.pidSelectionScrollPanel.clear();
-        this.pidSelectionScrollPanel.add(pidPanel);
-        this.pidSelectionScrollPanel.setVisible(true);
-
-        this.resetPidSelection.setVisible(true);
+    private void onCancelClick(ClickEvent handler) {
+        this.modal.hide();
+        resetScrollPanel();
+        this.noPidSelectedError.setVisible(false);
     }
 
     private Optional<List<String>> getSelectedPids() {
@@ -218,6 +213,12 @@ private Optional<List<String>> 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<Widget> pidPanelIterator = this.pidPanel.iterator();
@@ -232,6 +233,26 @@ private boolean isOnePidSelected() {
         return result;
     }
 
+    private void checkAllPidsSelected() {
+        boolean areAllSelected = true;
+        Iterator<Widget> pidPanelIterator = this.pidPanel.iterator();
+        while (pidPanelIterator.hasNext()) {
+            if (!((CheckBox) pidPanelIterator.next()).getValue().booleanValue()) {
+                areAllSelected = false;
+                break;
+            }
+        }
+        this.areAllPidsSelected = areAllSelected;
+    }
+
+    private void updateSelectOrRemoveAllText() {
+        if (this.areAllPidsSelected) {
+            this.selectOrRemoveAllAnchor.setText(REMOVE_ALL_PIDS_SELECTION);
+        } else {
+            this.selectOrRemoveAllAnchor.setText(SELECT_ALL_PIDS_SELECTION);
+        }
+    }
+
     private void resetScrollPanel() {
         this.pidSelectionScrollPanel.setVerticalScrollPosition(0);
         this.pidSelectionScrollPanel.setHorizontalScrollPosition(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 64468e9a0b3..e1e1a213479 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
@@ -42,10 +42,11 @@
                         </b:FormGroup>
                     </b:FieldSet>
                 </g:FormPanel>
-                <b:Anchor text="{msgs.downloadSnapshotResetSelection}" ui:field="resetPidSelection" />
+                <b:Anchor ui:field="selectOrRemoveAllAnchor" />
             </b:ModalBody>
             <b:ModalFooter>
-                <b:Button addStyleNames="fa" type="PRIMARY" dataDismiss="MODAL" text="{msgs.cancelButton}" />
+            	<b.html:Paragraph text="Choose the format in which the file will be downloaded" />
+                <b:Button addStyleNames="fa" type="PRIMARY" ui:field= "cancelButton" text="{msgs.cancelButton}" />
                 <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadJson" text="{msgs.downloadSnapshotJsonButton}" />
                 <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadXml" text="{msgs.downloadSnapshotXmlButton}" />
             </b:ModalFooter>
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 24b6853e582..7efef077702 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
@@ -307,13 +307,11 @@ deviceSnapshotId=Snapshot Id
 deviceSnapshotCreatedOn=Created On
 deviceSnapshotsNone=No Snapshots Available
 deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous configuration? During the rollback operation, the device will disconnect and reconnect. If a timeout is encountered during the reload of the device configuration, please refresh it manually. 
-deviceSnapshotDownloadModalTitle=Download snapshot
-deviceWiregraphDownloadModalTitle=Download wiregraph
-deviceSnapshotDownloadModalHint=Chose the format and which service configurations will be included in the downloaded snapshot.
-deviceWiregraphDownloadModalHint=Chose in which format the wiregraph will be downloaded.
+deviceSnapshotDownloadModalTitle=Snapshot download
+deviceWiregraphDownloadModalTitle=Wiregraph snapshot download
+deviceSnapshotDownloadModalHint=Select pids of the service configurations that will be included in the downloaded snapshot.
 downloadSnapshotXmlButton=Download as XML
 downloadSnapshotJsonButton=Download as JSON
-downloadSnapshotResetSelection=Reset selection to default
 
 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 30a00df1943eefd99982134fa53fe3eb0f29d7f6 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Sun, 15 Dec 2024 22:42:39 +0100
Subject: [PATCH 6/9] Trigger Build


From 34ca13eb5f9df226417660483658e8f9946f35af Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Mon, 16 Dec 2024 17:04:12 +0100
Subject: [PATCH 7/9] feat: refactored both popups

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../ui/settings/SnapshotDownloadModal.java      | 17 ++++++++---------
 .../ui/settings/SnapshotDownloadModal.ui.xml    |  4 ++--
 .../web/client/messages/Messages.properties     |  7 ++++++-
 3 files changed, 16 insertions(+), 12 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 ba8dd8a681e..8f9dbd013a1 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
@@ -43,15 +43,14 @@ public class SnapshotDownloadModal extends Composite {
     private static SnapshotDownloadModalUiBinder uiBinder = GWT.create(SnapshotDownloadModalUiBinder.class);
     private static final Messages MSGS = GWT.create(Messages.class);
 
-    private static final String SELECT_ALL_PIDS_SELECTION = "Select All Pids";
-    private static final String REMOVE_ALL_PIDS_SELECTION = "Remove All Pids";
-
     interface SnapshotDownloadModalUiBinder extends UiBinder<Widget, SnapshotDownloadModal> {
     }
 
     @UiField
     Paragraph downloadModalDescription;
     @UiField
+    Paragraph formatModalHint;
+    @UiField
     ScrollPanel pidSelectionScrollPanel;
     @UiField
     Anchor selectOrRemoveAllAnchor;
@@ -80,7 +79,6 @@ public SnapshotDownloadModal() {
         this.pidSelectionScrollPanel.setVisible(false);
         this.selectOrRemoveAllAnchor.setVisible(false);
         this.noPidSelectedError.setVisible(false);
-        this.noPidSelectedError.setText("Please select at least one pid from the list");
 
         this.cancelButton.addClickHandler(this::onCancelClick);
 
@@ -89,6 +87,7 @@ public SnapshotDownloadModal() {
     public void show(Consumer<SnapshotDownloadOptions> consumer) {
         this.snapshotDownloadConsumer = consumer;
         this.modal.setTitle(MSGS.deviceWiregraphDownloadModalTitle());
+        this.downloadModalDescription.setText(MSGS.deviceWiregraphDownloadModalHint());
         initWiregraphDownloadButtons();
         this.modal.show();
     }
@@ -127,7 +126,7 @@ private void initSnapshotSelectAllAnchor() {
             this.anchorClickHandler.removeHandler();
         }
         this.areAllPidsSelected = true;
-        this.selectOrRemoveAllAnchor.setText(REMOVE_ALL_PIDS_SELECTION);
+        this.selectOrRemoveAllAnchor.setText(MSGS.removeAllAnchorText());
         this.anchorClickHandler = this.selectOrRemoveAllAnchor.addClickHandler(this::selectOrRemoveAllSelection);
         this.selectOrRemoveAllAnchor.setVisible(true);
     }
@@ -204,8 +203,8 @@ private Optional<List<String>> getSelectedPids() {
         List<String> selectedPids = new ArrayList<>();
         this.pidPanel.iterator().forEachRemaining(pid -> {
             CheckBox checkBox = (CheckBox) pid;
-            if (checkBox.getValue().booleanValue() && !checkBox.getText().equals(SELECT_ALL_PIDS_SELECTION)
-                    && !checkBox.getText().equals(REMOVE_ALL_PIDS_SELECTION)) {
+            if (checkBox.getValue().booleanValue() && !checkBox.getText().equals(MSGS.selectAllAnchorText())
+                    && !checkBox.getText().equals(MSGS.removeAllAnchorText())) {
                 selectedPids.add(checkBox.getText());
             }
         });
@@ -247,9 +246,9 @@ private void checkAllPidsSelected() {
 
     private void updateSelectOrRemoveAllText() {
         if (this.areAllPidsSelected) {
-            this.selectOrRemoveAllAnchor.setText(REMOVE_ALL_PIDS_SELECTION);
+            this.selectOrRemoveAllAnchor.setText(MSGS.removeAllAnchorText());
         } else {
-            this.selectOrRemoveAllAnchor.setText(SELECT_ALL_PIDS_SELECTION);
+            this.selectOrRemoveAllAnchor.setText(MSGS.selectAllAnchorText());
         }
     }
 
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 e1e1a213479..32fbabf9091 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
@@ -37,15 +37,15 @@
                     <b:FieldSet>
                         <b:FormGroup>
                             <b.html:Paragraph ui:field="downloadModalDescription" />
+                            <b.html:Paragraph ui:field="formatModalHint" text="{msgs.formatDownloadHint}" />
                             <g:ScrollPanel ui:field="pidSelectionScrollPanel"></g:ScrollPanel>
-                            <b:FormLabel addStyleNames="{style.channel-name-validation-label}" ui:field="noPidSelectedError" />
+                            <b:FormLabel addStyleNames="{style.channel-name-validation-label}" ui:field="noPidSelectedError" text="{msgs.downloadSnapshotError}" />
                         </b:FormGroup>
                     </b:FieldSet>
                 </g:FormPanel>
                 <b:Anchor ui:field="selectOrRemoveAllAnchor" />
             </b:ModalBody>
             <b:ModalFooter>
-            	<b.html:Paragraph text="Choose the format in which the file will be downloaded" />
                 <b:Button addStyleNames="fa" type="PRIMARY" ui:field= "cancelButton" text="{msgs.cancelButton}" />
                 <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadJson" text="{msgs.downloadSnapshotJsonButton}" />
                 <b:Button addStyleNames="fa" type="PRIMARY" ui:field="downloadXml" text="{msgs.downloadSnapshotXmlButton}" />
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 7efef077702..d7e6b882125 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
@@ -309,9 +309,14 @@ deviceSnapshotsNone=No Snapshots Available
 deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous configuration? During the rollback operation, the device will disconnect and reconnect. If a timeout is encountered during the reload of the device configuration, please refresh it manually. 
 deviceSnapshotDownloadModalTitle=Snapshot download
 deviceWiregraphDownloadModalTitle=Wiregraph snapshot download
-deviceSnapshotDownloadModalHint=Select pids of the service configurations that will be included in the downloaded snapshot.
+deviceSnapshotDownloadModalHint=Select the PIDs for the service configurations that will be downloaded locally.
+deviceWiregraphDownloadModalHint=Download partial snapshot containing the configuration of the current wiregraph.
+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
+removeAllAnchorText=Remove All Pids
 
 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 0c3c913746825067812f20b684a097e97513ad53 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Mon, 16 Dec 2024 17:08:43 +0100
Subject: [PATCH 8/9] feat: added japanese translation of messages

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../kura/web/client/messages/Messages_ja.properties  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 5b0d8fa810f..2fcc4465d3d 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
@@ -296,8 +296,16 @@ deviceSnapshotId=スナップショットID
 deviceSnapshotCreatedOn=作成元
 deviceSnapshotsNone=使用可能なスナップショットはありません。
 deviceSnapshotRollbackConfirm=以前の環境設定をロールバックしますか？ロールバック作業中は、デバイスの接続が遮断されます。デバイス環境設定の更新中にタイムアウトになった場合は、手動で更新を行ってください。
-deviceSnapshotDownloadModalTitle=スナップショットをダウンロードする
-deviceSnapshotDownloadModalLabel=ダウンロードしたスナップショットに使用するフォーマットを選択する
+deviceSnapshotDownloadModalTitle=スナップショットダウンロード
+deviceWiregraphDownloadModalTitle=ワイヤーグラフのスナップショットのダウンロード
+deviceSnapshotDownloadModalHint=ローカルでダウンロードするサービス構成の PID を選択します。
+deviceWiregraphDownloadModalHint=現在のワイヤグラフの構成を含む部分的なスナップショットをダウンロードします。
+formatDownloadHint=構成は、JSON または XML 形式でエクスポートできます。
+downloadSnapshotXmlButton=XML としてダウンロード
+downloadSnapshotJsonButton=JSON としてダウンロード
+downloadSnapshotError=リストから少なくとも一つの PID を選択してください
+selectAllAnchorText=すべての Pid を選択します
+removeAllAnchorText=すべての PID を削除する
 
 netIntro=ネットワークインターフェースを選択して設定を変更します。DHCPサーバーとNATはLANの使用が可能なインターフェースに対してのみ設定変更が可能です。変更を適用した際、新しいネットワーク環境設定の内容によっては、ゲートウェイへの接続が遮断される場合があります。
 netInterfaceName=インターフェースの名称

From 9926e056a7e5a5321e64a2beaa7544982a0968b4 Mon Sep 17 00:00:00 2001
From: SimoneFiorani <simone.fiorani@abinsula.com>
Date: Mon, 16 Dec 2024 18:40:10 +0100
Subject: [PATCH 9/9] feat: updated wiregraph hint

Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
---
 .../org/eclipse/kura/web/client/messages/Messages.properties    | 2 +-
 .../org/eclipse/kura/web/client/messages/Messages_ja.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 d7e6b882125..8c23d15c95b 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
@@ -310,7 +310,7 @@ deviceSnapshotRollbackConfirm=Are you sure you want to rollback to a previous co
 deviceSnapshotDownloadModalTitle=Snapshot download
 deviceWiregraphDownloadModalTitle=Wiregraph snapshot download
 deviceSnapshotDownloadModalHint=Select the PIDs for the service configurations that will be downloaded locally.
-deviceWiregraphDownloadModalHint=Download partial snapshot containing the configuration of the current wiregraph.
+deviceWiregraphDownloadModalHint=A partial snapshot containing the current wiregraph configuration will be generated and downloaded.
 formatDownloadHint=The configurations can be exported either as JSON or XML format.
 downloadSnapshotXmlButton=Download as XML
 downloadSnapshotJsonButton=Download as JSON
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 2fcc4465d3d..900f3519d9c 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
@@ -299,7 +299,7 @@ deviceSnapshotRollbackConfirm=以前の環境設定をロールバックしま
 deviceSnapshotDownloadModalTitle=スナップショットダウンロード
 deviceWiregraphDownloadModalTitle=ワイヤーグラフのスナップショットのダウンロード
 deviceSnapshotDownloadModalHint=ローカルでダウンロードするサービス構成の PID を選択します。
-deviceWiregraphDownloadModalHint=現在のワイヤグラフの構成を含む部分的なスナップショットをダウンロードします。
+deviceWiregraphDownloadModalHint=現在の電信構成を含む部分的なスナップショットが生成され、ダウンロードされます。
 formatDownloadHint=構成は、JSON または XML 形式でエクスポートできます。
 downloadSnapshotXmlButton=XML としてダウンロード
 downloadSnapshotJsonButton=JSON としてダウンロード