-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into rails-7-hacking-rebased
- Loading branch information
Showing
12 changed files
with
569 additions
and
296 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| $j('#samples-table').html('<%= escape_javascript(render(partial: "table_view", locals: { samples: @result, link: true, show_extra_info: true })) -%>'); | ||
| $j('#sample-count').html('<%= "#{@visible_samples} sample(s) visible to you" %>') | ||
| $j('#sample-count').html('<span><%= "#{@visible_samples}"%> sample(s) visible to you' + '</span> - <span class=\"text-success\"> Successful query @ <%= "#{Time.now.strftime("%d/%m/%Y %H:%M:%S")}" %></span>') | ||
| Samples.initTable($j('#samples-table'), false, { hideEmptyColumns: true }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
248 changes: 138 additions & 110 deletions
248
lib/seek/isa_templates/template_attributes_schema.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,112 +1,140 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "ISA tempalte attribute schema", | ||
| "description": "JSON-schema representing an ISA template attribute in DataHub", | ||
| "type": "object", | ||
| "properties": { | ||
| "iri": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "string", | ||
| "format": "uri" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "name": { "type": "string" }, | ||
| "description": { "type": "string" }, | ||
| "required": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "boolean" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "ontology": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "object", | ||
| "properties": { | ||
| "name": { "type": "string" }, | ||
| "version": { | ||
| "anyOf": [{ "type": "string" }, { "type": "number" }] | ||
| }, | ||
| "description": { "type": "string" }, | ||
| "rootTermURI": { "type": "string", "format": "uri" } | ||
| } | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "dataType": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Date time", | ||
| "Date", | ||
| "Real number", | ||
| "Integer", | ||
| "Web link", | ||
| "Email address", | ||
| "Text", | ||
| "String", | ||
| "Boolean", | ||
| "Registered Sample", | ||
| "Registered Sample List", | ||
| "Controlled Vocabulary", | ||
| "URI", | ||
| "Registered Data file", | ||
| "ENA custom date" | ||
| ] | ||
| }, | ||
| "CVList": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "array" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "isaTag": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "string", | ||
| "enum": [ | ||
| "source", | ||
| "sample", | ||
| "protocol", | ||
| "source_characteristic", | ||
| "sample_characteristic", | ||
| "other_material", | ||
| "other_material_characteristic", | ||
| "data_file", | ||
| "data_file_comment", | ||
| "parameter_value" | ||
| ] | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "title": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "boolean" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "additionalProperties": false | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "ISA tempalte attribute schema", | ||
| "description": "JSON-schema representing an ISA template attribute in DataHub", | ||
| "type": "object", | ||
| "properties": { | ||
| "iri": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "string", | ||
| "format": "uri" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "required": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "boolean" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "ontology": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "object", | ||
| "properties": { | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "version": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "type": "number" | ||
| } | ||
| ] | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "rootTermURI": { | ||
| "type": "string", | ||
| "format": "uri" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "dataType": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Date time", | ||
| "Date", | ||
| "Real number", | ||
| "Integer", | ||
| "Web link", | ||
| "Email address", | ||
| "Text", | ||
| "String", | ||
| "Boolean", | ||
| "Registered Sample", | ||
| "Registered Sample List", | ||
| "Controlled Vocabulary", | ||
| "URI", | ||
| "Registered Data file", | ||
| "ENA custom date" | ||
| ] | ||
| }, | ||
| "allowCVFreeText": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "boolean" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "CVList": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "array" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "isaTag": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "string", | ||
| "enum": [ | ||
| "source", | ||
| "sample", | ||
| "protocol", | ||
| "source_characteristic", | ||
| "sample_characteristic", | ||
| "other_material", | ||
| "other_material_characteristic", | ||
| "data_file", | ||
| "data_file_comment", | ||
| "parameter_value" | ||
| ] | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| }, | ||
| "title": { | ||
| "anyOf": [ | ||
| { | ||
| "type": "boolean" | ||
| }, | ||
| { | ||
| "type": "null" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "additionalProperties": false | ||
| } |
Oops, something went wrong.