From 5beb876b6e420f739b8fcf81ba6310cd09ffbc66 Mon Sep 17 00:00:00 2001
From: Arash <arash77.kad@gmail.com>
Date: Mon, 22 Jul 2024 18:07:01 +0200
Subject: [PATCH 1/3] Fix encoding issue in ZipstreamWrapper

---
 lib/galaxy/util/zipstream.py                    | 3 ++-
 lib/galaxy_test/api/test_dataset_collections.py | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy/util/zipstream.py b/lib/galaxy/util/zipstream.py
index 0b23796482be..1cd1c77649e7 100644
--- a/lib/galaxy/util/zipstream.py
+++ b/lib/galaxy/util/zipstream.py
@@ -41,7 +41,8 @@ def response(self) -> Iterator[bytes]:
     def get_headers(self) -> Dict[str, str]:
         headers = {}
         if self.archive_name:
-            headers["Content-Disposition"] = f'attachment; filename="{self.archive_name}.zip"'
+            archive_name = self.archive_name.encode("latin-1", "replace").decode("latin-1")
+            headers["Content-Disposition"] = f'attachment; filename="{archive_name}.zip"'
         if self.upstream_mod_zip:
             headers["X-Archive-Files"] = "zip"
         else:
diff --git a/lib/galaxy_test/api/test_dataset_collections.py b/lib/galaxy_test/api/test_dataset_collections.py
index 85b0652c0259..c9428ad84ffe 100644
--- a/lib/galaxy_test/api/test_dataset_collections.py
+++ b/lib/galaxy_test/api/test_dataset_collections.py
@@ -182,6 +182,14 @@ def test_list_list_list_download(self):
             namelist = archive.namelist()
             assert len(namelist) == 3, f"Expected 3 elements in [{namelist}]"
 
+    def test_download_non_english_characters(self):
+        with self.dataset_populator.test_history() as history_id:
+            name = "دیتاست"
+            payload = self.dataset_collection_populator.create_list_payload(history_id, name=name)
+            hdca_id = self.dataset_populator.fetch(payload, wait=True).json()["outputs"][0]["id"]
+            create_response = self._download_dataset_collection(history_id=history_id, hdca_id=hdca_id)
+            self._assert_status_code_is(create_response, 200)
+
     @requires_new_user
     def test_hda_security(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:

From f745aa7906fc404c7eed9d2c486b99ef2724add9 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Wed, 24 Jul 2024 11:29:40 +0200
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8:=20add=20eye=20icon=20to=20reveal?=
 =?UTF-8?q?=20API=20key=20and=20remove=20mouse=20over=20in=20`APIKeyItem`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/User/APIKey/APIKeyItem.vue   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/src/components/User/APIKey/APIKeyItem.vue b/client/src/components/User/APIKey/APIKeyItem.vue
index dd398af9b979..0ad915b730d0 100644
--- a/client/src/components/User/APIKey/APIKeyItem.vue
+++ b/client/src/components/User/APIKey/APIKeyItem.vue
@@ -1,10 +1,15 @@
 <script setup>
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faEye, faEyeSlash, faKey, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { ref } from "vue";
 import svc from "./model/service";
 import { getGalaxyInstance } from "app";
 import UtcDate from "components/UtcDate";
 import CopyToClipboard from "components/CopyToClipboard";
 
+library.add(faEye, faEyeSlash, faKey, faTrash);
+
 defineProps({
     item: {
         type: Object,
@@ -34,12 +39,7 @@ const deleteKey = () => {
     <b-card title="Current API key">
         <div class="d-flex justify-content-between w-100">
             <div class="w-100">
-                <b-input-group
-                    class="w-100"
-                    @blur="hover = false"
-                    @focus="hover = true"
-                    @mouseover="hover = true"
-                    @mouseleave="hover = false">
+                <b-input-group class="w-100">
                     <b-input-group-prepend>
                         <b-input-group-text>
                             <icon icon="key" />
@@ -59,6 +59,11 @@ const deleteKey = () => {
                                 :text="item.key"
                                 title="Copy key" />
                         </b-input-group-text>
+
+                        <b-button v-b-tooltip.hover title="Show/hide key" @click="hover = !hover">
+                            <FontAwesomeIcon :icon="hover ? faEyeSlash : faEye" />
+                        </b-button>
+
                         <b-button title="Delete api key" @click="toggleDeleteModal">
                             <icon icon="trash" />
                         </b-button>

From c7e1cbfa32cad4e7ab6e3a0200a54d8d5a205435 Mon Sep 17 00:00:00 2001
From: hujambo-dunia <michelle.savage.1@gmail.com>
Date: Wed, 24 Jul 2024 17:00:00 -0400
Subject: [PATCH 3/3] Fix for not-null in 'column_list' object

Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
---
 lib/galaxy/datatypes/tabular.py      | 3 +--
 lib/galaxy/tools/parameters/basic.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py
index 0e3ed9589519..8e975be9797c 100644
--- a/lib/galaxy/datatypes/tabular.py
+++ b/lib/galaxy/datatypes/tabular.py
@@ -1807,7 +1807,7 @@ def set_meta(
             with open(dataset.get_file_name()) as dataset_fh:
                 comment_lines = 0
                 column_headers = None
-                cleaned_column_types = None
+                cleaned_column_types = []
                 number_of_columns = 0
                 for i, line in enumerate(dataset_fh):
                     line = line.strip("\n")
@@ -1815,7 +1815,6 @@ def set_meta(
                         if line.startswith("#h"):
                             column_headers = line.split("\t")[1:]
                         elif line.startswith("#f"):
-                            cleaned_column_types = []
                             for column_type in line.split("\t")[1:]:
                                 if column_type == "Hex":
                                     cleaned_column_types.append("str")
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index 1fe481570601..e385baf0a9f0 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -1512,7 +1512,7 @@ def get_options(self, trans, other_values):
                 except Exception:
                     column_list = self.get_column_list(trans, other_values)
             if self.numerical:  # If numerical was requested, filter columns based on metadata
-                if hasattr(dataset, "metadata") and hasattr(dataset.metadata, "column_types"):
+                if hasattr(dataset, "metadata") and getattr(dataset.metadata, "column_types", None) is not None:
                     if len(dataset.metadata.column_types) >= len(column_list):
                         numerics = [i for i, x in enumerate(dataset.metadata.column_types) if x in ["int", "float"]]
                         column_list = [column_list[i] for i in numerics]