From 507f6a472902f6f67a0952c8e88bc704df31064f Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Sat, 9 Jan 2021 10:56:37 +0100
Subject: [PATCH 1/2] Revert "Allow setting filename_pattern by client"

---
 lib/galaxy/datatypes/data.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
index 69034ec8eac..b43f22c2b08 100644
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -438,7 +438,7 @@ class Data(metaclass=DataMeta):
                 return self._archive_composite_dataset(trans, data, do_action=kwd.get('do_action', 'zip'))
             else:
                 trans.response.headers['Content-Length'] = int(os.stat(data.file_name).st_size)
-                filename = self._download_filename(data, to_ext, hdca=kwd.get("hdca"), element_identifier=kwd.get("element_identifier"), filename_pattern=kwd.get("filename_pattern"))
+                filename = self._download_filename(data, to_ext, hdca=kwd.get("hdca"), element_identifier=kwd.get("element_identifier"))
                 trans.response.set_content_type("application/octet-stream")  # force octet-stream so Safari doesn't append mime extensions to filename
                 trans.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % filename
                 return open(data.file_name, 'rb')
@@ -501,7 +501,7 @@ class Data(metaclass=DataMeta):
 
         return open(filename, mode='rb')
 
-    def _download_filename(self, dataset, to_ext, hdca=None, element_identifier=None, filename_pattern=None):
+    def _download_filename(self, dataset, to_ext, hdca=None, element_identifier=None):
         def escape(raw_identifier):
             return ''.join(c in FILENAME_VALID_CHARS and c or '_' for c in raw_identifier)[0:150]
 
@@ -516,11 +516,7 @@ class Data(metaclass=DataMeta):
             "hid": dataset.hid,
         }
 
-        if not filename_pattern:
-            if hdca is None:
-                filename_pattern = DOWNLOAD_FILENAME_PATTERN_DATASET
-            else:
-                filename_pattern = DOWNLOAD_FILENAME_PATTERN_COLLECTION_ELEMENT
+        filename_pattern = DOWNLOAD_FILENAME_PATTERN_DATASET
 
         if hdca is not None:
             # Use collection context to build up filename.
@@ -528,6 +524,8 @@ class Data(metaclass=DataMeta):
             template_values["hdca_name"] = escape(hdca.name)
             template_values["hdca_hid"] = hdca.hid
 
+            filename_pattern = DOWNLOAD_FILENAME_PATTERN_COLLECTION_ELEMENT
+
         return string.Template(filename_pattern).substitute(**template_values)
 
     def display_name(self, dataset):

From 9a4c60b8509918d3d7929a3ddf9022855eb80e24 Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Mon, 11 Jan 2021 14:24:57 +0200
Subject: [PATCH 2/2] fix library type

---
 client/src/components/LibraryFolder/LibraryFolder.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/components/LibraryFolder/LibraryFolder.vue b/client/src/components/LibraryFolder/LibraryFolder.vue
index eaa71910a2e..3a1d3182738 100644
--- a/client/src/components/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/LibraryFolder/LibraryFolder.vue
@@ -133,6 +133,10 @@
                     <font-awesome-icon v-if="row.item.type === 'folder'" :icon="['far', 'folder']" title="Folder" />
                     <font-awesome-icon v-else-if="row.item.type === 'file'" title="Dataset" :icon="['far', 'file']" />
                 </template>
+                <template v-slot:cell(type)="row">
+                    <div v-if="row.item.type === 'folder'">{{ row.item.type }}</div>
+                    <div v-else-if="row.item.type === 'file'">{{ row.item.file_ext }}</div>
+                </template>
                 <template v-slot:cell(raw_size)="row">
                     <div v-if="row.item.type === 'file'" v-html="bytesToString(row.item.raw_size)"></div>
                 </template>