Merge pull request #2320 from mlorb/ml-sci-4069-v2

Add emojionearea for status column type [SCI-4069]

app/assets/javascripts/application.js.erb

@@ -22,6 +22,8 @@
 //= require bootstrap-colorselector
 //= require bootstrap-tagsinput.min
 //= require bootstrap-checkbox.min
+//= require emojione.min
+//= require emojionearea.min
 //= require typeahead.bundle.min
 //= require nested_form_fields
 //= require highlight.pack

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

@@ -2,6 +2,7 @@
 /* eslint-disable no-unused-vars */
 var RepositoryStatusColumnType = (function() {
   var manageModal = '#manage-repository-column';
+  var iconId = '.status-item-icon';
 
   function statusTemplate() {
     return `
@@ -11,14 +12,6 @@ var RepositoryStatusColumnType = (function() {
              class="status-item-field"
              type="text"/>
       <span class="status-item-icon-trash fas fa-trash"></span>
-    </div>
-    <div class="emojis-picker">
-      <span data-emoji-code="&#128540;">&#128540;</span>
-      <span data-emoji-code="&#128520;">&#128520;</span>
-      <span data-emoji-code="&#128526;">&#128526;</span>
-      <span data-emoji-code="&#128531;">&#128531;</span>
-      <span data-emoji-code="&#128535;">&#128535;</span>
-      <span data-emoji-code="&#128536;">&#128536;</span>
     </div>`;
   }
 
@@ -30,12 +23,12 @@ var RepositoryStatusColumnType = (function() {
     $.each($statusRows, (index, statusRow) => {
       var $row = $(statusRow);
       var $statusField = $row.find('.status-item-field');
-      var $icon = $row.find('.status-item-icon');
+      var iconPlaceholder = $row.find(iconId)[0].emojioneArea.editor.hasClass('has-placeholder');
       var stringLength = $statusField.val().length;
 
       if (stringLength < GLOBAL_CONSTANTS.NAME_MIN_LENGTH
           || stringLength > GLOBAL_CONSTANTS.NAME_MAX_LENGTH
-          || !$icon.attr('data-icon')) {
+          || iconPlaceholder) {
         $row.addClass('error');
       } else {
         $row.removeClass('error');
@@ -53,18 +46,32 @@ var RepositoryStatusColumnType = (function() {
     $(manageModal).find('.error').addClass('error-highlight');
   }
 
+  function initEmojiPicker(iconElem) {
+    iconElem.emojioneArea({
+      standalone: true,
+      autocomplete: false,
+      pickerPosition: 'bottom',
+      events: {
+        emojibtn_click: function(button, event) {
+          validateForm();
+        }
+      }
+    });
+  }
+
   function initActions() {
     var $manageModal = $(manageModal);
     var addStatusOptionBtn = '.add-status';
     var deleteStatusOptionBtn = '.status-item-icon-trash';
-    var icon = '.status-item-icon';
-    var emojis = '.emojis-picker>span';
     var statusInput = 'input.status-item-field';
     var buttonWrapper = '.button-wrapper';
 
     $manageModal.on('click', addStatusOptionBtn, function() {
       var newStatusRow = $(statusTemplate()).insertBefore($(this));
+      var newIcon = newStatusRow.find(iconId);
+      initEmojiPicker(newIcon);
       validateForm();
+
       setTimeout(function() {
         newStatusRow.css('height', '34px');
       }, 0);
@@ -79,7 +86,6 @@ var RepositoryStatusColumnType = (function() {
       // if new item is deleted, remove it from HTML
 
       var $statusRow = $(this).parent();
-      var $emojis = $statusRow.next('.emojis-picker');
       var isNewRow = $statusRow.data('id') == null;
 
       setTimeout(function() {
@@ -96,22 +102,11 @@ var RepositoryStatusColumnType = (function() {
           $statusRow.removeClass('error');
           validateForm();
         }
-        $emojis.remove();
       }, 300);
     });
 
-    $manageModal.on('click', icon, function() {
-      var $emojiPicker = $(this).parent().next('.emojis-picker');
-      $emojiPicker.show();
-    });
-
-    $manageModal.on('click', emojis, function() {
-      var $clickedEmoji = $(this);
-      var $iconField = $clickedEmoji.parent().prev().find('.status-item-icon');
-      $clickedEmoji.parent().hide();
-      $iconField.html($clickedEmoji.data('emoji-code'));
-      $iconField.attr('data-icon', $clickedEmoji.data('emoji-code'));
-      $iconField.trigger('data-attribute-changed', $iconField);
+    $manageModal.on('columnModal::partialLoadedForRepositoryStatusValue', function() {
+      initEmojiPicker($(iconId));
     });
 
     $manageModal
@@ -148,7 +143,7 @@ var RepositoryStatusColumnType = (function() {
         var $item = $(value);
         var id = $item.data('id');
         var removed = $item.data('removed');
-        var icon = $item.find('.status-item-icon').data('icon');
+        var icon = $item.find(iconId)[0].emojioneArea.getText();
         var status = $item.find('input.status-item-field').val();
 
         if (removed && id) { // flag as item for removing

app/assets/stylesheets/application.scss

@@ -21,6 +21,7 @@
 @import "shared_styles/elements/*";
 
 @import "handsontable.full.min";
+@import "emojionearea.min";
 @import "ajax-bootstrap-select.min";
 @import "extend/bootstrap";
 @import "extend/*";

app/assets/stylesheets/repository_columns/status_type.scss

@@ -18,20 +18,24 @@
   }
 
   .status-item-icon {
-    border: 1px solid $input-border;
     border-radius: 4px 0 0 4px;
-    cursor: pointer;
-    display: inline-block;
     height: 34px;
-    line-height: 32px;
-    text-align: center;
-    width: 34px;
 
+    .emojionearea-editor {
+      padding: 6px !important;
 
-    &:not([data-icon])::before {
-      content: "\f06a";
-      font-family: "Font Awesome 5 Free";
-      font-weight: 900;
+      &::before {
+        border-left: 0 !important;
+      }
+    }
+
+    .emojionearea-button > div {
+      display: none !important;
+    }
+
+    .emojionearea-search > input {
+      border: $border-default !important;
+      border-radius: $border-radius-default !important;
     }
   }
 
@@ -99,11 +103,3 @@
     padding-left: 5px;
   }
 }
-
-.emojis-picker {
-  border: 1px solid $color-gainsboro;
-  display: none;
-  font-size: 30px;
-  height: 40px;
-  width: 211px;
-}

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

@@ -2,24 +2,16 @@
   <label class="control-label col-sm-3" for="repository-column-data-type">
     <%= t('libraries.manange_modal_column.status_type.status_options_label') %>
   </label>
-  <div class="col-sm-9">
+  <div class="col-sm-9 status-item-list">
     <% column.repository_status_items.each do |item| %>
       <div class="status-item-container" data-id="<%= item.id %>">
-        <div class="status-item-icon" data-icon="<%= item.icon %>"><span><%= item.icon %></span></div>
+        <div class="status-item-icon"><span><%= item.icon %></span></div>
         <input placeholder="<%= t('libraries.manange_modal_column.name_placeholder') %>"
                class="status-item-field"
                type="text"
                value="<%= item.status %>"/>
         <span class="status-item-icon-trash fas fa-trash"></span>
       </div>
-      <div class="emojis-picker">
-        <span data-emoji-code="&#128540;">&#128540;</span>
-        <span data-emoji-code="&#128520;">&#128520;</span>
-        <span data-emoji-code="&#128526;">&#128526;</span>
-        <span data-emoji-code="&#128531;">&#128531;</span>
-        <span data-emoji-code="&#128535;">&#128535;</span>
-        <span data-emoji-code="&#128536;">&#128536;</span>
-      </div>
     <% end %>
     <div class="add-status">
       <span class="fas fa-plus"></span>

config/initializers/assets.rb

@@ -45,6 +45,8 @@ Rails.application.config.assets.precompile += %w(jquery-ui/draggable.js)
 Rails.application.config.assets.precompile += %w(jquery-ui/droppable.js)
 Rails.application.config.assets.precompile += %w(jquery.ui.touch-punch.min.js)
 Rails.application.config.assets.precompile += %w(bootstrap-colorselector.js)
+Rails.application.config.assets.precompile += %w(emojione.js)
+Rails.application.config.assets.precompile += %w(emojionearea.js)
 Rails.application.config.assets.precompile += %w(eventPause-min.js)
 Rails.application.config.assets.precompile += %w(sidebar.js)
 # Rails.application.config.assets.precompile += %w(samples/samples.js)