From 71e6e9240eb3ee959ea81011366a2fcea019077c Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Tue, 19 Nov 2024 19:57:27 -0500 Subject: [PATCH] Move back helpers into the watched folders --- .../modules-admin/domain-request-form.js | 32 +++++++++---------- .../assets/modules-admin/helpers-admin.js | 17 ++++++++++ .../helpers-portfolio-dynamic-fields.js | 2 +- .../assets/modules-admin/portfolio-form.js | 2 +- .../modules-admin/show-more-description.js | 5 +-- src/registrar/assets/modules/combobox.js | 2 +- .../{modules-common => modules}/helpers.js | 9 ------ .../assets/modules/requesting-entity.js | 2 +- src/registrar/assets/modules/table-base.js | 2 +- .../assets/modules/table-domain-requests.js | 2 +- src/registrar/assets/modules/table-domains.js | 2 +- .../assets/modules/table-member-domains.js | 4 +-- src/registrar/assets/modules/table-members.js | 2 +- 13 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 src/registrar/assets/modules-admin/helpers-admin.js rename src/registrar/assets/{modules-common => modules}/helpers.js (91%) diff --git a/src/registrar/assets/modules-admin/domain-request-form.js b/src/registrar/assets/modules-admin/domain-request-form.js index 099ae8557..8323fc30b 100644 --- a/src/registrar/assets/modules-admin/domain-request-form.js +++ b/src/registrar/assets/modules-admin/domain-request-form.js @@ -1,4 +1,4 @@ -import { hideElement, showElement, addOrRemoveSessionBoolean } from '../modules-common/helpers.js'; +import { hideElement, showElement, addOrRemoveSessionBoolean } from './helpers-admin.js'; import { handlePortfolioSelection } from './helpers-portfolio-dynamic-fields.js'; function displayModalOnDropdownClick(linkClickedDisplaysModal, statusDropdown, actionButton, valueToCheck){ @@ -113,7 +113,7 @@ export function initApprovedDomain() { function updateFormGroupVisibility(showFormGroups) { if (showFormGroups) { showElement(approvedDomainFormGroup); - }else { + } else { hideElement(approvedDomainFormGroup); } } @@ -436,8 +436,8 @@ class CustomizableEmailBase { this.modalConfirm.addEventListener("click", () => { this.textarea.removeAttribute('readonly'); this.textarea.focus(); - hideElement(this.directEditButton); - hideElement(this.modalTrigger); + hideElement(this.directEditButton); + hideElement(this.modalTrigger); }); } @@ -445,8 +445,8 @@ class CustomizableEmailBase { this.directEditButton.addEventListener("click", () => { this.textarea.removeAttribute('readonly'); this.textarea.focus(); - hideElement(this.directEditButton); - hideElement(this.modalTrigger); + hideElement(this.directEditButton); + hideElement(this.modalTrigger); }); } @@ -473,12 +473,12 @@ class CustomizableEmailBase { showElement(this.textarea); hideElement(this.textareaPlaceholder); - if (this.isEmailAlreadySentConst) { - hideElement(this.directEditButton); - showElement(this.modalTrigger); - } else { - showElement(this.directEditButton); - hideElement(this.modalTrigger); + if (this.isEmailAlreadySentConst) { + hideElement(this.directEditButton); + showElement(this.modalTrigger); + } else { + showElement(this.directEditButton); + hideElement(this.modalTrigger); } if (this.isEmailAlreadySent()) { @@ -501,10 +501,10 @@ class CustomizableEmailBase { showPlaceholder(formLabelText, placeholderText) { this.formLabel.innerHTML = formLabelText; this.textareaPlaceholder.innerHTML = placeholderText; - showElement(this.textareaPlaceholder); - hideElement(this.directEditButton); - hideElement(this.modalTrigger); - hideElement(this.textarea); + showElement(this.textareaPlaceholder); + hideElement(this.directEditButton); + hideElement(this.modalTrigger); + hideElement(this.textarea); } } diff --git a/src/registrar/assets/modules-admin/helpers-admin.js b/src/registrar/assets/modules-admin/helpers-admin.js new file mode 100644 index 000000000..15cf75e2a --- /dev/null +++ b/src/registrar/assets/modules-admin/helpers-admin.js @@ -0,0 +1,17 @@ +export function hideElement(element) { + console.log(element) + element.classList.add('display-none'); +}; + +export function showElement(element) { + element.classList.remove('display-none'); +}; + +// Adds or removes a boolean from our session +export function addOrRemoveSessionBoolean(name, add){ + if (add) { + sessionStorage.setItem(name, "true"); + }else { + sessionStorage.removeItem(name); + } +} diff --git a/src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js b/src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js index 48ecec4b1..39f30b87f 100644 --- a/src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js +++ b/src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js @@ -1,4 +1,4 @@ -import { hideElement, showElement } from '../modules-common/helpers.js'; +import { hideElement, showElement } from './helpers-admin.js'; /** * Helper function that handles business logic for the suborganization field. diff --git a/src/registrar/assets/modules-admin/portfolio-form.js b/src/registrar/assets/modules-admin/portfolio-form.js index 4dd343ce9..00781f23a 100644 --- a/src/registrar/assets/modules-admin/portfolio-form.js +++ b/src/registrar/assets/modules-admin/portfolio-form.js @@ -1,4 +1,4 @@ -import { hideElement, showElement } from '../modules-common/helpers.js'; +import { hideElement, showElement } from './helpers-admin.js'; /** * A function for dynamically changing some fields on the portfolio admin model diff --git a/src/registrar/assets/modules-admin/show-more-description.js b/src/registrar/assets/modules-admin/show-more-description.js index 0bf0692ef..a66c771a7 100644 --- a/src/registrar/assets/modules-admin/show-more-description.js +++ b/src/registrar/assets/modules-admin/show-more-description.js @@ -1,4 +1,4 @@ -import { hideElement } from '../modules-common/helpers.js'; +import { hideElement } from './helpers-admin.js'; /** An IIFE for toggling the overflow styles on django-admin__model-description (the show more / show less button) */ export function initDescriptions() { @@ -8,7 +8,8 @@ export function initDescriptions() { // Hide the toggle button if text content is less than 200 characters // This is a little over 160 characters to give us some wiggle room if we // change the font size marginally. - hideElement(toggleButton); + if (toggleButton) + hideElement(toggleButton); } else { toggleButton.addEventListener('click', function() { toggleShowMoreButton(toggleButton, descriptionDiv, 'dja__model-description--no-overflow'); diff --git a/src/registrar/assets/modules/combobox.js b/src/registrar/assets/modules/combobox.js index 7133325e8..139106c59 100644 --- a/src/registrar/assets/modules/combobox.js +++ b/src/registrar/assets/modules/combobox.js @@ -1,4 +1,4 @@ -import { hideElement, showElement } from '../modules-common/helpers.js'; +import { hideElement, showElement } from './helpers.js'; export function loadInitialValuesForComboBoxes() { var overrideDefaultClearButton = true; diff --git a/src/registrar/assets/modules-common/helpers.js b/src/registrar/assets/modules/helpers.js similarity index 91% rename from src/registrar/assets/modules-common/helpers.js rename to src/registrar/assets/modules/helpers.js index 007c75814..f02605269 100644 --- a/src/registrar/assets/modules-common/helpers.js +++ b/src/registrar/assets/modules/helpers.js @@ -67,12 +67,3 @@ export function debounce(handler, cooldown=600) { timeout = setTimeout(() => handler.apply(context, args), cooldown); } } - -// Adds or removes a boolean from our session -export function addOrRemoveSessionBoolean(name, add){ - if (add) { - sessionStorage.setItem(name, "true"); - }else { - sessionStorage.removeItem(name); - } -} diff --git a/src/registrar/assets/modules/requesting-entity.js b/src/registrar/assets/modules/requesting-entity.js index b1175aa17..8714a7290 100644 --- a/src/registrar/assets/modules/requesting-entity.js +++ b/src/registrar/assets/modules/requesting-entity.js @@ -1,4 +1,4 @@ -import { hideElement, showElement } from '../modules-common/helpers.js'; +import { hideElement, showElement } from './helpers.js'; /** A function that intializes the requesting entity page. * This page has a radio button that dynamically toggles some fields diff --git a/src/registrar/assets/modules/table-base.js b/src/registrar/assets/modules/table-base.js index 072aa8f1d..ed9cdc655 100644 --- a/src/registrar/assets/modules/table-base.js +++ b/src/registrar/assets/modules/table-base.js @@ -1,4 +1,4 @@ -import { hideElement, showElement, toggleCaret } from '../modules-common/helpers.js'; +import { hideElement, showElement, toggleCaret } from './helpers.js'; export class LoadTableBase { constructor(sectionSelector) { diff --git a/src/registrar/assets/modules/table-domain-requests.js b/src/registrar/assets/modules/table-domain-requests.js index 267b5a57a..55b2c951c 100644 --- a/src/registrar/assets/modules/table-domain-requests.js +++ b/src/registrar/assets/modules/table-domain-requests.js @@ -1,4 +1,4 @@ -import { hideElement, showElement, scrollToElement } from '../modules-common/helpers.js'; +import { hideElement, showElement, scrollToElement } from './helpers.js'; import { initializeModals, unloadModals } from './helpers-uswds.js'; import { getCsrfToken } from './helpers-csrf-token.js'; diff --git a/src/registrar/assets/modules/table-domains.js b/src/registrar/assets/modules/table-domains.js index 17cf3ded0..30677a60d 100644 --- a/src/registrar/assets/modules/table-domains.js +++ b/src/registrar/assets/modules/table-domains.js @@ -1,4 +1,4 @@ -import { scrollToElement } from '../modules-common/helpers.js'; +import { scrollToElement } from './helpers.js'; import { initializeTooltips } from './helpers-uswds.js'; import { LoadTableBase } from './table-base.js'; diff --git a/src/registrar/assets/modules/table-member-domains.js b/src/registrar/assets/modules/table-member-domains.js index 2bf2fb451..1794c72d4 100644 --- a/src/registrar/assets/modules/table-member-domains.js +++ b/src/registrar/assets/modules/table-member-domains.js @@ -1,6 +1,4 @@ -import { hideElement, showElement, scrollToElement, toggleCaret } from '../modules-common/helpers.js'; -import { initializeTooltips, initializeModals, unloadModals } from './helpers-uswds.js'; -import { getCsrfToken } from './helpers-csrf-token.js'; +import { scrollToElement } from './helpers.js'; import { LoadTableBase } from './table-base.js'; diff --git a/src/registrar/assets/modules/table-members.js b/src/registrar/assets/modules/table-members.js index 1a0566508..f75b4c9e3 100644 --- a/src/registrar/assets/modules/table-members.js +++ b/src/registrar/assets/modules/table-members.js @@ -1,4 +1,4 @@ -import { hideElement, showElement, scrollToElement } from '../modules-common/helpers.js'; +import { hideElement, showElement, scrollToElement } from './helpers.js'; import { LoadTableBase } from './table-base.js';