Merge branch 'issue_1675_move_instance_name_from_static_js' into dev_…

…PR_1704_1707

Merge PR 1707: Couple of small bugfixes:

- Move reference to seek instance name from the static JS file to the dynamic view
- Fix Isa assays bug
- Fix bug in template attribute schema

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",

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

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")

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": {