From 78e55543901a924de0a6ea320ab5b9f2efe12321 Mon Sep 17 00:00:00 2001
From: Kevin De Pelseneer <kevin.depelseneer@vib.be>
Date: Tue, 28 Nov 2023 20:57:30 +0100
Subject: [PATCH 1/3] Move the instanceName to the single pages show view

---
 app/assets/javascripts/single_page/dynamic_table.js.erb | 1 -
 app/views/single_pages/show.html.erb                    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/single_page/dynamic_table.js.erb b/app/assets/javascripts/single_page/dynamic_table.js.erb
index 94e33bd247..7bf238efcb 100644
--- a/app/assets/javascripts/single_page/dynamic_table.js.erb
+++ b/app/assets/javascripts/single_page/dynamic_table.js.erb
@@ -1,5 +1,4 @@
 <% environment.context_class.instance_eval { include Seek::Util.routes } %>
-  const instanceName = "<%= Seek::Config.instance_name %>";
 
 const rowStatus = {
   new: "new",
diff --git a/app/views/single_pages/show.html.erb b/app/views/single_pages/show.html.erb
index 10a1dd58a3..a0871b3550 100644
--- a/app/views/single_pages/show.html.erb
+++ b/app/views/single_pages/show.html.erb
@@ -67,6 +67,7 @@
 
 <script type="text/javascript">
     var selectedItem = {type:"",id:""}, pid, uid, projectDefaultPolicy, dynamicTableDataPath
+    const instanceName = "<%= Seek::Config.instance_name %>";
 
 		$j(document).ready(function() {
 			  $j("#content .container-fluid").removeClass("container-fluid").addClass("container-fluid-single-page")

From 1f35b3d6e2101174161645f1f47a1707c16511db Mon Sep 17 00:00:00 2001
From: Kevin De Pelseneer <kevin.depelseneer@vib.be>
Date: Wed, 20 Dec 2023 19:11:30 +0100
Subject: [PATCH 2/3] fix bug in isa_assays_form

---
 app/views/isa_assays/_form.html.erb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/isa_assays/_form.html.erb b/app/views/isa_assays/_form.html.erb
index 895043488b..35d5b38d2c 100644
--- a/app/views/isa_assays/_form.html.erb
+++ b/app/views/isa_assays/_form.html.erb
@@ -4,12 +4,14 @@
 input_sample_type_id = params[:isa_assay][:input_sample_type_id] if params.dig(:isa_assay, :input_sample_type_id)
 source_assay = Assay.find(params[:source_assay_id]) if params[:source_assay_id]
 
-if !@isa_assay.assay.new_record?
-  assay_position = source_assay.position
-elsif params[:source_assay_id]
-  assay_position = source_assay.position + 1
+if @isa_assay.assay.new_record?
+  if params[:source_assay_id]
+    assay_position = source_assay.position + 1
+  else
+    assay_position = 0
+  end
 else
-  assay_position = 0
+  assay_position = @isa_assay.assay.position
 end
 
 # assay_position = params[:source_assay_id] ? source_assay.position + 1 : 0

From 5cf41b05962bf516c6513253d46596d23b30e29e Mon Sep 17 00:00:00 2001
From: Kevin De Pelseneer <kevin.depelseneer@vib.be>
Date: Wed, 20 Dec 2023 19:13:11 +0100
Subject: [PATCH 3/3] Fix bug in template attributes schema

---
 lib/seek/isa_templates/template_attributes_schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/seek/isa_templates/template_attributes_schema.json b/lib/seek/isa_templates/template_attributes_schema.json
index d544e6f08d..ceed37ba58 100644
--- a/lib/seek/isa_templates/template_attributes_schema.json
+++ b/lib/seek/isa_templates/template_attributes_schema.json
@@ -62,7 +62,7 @@
 				"Controlled Vocabulary",
 				"URI",
 				"Registered Data file",
-				"ENA collection date"
+				"ENA custom date"
 			]
 		},
 		"CVList": {