From b2ce600820b9c6799b7fec8740e70b8c1ce35d4d Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Wed, 6 Nov 2019 11:29:00 +0100
Subject: [PATCH] Add delimiter column for repository_column

---
 .../columns_initializers/list_column_type.js  | 27 ++++++++++++++++---
 .../javascripts/repository_columns/index.js   |  1 +
 .../list_columns_controller.rb                | 10 ++++++-
 .../repository_columns_controller.rb          | 12 +++------
 app/helpers/repository_columns_helper.rb      |  9 +++++++
 .../update_list_column_service.rb             |  2 +-
 .../manage_column_partials/_list.html.erb     | 17 ++++++------
 config/initializers/constants.rb              |  7 ++++-
 config/locales/en.yml                         |  1 +
 ...3702_add_delimiter_to_repository_column.rb |  7 +++++
 db/structure.sql                              |  6 +++--
 .../list_columns_controller_spec.rb           |  4 +--
 12 files changed, 76 insertions(+), 27 deletions(-)
 create mode 100644 app/helpers/repository_columns_helper.rb
 create mode 100644 db/migrate/20191105143702_add_delimiter_to_repository_column.rb

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 b5ba2ab26..517813a93 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
@@ -1,4 +1,4 @@
-/* global GLOBAL_CONSTANTS */
+/* global GLOBAL_CONSTANTS  I18n */
 /* eslint-disable no-unused-vars */
 var RepositoryListColumnType = (function() {
   var manageModal = '#manageRepositoryColumn';
@@ -9,6 +9,7 @@ var RepositoryListColumnType = (function() {
 
   function textToItems(text, delimiter) {
     var res = [];
+    var usedDelimiter = '';
     var definedDelimiters = {
       return: '\n',
       comma: ',',
@@ -16,18 +17,23 @@ var RepositoryListColumnType = (function() {
       space: ' '
     };
 
-    var delimiters = []
+    var delimiters = [];
     if (delimiter === 'auto') {
-      delimiters = ['\n', ',', ';', '|', ' '];
+      delimiters = ['\n', ',', ';', ' '];
     } else {
       delimiters.push(definedDelimiters[delimiter]);
     }
 
     $.each(delimiters, (index, currentDelimiter) => {
       res = text.trim().split(currentDelimiter);
+      usedDelimiter = Object
+        .keys(definedDelimiters)
+        .find(key => definedDelimiters[key] === currentDelimiter);
+
       if (res.length > 1) {
         return false;
       }
+      return true;
     });
 
     res = res.filter(Boolean).filter(onlyUnique);
@@ -35,9 +41,16 @@ var RepositoryListColumnType = (function() {
     $.each(res, (index, option) => {
       res[index] = option.slice(0, GLOBAL_CONSTANTS.NAME_MAX_LENGTH);
     });
+
+    $('select#delimiter').attr('data-used-delimiter', usedDelimiter);
     return res;
   }
 
+  function pluralizeWord(count, noun, suffix = 's') {
+    return `${noun}${count !== 1 ? suffix : ''}`;
+  }
+
+
   function drawDropdownPreview(items) {
     var $manageModal = $(manageModal);
     var $dropdownPreview = $manageModal.find('.dropdown-preview select');
@@ -48,6 +61,13 @@ var RepositoryListColumnType = (function() {
         text: item
       }));
     });
+
+    if (items.length === 0) {
+      $dropdownPreview.append($('<option>', {
+        value: '',
+        text: I18n.t('libraries.manange_modal_column.list_type.dropdown_item_select_option')
+      }));
+    }
   }
 
   function refreshCounter(number) {
@@ -77,6 +97,7 @@ var RepositoryListColumnType = (function() {
     });
 
     $('#dropdown_options').val(JSON.stringify(hashItems));
+    $('.limit-counter-container .items-label').html(pluralizeWord(items.length, 'item'));
   }
 
   function initDropdownItemsTextArea() {
diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index 96ecc8d15..ffa143881 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -84,6 +84,7 @@ var RepositoryColumns = (function() {
     var newParams = params;
     if (type === 'RepositoryListValue') {
       newParams.repository_column.repository_list_items_attributes = JSON.parse($('#dropdown_options').val());
+      newParams.repository_column.delimiter = $('select#delimiter').data('used-delimiter');
     }
     return newParams;
   }
diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb
index 361bdf814..998d7f5e6 100644
--- a/app/controllers/repository_columns/list_columns_controller.rb
+++ b/app/controllers/repository_columns/list_columns_controller.rb
@@ -5,6 +5,7 @@ module RepositoryColumns
     before_action :load_column, only: %i(update destroy)
     before_action :check_create_permissions, only: :create
     before_action :check_manage_permissions, only: %i(update destroy)
+    helper_method :delimiters
 
     def create
       service = RepositoryColumns::CreateColumnService
@@ -47,7 +48,14 @@ module RepositoryColumns
     private
 
     def repository_column_params
-      params.require(:repository_column).permit(:name, repository_list_items_attributes: %i(data))
+      params.require(:repository_column).permit(:name, :delimiter, repository_list_items_attributes: %i(data))
+    end
+
+    def delimiters
+      Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
+        .split(',')
+        .map { |e| Hash[t('libraries.manange_modal_column.list_type.delimiters.' + e), e] }
+        .inject(:merge)
     end
   end
 end
diff --git a/app/controllers/repository_columns_controller.rb b/app/controllers/repository_columns_controller.rb
index f31b89cdc..39066519c 100644
--- a/app/controllers/repository_columns_controller.rb
+++ b/app/controllers/repository_columns_controller.rb
@@ -1,5 +1,7 @@
 class RepositoryColumnsController < ApplicationController
   include InputSanitizeHelper
+  include RepositoryColumnsHelper
+
   ACTIONS = %i(
     create index create_html available_asset_type_columns available_columns
   ).freeze
@@ -73,15 +75,7 @@ class RepositoryColumnsController < ApplicationController
   end
 
   def edit
-    respond_to do |format|
-      format.json do
-        render json: {
-          html: render_to_string(
-            partial: 'repository_columns/manage_column_modal_content.html.erb'
-          )
-        }
-      end
-    end
+    render json: { html: render_to_string(partial: 'repository_columns/manage_column_modal_content.html.erb') }
   end
 
   def update
diff --git a/app/helpers/repository_columns_helper.rb b/app/helpers/repository_columns_helper.rb
new file mode 100644
index 000000000..060e226f6
--- /dev/null
+++ b/app/helpers/repository_columns_helper.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RepositoryColumnsHelper
+  def defined_delimiters_options
+    (%i(auto) + Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP.keys)
+      .map { |e| Hash[t('libraries.manange_modal_column.list_type.delimiters.' + e.to_s), e] }
+      .inject(:merge)
+  end
+end
diff --git a/app/services/repository_columns/update_list_column_service.rb b/app/services/repository_columns/update_list_column_service.rb
index 3bde5d3eb..1292a7b62 100644
--- a/app/services/repository_columns/update_list_column_service.rb
+++ b/app/services/repository_columns/update_list_column_service.rb
@@ -25,7 +25,7 @@ module RepositoryColumns
       end
       return self unless valid?
 
-      @errors[:repository_column] = @column.errors.messages unless @column.update(@params.slice(:name))
+      @errors[:repository_column] = @column.errors.messages unless @column.update(@params.slice(:name, :delimiter))
       return self unless valid?
 
       ActiveRecord::Base.transaction do
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 b033768f5..02379c434 100644
--- a/app/views/repository_columns/manage_column_partials/_list.html.erb
+++ b/app/views/repository_columns/manage_column_partials/_list.html.erb
@@ -1,7 +1,8 @@
-<% delimiters = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
-                .split(',')
-                .map {|e| Hash[t('libraries.manange_modal_column.list_type.delimiters.' + e), e]}
-                .inject(:merge) %>
+<%
+  delimiters = defined_delimiters_options
+  selected_delimiter = column.delimiter || 'return'
+  selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym]
+%>
 
 <%= hidden_field_tag 'dropdown_options' %>
 <div class="form-group">
@@ -9,7 +10,7 @@
     <%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
   </label>
   <div class="col-sm-9">
-    <%= select_tag('delimiter', options_for_select(delimiters, 'auto'), class: 'form-control') %>
+    <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control') %>
   </div>
 </div>
 <div class="form-group">
@@ -17,7 +18,7 @@
     <%= t('libraries.manange_modal_column.list_type.dropdown_items_label') %>
   </label>
   <div class="col-sm-9">
-    <%= text_area_tag 'list-items-textarea', column.repository_list_items.pluck(:data).join("\n"), rows: 10, class: 'form-control' %>
+    <%= text_area_tag 'list-items-textarea', column.repository_list_items.pluck(:data).join(selected_delimiter_char), rows: 10, class: 'form-control' %>
   </div>
 </div>
 <div class="dropdown-preview">
@@ -28,7 +29,7 @@
     </select>
     <div class="limit-counter-container">
       <span class="list-items-count"></span>
-      <span class="list-items-limit">/<%= Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN %></span>
-      <span> items</span></div>
+      <span class="list-items-limit">/<%= Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN %> </span>
+      <span class="items-label"></span></div>
   </div>
 </div>
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index a0f965e84..a71b9d7c7 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -977,7 +977,12 @@ class Constants
 
   REPOSITORY_LIST_ITEMS_PER_COLUMN = 500
 
-  REPOSITORY_LIST_ITEMS_DELIMITERS = 'auto,return,comma,semicolon,space'.freeze
+  REPOSITORY_LIST_ITEMS_DELIMITERS_MAP = {
+    return: "\n",
+    comma: ',',
+    semicolon: ';',
+    space: ' '
+  }.freeze
 
   IMPORT_REPOSITORY_ITEMS_LIMIT = 2000
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69b5072a3..cd9c59222 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1147,6 +1147,7 @@ en:
       list_type:
         delimiter_label: "Delimiter"
         dropdown_items_label: "Dropdown items"
+        dropdown_item_select_option: "Select option..."
         delimiters:
           auto: "Auto"
           return: "Return"
diff --git a/db/migrate/20191105143702_add_delimiter_to_repository_column.rb b/db/migrate/20191105143702_add_delimiter_to_repository_column.rb
new file mode 100644
index 000000000..61d585485
--- /dev/null
+++ b/db/migrate/20191105143702_add_delimiter_to_repository_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDelimiterToRepositoryColumn < ActiveRecord::Migration[6.0]
+  def change
+    add_column :repository_columns, :delimiter, :string
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 0f1ab0cc9..1322a7a87 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1201,7 +1201,8 @@ CREATE TABLE public.repository_columns (
     name character varying,
     data_type integer NOT NULL,
     created_at timestamp without time zone,
-    updated_at timestamp without time zone
+    updated_at timestamp without time zone,
+    delimiter character varying
 );
 
 
@@ -6749,6 +6750,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20191001133557'),
 ('20191003091614'),
 ('20191007144622'),
-('20191009146101');
+('20191009146101'),
+('20191105143702');
 
 
diff --git a/spec/controllers/repository_columns/list_columns_controller_spec.rb b/spec/controllers/repository_columns/list_columns_controller_spec.rb
index ca14b3eb9..483a6ffc7 100644
--- a/spec/controllers/repository_columns/list_columns_controller_spec.rb
+++ b/spec/controllers/repository_columns/list_columns_controller_spec.rb
@@ -103,7 +103,7 @@ RSpec.describe RepositoryColumns::ListColumnsController, type: :controller do
       allow(service).to(receive(:succeed?)).and_return(true)
       allow(service).to(receive(:column)).and_return(repository_column)
 
-      allow_any_instance_of(RepositoryColumns::UpdateColumnService).to(receive(:call)).and_return(service)
+      allow_any_instance_of(RepositoryColumns::UpdateListColumnService).to(receive(:call)).and_return(service)
     end
 
     context 'when columnd is updated' do
@@ -151,7 +151,7 @@ RSpec.describe RepositoryColumns::ListColumnsController, type: :controller do
         allow(service).to(receive(:succeed?)).and_return(false)
         allow(service).to(receive(:errors)).and_return({})
 
-        allow_any_instance_of(RepositoryColumns::UpdateColumnService).to(receive(:call)).and_return(service)
+        allow_any_instance_of(RepositoryColumns::UpdateListColumnService).to(receive(:call)).and_return(service)
       end
 
       it 'respons with status 422' do