From 23edee8b44778f5d3389c0bb1a6343072eb6a8a7 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Mon, 30 Oct 2023 10:33:48 -0600 Subject: [PATCH 1/6] Adds clear option --- .../templates/views/components/plugins/file-configuration.htm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arches_for_science/templates/views/components/plugins/file-configuration.htm b/arches_for_science/templates/views/components/plugins/file-configuration.htm index 586d59dd6..1c3fa268b 100644 --- a/arches_for_science/templates/views/components/plugins/file-configuration.htm +++ b/arches_for_science/templates/views/components/plugins/file-configuration.htm @@ -38,6 +38,7 @@

{% trans "Uploaded Files" %}

select2Config: { clickBubble: false, disabled: file.details.disabledConfig, + placeholder: 'Select a Configuration', width: 'element', ajax:{ url: $parent.rendererUrl, @@ -46,7 +47,7 @@

{% trans "Uploaded Files" %}

initSelection: $parent.initSelection, value: file.details.rendererConfig, closeOnSelect: true, - allowClear: false, + allowClear: true, multiple: false } }"> From 01bc0eb492b175fe8da2dcd91d6b95b6290e3cd1 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Mon, 30 Oct 2023 10:39:48 -0600 Subject: [PATCH 2/6] adjust sizing slightly --- .../views/components/plugins/file-configuration.htm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arches_for_science/templates/views/components/plugins/file-configuration.htm b/arches_for_science/templates/views/components/plugins/file-configuration.htm index 1c3fa268b..cc2b86e3c 100644 --- a/arches_for_science/templates/views/components/plugins/file-configuration.htm +++ b/arches_for_science/templates/views/components/plugins/file-configuration.htm @@ -1,6 +1,6 @@ {% load i18n %}
-
+

{% trans "Uploaded Files" %}

{% trans "Specify how to process the data files for viewing. Any additional files (such as images) will be automatically displayed if possible." %}
@@ -61,7 +61,7 @@

{% trans "Uploaded Files" %}

-
+

@@ -118,7 +118,7 @@

{% trans "File Preview" %}

-
+
{% block importerConfiguration %}
-
+

@@ -123,14 +123,14 @@

{% trans "File Preview" %}

-
+
{% block importerConfiguration %} diff --git a/arches_for_science/templates/views/components/plugins/importer-configuration.htm b/arches_for_science/templates/views/components/plugins/importer-configuration.htm index 7aad623c0..4898e90b8 100644 --- a/arches_for_science/templates/views/components/plugins/importer-configuration.htm +++ b/arches_for_science/templates/views/components/plugins/importer-configuration.htm @@ -1,19 +1,23 @@ {% load i18n %}
-
{% trans "Importer Configurations" %}
-
{% trans "Define how to import your x/y data" %}
-
- -
- - - - + +
+
{% trans "Importer Configurations" %}
+
{% trans "Define how to import your x/y data" %}
+
+ +
+ + + + +
+
- + +
- -
+
{% trans "Add Importer Configuration" %}
diff --git a/arches_for_science/views/workflows/upload_dataset/select_dataset_files_step.py b/arches_for_science/views/workflows/upload_dataset/select_dataset_files_step.py index 3629614de..1360ef99b 100644 --- a/arches_for_science/views/workflows/upload_dataset/select_dataset_files_step.py +++ b/arches_for_science/views/workflows/upload_dataset/select_dataset_files_step.py @@ -138,7 +138,7 @@ def post(self, request): file_data["renderer"] = next( (renderer["id"] for renderer in settings.RENDERERS if renderer["name"] == "pdfreader"), None ) - elif file_data["name"].split(".")[-1] in settings.INSTRUMENT_FILE_FORMATS: # instrument was given by zip file name + elif file_data["name"].split(".")[-1] in settings.XY_TEXT_FILE_FORMATS: # instrument was given by zip file name file_data["renderer"] = next( (renderer["id"] for renderer in settings.RENDERERS if renderer["name"] == "xy-reader"), None ) From a3ed407f4e6b87f08a5e6171e254ff731dad7258 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Thu, 2 Nov 2023 10:44:09 -0600 Subject: [PATCH 4/6] remove important --- arches_for_science/media/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches_for_science/media/css/project.css b/arches_for_science/media/css/project.css index ec3c4cb3f..ec5136563 100644 --- a/arches_for_science/media/css/project.css +++ b/arches_for_science/media/css/project.css @@ -1406,5 +1406,5 @@ } .uploaded-files table .active-file{ - background-color: #dbf1f5 !important + background-color: #dbf1f5; } \ No newline at end of file From 6509fe95153c0a1c413a8bfe870bd4fcec6dd9ff Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Thu, 2 Nov 2023 10:51:49 -0600 Subject: [PATCH 5/6] specificity fix --- arches_for_science/media/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches_for_science/media/css/project.css b/arches_for_science/media/css/project.css index ec5136563..e50537588 100644 --- a/arches_for_science/media/css/project.css +++ b/arches_for_science/media/css/project.css @@ -1405,6 +1405,6 @@ cursor: pointer; } -.uploaded-files table .active-file{ +#container .uploaded-files table.dataTable.table-striped > tbody > tr.active-file { background-color: #dbf1f5; } \ No newline at end of file From 6a1b62572f3d82bda90828a7bb2946b659b15721 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Thu, 2 Nov 2023 11:06:15 -0600 Subject: [PATCH 6/6] re-fix original issue --- .../templates/views/components/plugins/file-configuration.htm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arches_for_science/templates/views/components/plugins/file-configuration.htm b/arches_for_science/templates/views/components/plugins/file-configuration.htm index 1435941f2..b495f3865 100644 --- a/arches_for_science/templates/views/components/plugins/file-configuration.htm +++ b/arches_for_science/templates/views/components/plugins/file-configuration.htm @@ -47,7 +47,8 @@

{% trans "Uploaded Files" %}

initSelection: $parent.initSelection, value: file.details.rendererConfig, closeOnSelect: true, - allowClear: false, + placeholder: 'Select an Importer', + allowClear: true, multiple: false } }">