Move delimiter from column to metadata

app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js

@@ -1,5 +1,5 @@
 /* global GLOBAL_CONSTANTS dropdownSelector RepositoryListColumnType */
- 
+
 var RepositoryChecklistColumnType = (function() {
   var manageModal = '#manage-repository-column';
   var delimiterDropdown = '.checklist-column-type .delimiter';
@@ -69,7 +69,7 @@ var RepositoryChecklistColumnType = (function() {
       var repositoryColumnParams = {};
       var options = JSON.parse($(dropdownOptions).val());
       repositoryColumnParams.repository_checklist_items_attributes = options;
-      repositoryColumnParams.delimiter = $(delimiterDropdown).data('used-delimiter');
+      repositoryColumnParams.metadata = { delimiter: $(delimiterDropdown).data('used-delimiter') };
       return repositoryColumnParams;
     }
   };

app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js

@@ -145,7 +145,7 @@ var RepositoryListColumnType = (function() {
       var repositoryColumnParams = {};
       var options = JSON.parse($(dropdownOptions).val());
       repositoryColumnParams.repository_list_items_attributes = options;
-      repositoryColumnParams.delimiter = $(delimiterDropdown).data('used-delimiter');
+      repositoryColumnParams.metadata = { delimiter: $(delimiterDropdown).data('used-delimiter') };
       return repositoryColumnParams;
     },
 

app/controllers/repository_columns/checklist_columns_controller.rb

@@ -61,7 +61,9 @@ module RepositoryColumns
     end
 
     def repository_column_params
-      params.require(:repository_column).permit(:name, :delimiter, repository_checklist_items_attributes: %i(data))
+      params
+        .require(:repository_column)
+        .permit(:name, metadata: [:delimiter], repository_checklist_items_attributes: %i(data))
     end
 
     def delimiters

app/controllers/repository_columns/list_columns_controller.rb

@@ -62,7 +62,9 @@ module RepositoryColumns
     end
 
     def repository_column_params
-      params.require(:repository_column).permit(:name, :delimiter, repository_list_items_attributes: %i(data))
+      params
+        .require(:repository_column)
+        .permit(:name, metadata: [:delimiter], repository_list_items_attributes: %i(data))
     end
 
     def delimiters

app/models/repository_column.rb

@@ -69,5 +69,4 @@ class RepositoryColumn < ApplicationRecord
   def importable?
     Extends::REPOSITORY_IMPORTABLE_TYPES.include?(data_type.to_sym)
   end
-
 end

app/services/repository_columns/update_checklist_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, :delimiter))
+      @errors[:repository_column] = @column.errors.messages unless @column.update(@params.slice(:name, :metadata))
       return self unless valid?
 
       ActiveRecord::Base.transaction do

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, :delimiter))
+      @errors[:repository_column] = @column.errors.messages unless @column.update(@params.slice(:name, :metadata))
       return self unless valid?
 
       ActiveRecord::Base.transaction do

app/views/repository_columns/manage_column_partials/_checklist.html.erb

@@ -1,6 +1,6 @@
 <%
   delimiters = defined_delimiters_options
-  selected_delimiter = column.delimiter || 'return'
+  selected_delimiter = column.metadata['delimiter'] || 'return'
   selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym]
 %>
 

app/views/repository_columns/manage_column_partials/_list.html.erb

@@ -1,6 +1,6 @@
 <%
   delimiters = defined_delimiters_options
-  selected_delimiter = column.delimiter || 'return'
+  selected_delimiter = column.metadata['delimiter'] || 'return'
   selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym]
 %>
 

db/migrate/20191218072619_remove_delimiter_from_repository_column.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveDelimiterFromRepositoryColumn < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :repository_columns, :delimiter, :string
+  end
+end

db/structure.sql

@@ -1257,7 +1257,6 @@ CREATE TABLE public.repository_columns (
     data_type integer NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    delimiter character varying,
     metadata jsonb DEFAULT '{}'::jsonb NOT NULL
 );
 
@@ -7120,7 +7119,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20191205133447'),
 ('20191205133522'),
 ('20191206105058'),
-('20191210103004');
-
+('20191210103004'),
+('20191218072619');