Extract string normalization to a partial script

seart-group · Mar 26, 2024 · 76edff5 · 76edff5
1 parent 37662fa
commit 76edff5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/views/conflict.ejs b/views/conflict.ejs
@@ -331,6 +331,7 @@
         </main>
         <%- include('./partials/footer'); %>
         <%- include('./partials/scripts/general'); %>
+        <%- include('./partials/scripts/normalize') %>
         <%- include('./partials/scripts/hljs'); %>
         <script src="/socket.io/socket.io.js"></script>
         <script>
@@ -353,14 +354,6 @@
             const redirect = () => window.location.replace("/conflicts");
             const toast = (element) => new bootstrap.Toast(element).show();
 
-            const normalize = (name) => {
-                const coalesced = name ?? "";
-                const normalized = coalesced.replaceAll(/\s+/g, " ");
-                const lowercase = normalized.toLowerCase();
-                const trimmed = lowercase.trim();
-                return (trimmed.length === 0) ? null : trimmed;
-            };
-
             const addOption = (label) => {
                 const search = normalize(labelFilter.value);
                 const options = labelInstanceSelect.options;

diff --git a/views/label.ejs b/views/label.ejs
@@ -309,6 +309,7 @@
         </main>
         <%- include('./partials/footer'); %>
         <%- include('./partials/scripts/general'); %>
+        <%- include('./partials/scripts/normalize') %>
         <%- include('./partials/scripts/table-download'); %>
         <script src="/socket.io/socket.io.js"></script>
         <script>
@@ -324,14 +325,6 @@
 
             const toast = (element) => new bootstrap.Toast(element).show();
 
-            const normalize = (name) => {
-                const coalesced = name ?? "";
-                const normalized = coalesced.replaceAll(/\s+/g, " ");
-                const lowercase = normalized.toLowerCase();
-                const trimmed = lowercase.trim();
-                return (trimmed.length === 0) ? null : trimmed;
-            };
-
             renameModalForm.addEventListener("submit", (event) => {
                 event.preventDefault();
                 const form = event.target;

diff --git a/views/partials/scripts/normalize.ejs b/views/partials/scripts/normalize.ejs
@@ -0,0 +1,9 @@
+<script>
+    const normalize = (name) => {
+        const coalesced = name ?? "";
+        const normalized = coalesced.replaceAll(/\s+/g, " ");
+        const lowercase = normalized.toLowerCase();
+        const trimmed = lowercase.trim();
+        return (trimmed.length === 0) ? null : trimmed;
+    };
+</script>
diff --git a/views/review.ejs b/views/review.ejs
@@ -211,6 +211,7 @@
         </main>
         <%- include('./partials/footer'); %>
         <%- include('./partials/scripts/general'); %>
+        <%- include('./partials/scripts/normalize') %>
         <%- include('./partials/scripts/hljs'); %>
         <% if (!!reviewer && !!instance) { %>
             <script src="/socket.io/socket.io.js"></script>
@@ -234,14 +235,6 @@
                 const refresh = () => history.go();
                 const toast = (element) => new bootstrap.Toast(element).show();
 
-                const normalize = (name) => {
-                    const coalesced = name ?? "";
-                    const normalized = coalesced.replaceAll(/\s+/g, " ");
-                    const lowercase = normalized.toLowerCase();
-                    const trimmed = lowercase.trim();
-                    return (trimmed.length === 0) ? null : trimmed;
-                };
-
                 const addOption = (label) => {
                     const search = normalize(labelFilter.value);
                     const options = labelInstanceSelect.options;