From 218316bea2c8bfa7165ce7337cacb8fba1ae4f00 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Thu, 16 Jan 2020 13:30:05 +0100
Subject: [PATCH] Update error handling for name and text

---
 .../repositories/validators/base_validator.js | 35 +++++++++++++++++--
 .../javascripts/sitewide/form_errors.js       |  6 ----
 config/locales/en.yml                         |  7 ++++
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/repositories/validators/base_validator.js b/app/assets/javascripts/repositories/validators/base_validator.js
index a68792f73..14d4e9436 100644
--- a/app/assets/javascripts/repositories/validators/base_validator.js
+++ b/app/assets/javascripts/repositories/validators/base_validator.js
@@ -1,11 +1,40 @@
-/* global GLOBAL_CONSTANTS textValidator I18n */
+/* global GLOBAL_CONSTANTS I18n */
 
 $.fn.dataTable.render.RowNameValidator = function($input) {
-  return textValidator(undefined, $input, 1, GLOBAL_CONSTANTS.NAME_MAX_LENGTH);
+  var $inputContainer = $input.closest('.sci-input-container');
+  var value = $input.val();
+  var errorText;
+
+  if (value === '') {
+    errorText = I18n.t('repositories.table.name.errors.is_empty');
+  } else if (value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH) {
+    errorText = I18n.t('repositories.table.name.errors.too_long', { max_length: GLOBAL_CONSTANTS.FILE_MAX_SIZE_MB });
+  }
+
+  if (errorText) {
+    $inputContainer.addClass('error');
+    $inputContainer.attr('data-error-text', errorText);
+    return false;
+  }
+
+  $inputContainer.removeClass('error');
+  return true;
 };
 
 $.fn.dataTable.render.RepositoryTextValueValidator = function($input) {
-  return textValidator(undefined, $input, 0, GLOBAL_CONSTANTS.TEXT_MAX_LENGTH);
+  var $inputContainer = $input.closest('.sci-input-container');
+  var value = $input.val();
+  var errorText;
+
+  if (value.length > GLOBAL_CONSTANTS.TEXT_MAX_LENGTH) {
+    errorText = I18n.t('repositories.table.text.errors.too_long', { max_length: GLOBAL_CONSTANTS.TEXT_MAX_LENGTH });
+    $inputContainer.addClass('error');
+    $inputContainer.attr('data-error-text', errorText);
+    return false;
+  }
+
+  $inputContainer.removeClass('error');
+  return true;
 };
 
 $.fn.dataTable.render.RepositoryListValueValidator = function() {
diff --git a/app/assets/javascripts/sitewide/form_errors.js b/app/assets/javascripts/sitewide/form_errors.js
index 2db026ef3..8a11b5723 100644
--- a/app/assets/javascripts/sitewide/form_errors.js
+++ b/app/assets/javascripts/sitewide/form_errors.js
@@ -35,12 +35,6 @@ var renderFormError = function(ev, input, errMsgs, clearErr, errAttributes) {
 
     })).join('<br />');
 
-    if ($(input).hasClass('sci-input-field')) {
-      $(input).closest('.sci-input-container').addClass('error');
-      $(input).closest('.sci-input-container').attr('data-error-text', errorText);
-      return;
-    }
-
     // Mark error form group
     var $formGroup = $(input).closest('.form-group');
     if (!$formGroup.hasClass('has-error')) {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d6890198f..464592d7d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1058,6 +1058,8 @@ en:
       assets:
         select_file_btn: "Select File (Max %{max_size} MB)..."
       text:
+        errors:
+          :too_long: "Text is too long (maximum is %{max_length} characters)"
         enter_text: "Enter text"
       number:
         enter_number: "Enter number"
@@ -1071,6 +1073,11 @@ en:
         errors:
           set_all_or_none: 'Needs to set both or none'
           not_valid_range: 'Range is not valid.'
+      name:
+        errors:
+          too_long: "Item name is too long (maximum is %{max_length} characters)"
+          is_empty: "Item name should be filled"
+
     add_new_record: "New item"
     import_records:
       import: 'Import'