From 470f6ff541af23da3cba547dc2dd9a97fc2f4f19 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 15 Jan 2020 12:16:17 +0100 Subject: [PATCH 01/12] Unifify view and edit modes for number cells [SCI-4233] --- .../javascripts/repositories/renderers/edit_renderers.js | 2 +- .../javascripts/repositories/renderers/new_renderers.js | 2 -- .../javascripts/repositories/renderers/view_renderers.js | 8 ++++---- .../repository_number_value_serializer.rb | 6 ------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/repositories/renderers/edit_renderers.js b/app/assets/javascripts/repositories/renderers/edit_renderers.js index a76104108..dc26af015 100644 --- a/app/assets/javascripts/repositories/renderers/edit_renderers.js +++ b/app/assets/javascripts/repositories/renderers/edit_renderers.js @@ -143,7 +143,7 @@ $.fn.dataTable.render.editRepositoryNumberValue = function(formId, columnId, cel type="number" name="repository_cells[${columnId}]" placeholder="${I18n.t('repositories.table.number.enter_number')}" - value="${$cell.find('.number-value').data('full-value')}" + value="${$cell.find('.number-value').data('value')}" data-type="RepositoryNumberValue"> `); }; diff --git a/app/assets/javascripts/repositories/renderers/new_renderers.js b/app/assets/javascripts/repositories/renderers/new_renderers.js index c270d1761..d9ab17b4f 100644 --- a/app/assets/javascripts/repositories/renderers/new_renderers.js +++ b/app/assets/javascripts/repositories/renderers/new_renderers.js @@ -75,8 +75,6 @@ $.fn.dataTable.render.newRepositoryNumberValue = function(formId, columnId, $cel placeholder="${I18n.t('repositories.table.number.enter_number')}" data-type="RepositoryNumberValue"> `); - - SmartAnnotation.init($cell.find('input')); }; $.fn.dataTable.render.newRepositoryDateTimeValue = function(formId, columnId, $cell) { diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js index 9c6147c4f..596b68c8f 100644 --- a/app/assets/javascripts/repositories/renderers/view_renderers.js +++ b/app/assets/javascripts/repositories/renderers/view_renderers.js @@ -63,8 +63,8 @@ $.fn.dataTable.render.defaultRepositoryDateTimeValue = function() { }; $.fn.dataTable.render.RepositoryDateTimeValue = function(data) { - return `${data.value.formatted}`; }; @@ -73,7 +73,7 @@ $.fn.dataTable.render.defaultRepositoryTimeValue = function() { }; $.fn.dataTable.render.RepositoryTimeValue = function(data) { - return `${data.value.formatted}`; }; @@ -146,7 +146,7 @@ $.fn.dataTable.render.defaultRepositoryNumberValue = function() { }; $.fn.dataTable.render.RepositoryNumberValue = function(data) { - return ` + return ` ${data.value} `; }; diff --git a/app/serializers/repository_datatable/repository_number_value_serializer.rb b/app/serializers/repository_datatable/repository_number_value_serializer.rb index 8c6986bf9..25aff993c 100644 --- a/app/serializers/repository_datatable/repository_number_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_number_value_serializer.rb @@ -2,15 +2,9 @@ module RepositoryDatatable class RepositoryNumberValueSerializer < RepositoryBaseValueSerializer - attributes :full_value - def value decimal_number = scope[:column].metadata.fetch('decimals') { Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS } BigDecimal(object.data).round(decimal_number.to_i) end - - def full_value - object.data - end end end From dd48a2902d91c596871bf5e1b0ff3bb8b3b85219 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 15 Jan 2020 12:44:57 +0100 Subject: [PATCH 02/12] Disable repository filtering in edit mode [SCI-4226] --- app/assets/javascripts/repositories/repository_datatable.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index c1b399e85..70ba91214 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -57,6 +57,7 @@ var RepositoryDatatable = (function(global) { $('#repository-columns-dropdown').find('.dropdown-toggle').prop('disabled', false); $('th').removeClass('disable-click'); $('.repository-row-selector').prop('disabled', false); + $('.dataTables_filter input').prop('disabled', false); if (rowsSelected.length === 0) { $('#exportRepositoriesButton').addClass('disabled'); $('#copyRepositoryRecords').prop('disabled', true); @@ -90,6 +91,7 @@ var RepositoryDatatable = (function(global) { $('#repository-columns-dropdown').find('.dropdown-toggle').prop('disabled', true); $('th').addClass('disable-click'); $('.repository-row-selector').prop('disabled', true); + $('.dataTables_filter input').prop('disabled', true); } } From 5bfa5c7939ea4d82a47c60b167d772361e57476a Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 13:59:28 +0100 Subject: [PATCH 03/12] SCI-4199 disabling delimiter, adding warning --- .../checklist_column_type.js | 1 + .../columns_initializers/list_column_type.js | 1 + .../checklist_columns_controller.rb | 8 ++++++- .../list_columns_controller.rb | 8 ++++++- .../_checklist.html.erb | 7 ++++++- .../manage_column_partials/_list.html.erb | 21 ++++++++++++------- config/locales/en.yml | 1 + 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js b/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js index 24eef0884..646d5fc38 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js @@ -31,6 +31,7 @@ var RepositoryChecklistColumnType = (function() { delimiterDropdown, dropdownOptions ); + $('.changing-existing-list-items-warning').removeClass('hidden'); initChecklistDropdown(); }) .on('change', delimiterDropdown, function() { diff --git a/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js b/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js index 8aff9e318..4d1496fe5 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js @@ -110,6 +110,7 @@ var RepositoryListColumnType = (function() { delimiterDropdown, dropdownOptions ); + $('.changing-existing-list-items-warning').removeClass('hidden'); }) .on('change', delimiterDropdown, function() { refreshPreviewDropdownList( diff --git a/app/controllers/repository_columns/checklist_columns_controller.rb b/app/controllers/repository_columns/checklist_columns_controller.rb index c5e82cf62..c3adf3cd6 100644 --- a/app/controllers/repository_columns/checklist_columns_controller.rb +++ b/app/controllers/repository_columns/checklist_columns_controller.rb @@ -25,7 +25,7 @@ module RepositoryColumns .call(user: current_user, team: current_team, column: @repository_column, - params: repository_column_params) + params: repository_column_update_params) if service.succeed? render json: service.column, status: :ok, editing: true @@ -67,6 +67,12 @@ module RepositoryColumns .permit(:name, metadata: [:delimiter], repository_checklist_items_attributes: %i(data)) end + def repository_column_update_params + params + .require(:repository_column) + .permit(:name, repository_checklist_items_attributes: %i(data)) + end + def delimiters Constants::REPOSITORY_LIST_ITEMS_DELIMITERS .split(',') diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb index 699d98952..88be0397e 100644 --- a/app/controllers/repository_columns/list_columns_controller.rb +++ b/app/controllers/repository_columns/list_columns_controller.rb @@ -25,7 +25,7 @@ module RepositoryColumns .call(user: current_user, team: current_team, column: @repository_column, - params: repository_column_params) + params: repository_column_update_params) if service.succeed? render json: service.column, status: :ok, editing: true @@ -67,6 +67,12 @@ module RepositoryColumns .permit(:name, metadata: [:delimiter], repository_list_items_attributes: %i(data)) end + def repository_column_update_params + params + .require(:repository_column) + .permit(:name, repository_list_items_attributes: %i(data)) + end + def delimiters Constants::REPOSITORY_LIST_ITEMS_DELIMITERS .split(',') diff --git a/app/views/repository_columns/manage_column_partials/_checklist.html.erb b/app/views/repository_columns/manage_column_partials/_checklist.html.erb index 10cf96183..483ec2e2c 100644 --- a/app/views/repository_columns/manage_column_partials/_checklist.html.erb +++ b/app/views/repository_columns/manage_column_partials/_checklist.html.erb @@ -10,7 +10,7 @@ <%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter') %> + <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter',disabled: !column.new_record?) %>
@@ -19,6 +19,11 @@
<%= text_area_tag 'items-textarea', column.repository_checklist_items.pluck(:data).join(selected_delimiter_char), rows: 10, class: 'form-control items-textarea' %> + <% unless column.new_record? %> + + <% end %>
diff --git a/app/views/repository_columns/manage_column_partials/_list.html.erb b/app/views/repository_columns/manage_column_partials/_list.html.erb index 24c4eeeeb..7ac21a688 100644 --- a/app/views/repository_columns/manage_column_partials/_list.html.erb +++ b/app/views/repository_columns/manage_column_partials/_list.html.erb @@ -5,20 +5,27 @@ %> <%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %> -
- -
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter') %> + +
+ +
+ <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %> +
-
+
<%= text_area_tag 'items-textarea', column.repository_list_items.pluck(:data).join(selected_delimiter_char), rows: 10, class: 'form-control items-textarea' %> + <% unless column.new_record? %> + + <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index cf6ad6097..7c47a0a25 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1155,6 +1155,7 @@ en: name: "Name" colum_type: "Column type" dropdown_item_descirption: "Dropdown items should be separated by comma." + change_multi_select_items_warning: "Be careful: changing existing list items will result in deselecting previously selected items." select: repository_text_value: "Text" repository_number_value: "Number" From 8c7705817906005dfcc766a9e27b32d17c86ffd4 Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 14:02:33 +0100 Subject: [PATCH 04/12] fixing indentation --- .../manage_column_partials/_list.html.erb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/repository_columns/manage_column_partials/_list.html.erb b/app/views/repository_columns/manage_column_partials/_list.html.erb index 7ac21a688..6423235d9 100644 --- a/app/views/repository_columns/manage_column_partials/_list.html.erb +++ b/app/views/repository_columns/manage_column_partials/_list.html.erb @@ -5,16 +5,14 @@ %> <%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %> - -
- -
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %> -
+
+ +
+ <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %>
- +
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter',disabled: !column.new_record?) %> + <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %>
From df43c4c15fb54e04b8c62d8febcb4a44c12acc85 Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 14:52:06 +0100 Subject: [PATCH 06/12] SCI-4202 add close param --- app/assets/javascripts/repositories/renderers/columns/list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/repositories/renderers/columns/list.js b/app/assets/javascripts/repositories/renderers/columns/list.js index 352e46ff0..9fbbe47c1 100644 --- a/app/assets/javascripts/repositories/renderers/columns/list.js +++ b/app/assets/javascripts/repositories/renderers/columns/list.js @@ -7,7 +7,7 @@ var ListColumnHelper = (function() { if (value && value.value) { selectedOption = ``; } - return $(` Date: Wed, 15 Jan 2020 15:23:03 +0100 Subject: [PATCH 08/12] Improve user experience for repository saving and fix checklist saving [SCI-4237] --- app/assets/javascripts/repositories/row_editor.js | 11 +++++------ app/models/repository_checklist_value.rb | 8 +++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/repositories/row_editor.js b/app/assets/javascripts/repositories/row_editor.js index b57c66cb5..2e591a8a7 100644 --- a/app/assets/javascripts/repositories/row_editor.js +++ b/app/assets/javascripts/repositories/row_editor.js @@ -94,16 +94,15 @@ var RepositoryDatatableRowEditor = (function() { let $table = $(TABLE.table().node()); $table.on('ajax:success', '.repository-row-edit-form', function(ev, data) { - TABLE.ajax.reload(); - HelperModule.flashAlertMsg(data.flash, 'success'); + TABLE.ajax.reload(() => { + animateSpinner(null, false); + HelperModule.flashAlertMsg(data.flash, 'success'); + }); }); $table.on('ajax:error', '.repository-row-edit-form', function(ev, data) { - HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger'); - }); - - $table.on('ajax:complete', '.repository-row-edit-form', function() { animateSpinner(null, false); + HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger'); }); } diff --git a/app/models/repository_checklist_value.rb b/app/models/repository_checklist_value.rb index fd75a4824..bfd219c0a 100644 --- a/app/models/repository_checklist_value.rb +++ b/app/models/repository_checklist_value.rb @@ -44,11 +44,9 @@ class RepositoryChecklistValue < ApplicationRecord def self.new_with_payload(payload, attributes) value = new(attributes) - value.repository_cell - .repository_column - .repository_checklist_items.where(id: JSON.parse(payload)).find_each do |item| - value.repository_checklist_items_values.new(repository_checklist_item: item) - end + value.repository_checklist_items = value.repository_cell + .repository_column + .repository_checklist_items.where(id: JSON.parse(payload)) value end end From ac4154bd85759ed21338335e4e91662fa4f94c02 Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 17:09:13 +0100 Subject: [PATCH 09/12] SCI-4210 fix css --- app/assets/stylesheets/repository/repository_table.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss index 96e5ca7e4..6d5b0bf26 100644 --- a/app/assets/stylesheets/repository/repository_table.scss +++ b/app/assets/stylesheets/repository/repository_table.scss @@ -80,6 +80,14 @@ } } + .checklist-dropdown span { + color: $brand-primary; + cursor: pointer; + &:hover { + text-decoration: underline; + } + } + // DateTime .datetime-container { display: flex; From a10e7de9a65e5faad2167a94da8cbafd0179e8ff Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 15 Jan 2020 17:19:56 +0100 Subject: [PATCH 10/12] Fix smart annotation window position --- app/assets/javascripts/sitewide/atwho_res.js.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index 7dd0ebd13..21c1bd4b6 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -380,6 +380,9 @@ var SmartAnnotation = (function() { function init() { $(field) + .on("reposition.atwho", function(event, flag, query) { + query.$el.find('.atwho-view').css('left', (flag.left + $(window).scrollLeft()) + 'px'); + }) .atwho({ at: '@', callbacks: { From 960843c0081cb31fb485865b2659faf638a7722b Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 17:49:25 +0100 Subject: [PATCH 11/12] SCI-4210 move hiding and showing toolbar one level lower --- app/assets/javascripts/repositories/repository_datatable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index 93fb29375..4ad93fec7 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -48,7 +48,6 @@ var RepositoryDatatable = (function(global) { if (currentMode === 'viewMode') { $(TABLE_WRAPPER_ID).removeClass('editing'); $('#saveCancel').hide(); - $('#editDeleteCopy').show(); $('#addRepositoryRecord').prop('disabled', false); $('.dataTables_length select').prop('disabled', false); $('#repository-acitons-dropdown').prop('disabled', false); @@ -63,6 +62,7 @@ var RepositoryDatatable = (function(global) { $('#deleteRepositoryRecordsButton').prop('disabled', true); $('#assignRepositoryRecords').prop('disabled', true); $('#unassignRepositoryRecords').prop('disabled', true); + $('#editDeleteCopy').hide(); } else { if (rowsSelected.length === 1) { $('#editRepositoryRecord').prop('disabled', false); @@ -74,6 +74,7 @@ var RepositoryDatatable = (function(global) { $('#copyRepositoryRecords').prop('disabled', false); $('#assignRepositoryRecords').prop('disabled', false); $('#unassignRepositoryRecords').prop('disabled', false); + $('#editDeleteCopy').show(); } } else if (currentMode === 'editMode') { $(TABLE_WRAPPER_ID).addClass('editing'); From 168ba9d1c6ba11fdbbd27dfe84b9f9c6495c365e Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 15 Jan 2020 18:04:07 +0100 Subject: [PATCH 12/12] Fix logo and flash messages in sign_in_halt layout [SCI-4243] --- app/views/layouts/sign_in_halt.html.erb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/sign_in_halt.html.erb b/app/views/layouts/sign_in_halt.html.erb index 0e799efb2..6a1b851b9 100644 --- a/app/views/layouts/sign_in_halt.html.erb +++ b/app/views/layouts/sign_in_halt.html.erb @@ -24,7 +24,7 @@
- <%= image_tag('/images/scinote_icon.jpg', id: 'logo') %> + <%= image_tag('/images/scinote_icon.svg', id: 'logo') %>
<% if user_signed_in? %> @@ -36,15 +36,9 @@ <% end %>
- <% if flash[:error]%> -
-
- - - <%= sanitize_input(flash[:error]) %> -
-
- <% end %> + + <%= render partial: 'shared/flash_alerts', locals: { flash: flash, notice: notice, alert: alert } %> +