Extract Functions.checkIndexName() to a module

MauricioFauth · MauricioFauth · commit ace3fe677104 · 2023-01-30T17:23:17.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/modules/functions.js b/js/src/modules/functions.js
@@ -12,6 +12,7 @@ import getImageTag from './functions/getImageTag.js';
 import handleRedirectAndReload from './functions/handleRedirectAndReload.js';
 import refreshMainContent from './functions/refreshMainContent.js';
 import checkIndexType from './indexes/checkIndexType.js';
+import checkIndexName from './indexes/checkIndexName.js';
 
 /* global DatabaseStructure */ // js/database/structure.js
 /* global firstDayOfCalendar, themeImagePath */ // templates/javascript/variables.twig
@@ -2575,36 +2576,6 @@ Functions.onloadEnumSetEditor = function () {
     });
 };
 
-/**
- * Ensures indexes names are valid according to their type and, for a primary
- * key, lock index name to 'PRIMARY'
- * @param {string} formId Variable which parses the form name as
- *                        the input
- * @return {boolean} false if there is no index form, true else
- */
-Functions.checkIndexName = function (formId) {
-    if ($('#' + formId).length === 0) {
-        return false;
-    }
-
-    // Gets the elements pointers
-    var $theIdxName = $('#input_index_name');
-    var $theIdxChoice = $('#select_index_choice');
-
-    // Index is a primary key
-    if ($theIdxChoice.find('option:selected').val() === 'PRIMARY') {
-        $theIdxName.val('PRIMARY');
-        $theIdxName.prop('disabled', true);
-    } else {
-        if ($theIdxName.val() === 'PRIMARY') {
-            $theIdxName.val('');
-        }
-        $theIdxName.prop('disabled', false);
-    }
-
-    return true;
-};
-
 /**
  * Handler for adding more columns to an index in the editor
  * @return {function}
@@ -2760,7 +2731,7 @@ Functions.indexRenameDialog = function (url, title, callbackSuccess, callbackFai
 
 Functions.showIndexEditDialog = function ($outer) {
     checkIndexType();
-    Functions.checkIndexName('index_frm');
+    checkIndexName('index_frm');
     var $indexColumns = $('#index_columns');
     $indexColumns.find('td').each(function () {
         $(this).css('width', $(this).width() + 'px');
diff --git a/js/src/modules/indexes.js b/js/src/modules/indexes.js
@@ -8,6 +8,7 @@ import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.js';
 import getJsConfirmCommonParam from './functions/getJsConfirmCommonParam.js';
 import refreshMainContent from './functions/refreshMainContent.js';
 import checkIndexType from './indexes/checkIndexType.js';
+import checkIndexName from './indexes/checkIndexName.js';
 
 /**
  * @fileoverview    function used for index manipulation pages
@@ -371,7 +372,7 @@ Indexes.showAddIndexDialog = function (sourceArray, arrayIndex, targetColumns, c
                 $('#addIndexModal').modal('show');
                 $('#addIndexModalLabel').first().text(window.Messages.strAddIndex);
                 $('#addIndexModal').find('.modal-body').first().html(data.message);
-                Functions.checkIndexName('index_frm');
+                checkIndexName('index_frm');
                 Functions.showHints($div);
                 $('#index_columns').find('td').each(function () {
                     $(this).css('width', $(this).width() + 'px');
@@ -563,7 +564,7 @@ Indexes.on = () => function () {
     $(document).on('change', '#select_index_choice', function (event) {
         event.preventDefault();
         checkIndexType();
-        Functions.checkIndexName('index_frm');
+        checkIndexName('index_frm');
     });
 
     /**
diff --git a/js/src/modules/indexes/checkIndexName.js b/js/src/modules/indexes/checkIndexName.js
@@ -0,0 +1,31 @@
+import $ from 'jquery';
+
+/**
+ * Ensures indexes names are valid according to their type and, for a primary
+ * key, lock index name to 'PRIMARY'
+ * @param {string} formId Variable which parses the form name as
+ *                        the input
+ * @return {boolean} false if there is no index form, true else
+ */
+export default function checkIndexName (formId) {
+    if ($('#' + formId).length === 0) {
+        return false;
+    }
+
+    // Gets the elements pointers
+    var $theIdxName = $('#input_index_name');
+    var $theIdxChoice = $('#select_index_choice');
+
+    // Index is a primary key
+    if ($theIdxChoice.find('option:selected').val() === 'PRIMARY') {
+        $theIdxName.val('PRIMARY');
+        $theIdxName.prop('disabled', true);
+    } else {
+        if ($theIdxName.val() === 'PRIMARY') {
+            $theIdxName.val('');
+        }
+        $theIdxName.prop('disabled', false);
+    }
+
+    return true;
+}
