Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix registered sample attribute #1897

Merged
merged 3 commits into from
May 29, 2024
Merged

Fix registered sample attribute #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b926597
Skip value if ID is blank
kdp-cloud May 24, 2024
a62a0c7
Rename registeredSamplesObjectsInput
kdp-cloud May 24, 2024
e286ad2
Replace drop-down with objects input with limit of 1 for registered s…
kdp-cloud May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/assets/javascripts/single_page/dynamic_table.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function sanitizeData(data) {

const objectInputTemp = '<input type="hidden" name="_NAME_[]" id="inpt-_NAME_" value="" autocomplete="off" />' +
'<select name="_NAME_[]" id="select-_NAME_" class="form-control _EXTRACLASS_" title="_TITLE_" data-role="seek-objectsinput" ' +
'data-tags-limit="100" _MULTIPLE?_ style="background-color: coral;" data-typeahead-template="_TYPEHEAD_"' +
'data-tags-limit="_LIMIT?_" multiple style="background-color: coral;" data-typeahead-template="_TYPEHEAD_"' +
'data-typeahead-query-url="_URL_" data-allow-new-items=_ALLOW_FREE_TEXT_>_OPTIONS_</select>';

const typeaheadSamplesUrl = "<%= typeahead_samples_path(linked_sample_type_id: '_LINKED_') %>";
Expand Down Expand Up @@ -86,11 +86,12 @@ const handleSelect = (e) => {
}

c["render"] = function(data_, type, full, meta) {
sanitizedData = sanitizeData(data_);
let sanitizedData = sanitizeData(data_);
let data;
if(c.linked_sample_type){
data = sanitizedData && Array.isArray(sanitizedData) ? sanitizedData : [sanitizedData];
data = data[0]?.id ? data : [];
return inputObjectsInput(c, data, options, linkedSamplesUrl);
return registeredSamplesObjectsInput(c, data, options, linkedSamplesUrl);
} else if(c.is_cv_list && sanitizedData !== "#HIDDEN"){
data = sanitizedData && Array.isArray(sanitizedData) ? sanitizedData : [sanitizedData];
data = data.map((e) => {
Expand Down Expand Up @@ -569,7 +570,7 @@ function retrieveLinkedSamples(url){
return linkedSamples;
}

function inputObjectsInput(column, data, options, url){
function registeredSamplesObjectsInput(column, data, options, url){
const existingOptions = data.map((e) => {
isHiddenInput = (e.title == '#HIDDEN');
if (isHiddenInput) {
Expand All @@ -584,7 +585,6 @@ function inputObjectsInput(column, data, options, url){
const typeaheadTemplate = 'typeahead/single_pages_samples'
const objectInputName = data.map((e) => e.id).join('-') + '-' + crypto.randomUUID();


const unLinkedSamples = data.reduce(function(filtered, sample) {
if(!column.linkedSampleIds.includes(parseInt(sample.id)) && sample.title != '#HIDDEN'){
filtered.push(sample);
Expand All @@ -593,7 +593,7 @@ function inputObjectsInput(column, data, options, url){
}, []);
const hasUnlinkedSamples = unLinkedSamples.length > 0 ? true : false;

const hasMultipleInputs = column.multi_link ? 'multiple="multiple"' : ''
const hasMultipleInputs = column.multi_link ? '100' : '1'
const extraClass = hasUnlinkedSamples ? 'select2__error' : '';
const titleText = hasUnlinkedSamples ? `Sample(s) '${unLinkedSamples.map(uls => uls.title).join(', ')}' not recognised as input. Please correct this issue!` : '';
setTimeout(ObjectsInput.init);
Expand All @@ -605,7 +605,7 @@ function inputObjectsInput(column, data, options, url){
.replace('_OPTIONS_', existingOptions)
.replace('_EXTRACLASS_', extraClass)
.replace('_TITLE_', titleText)
.replace('_MULTIPLE?_', hasMultipleInputs)
.replace('_LIMIT?_', hasMultipleInputs)
.replace('_ALLOW_FREE_TEXT_', false);
}
}
Expand All @@ -629,7 +629,7 @@ function cvListObjectsInput(column, data, options, url){
.replace('_OPTIONS_', existingOptions)
.replace('_EXTRACLASS_', extraClass)
.replace('_TITLE_', titleText)
.replace('_MULTIPLE?_', 'multiple="multiple"')
.replace('_LIMIT?_', '')
.replace('_ALLOW_FREE_TEXT_', allowNewItems);
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/samples_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ def sample_form_field(attribute, element_name, value, limit = 1)
value = [value] unless value.is_a?(Array)
value.compact.each do |v|
id = v[:id]
next if id.blank? # Skip value if there is no ID

title = v[:title]
title = '<em>Hidden</em>' unless Sample.find(id).can_view?
existing_objects << str.new(id, title)
Expand Down Expand Up @@ -379,5 +381,3 @@ def attribute_form_element(attribute, value, element_name, element_class, depth=
end

end