Merge pull request #222 from adobecom/dev

Dev -> Stage 27 Sept. 2024
adobecom · Sep 27, 2024 · 1ae33a0 · 1ae33a0
2 parents 208aec6 + 85d147c
commit 1ae33a0
Show file tree

Hide file tree

Showing 26 changed files with 211 additions and 142 deletions.
diff --git a/ecc/blocks/attendee-management-table/attendee-management-table.js b/ecc/blocks/attendee-management-table/attendee-management-table.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 import { getAllEventAttendees, getEvents } from '../../scripts/esp-controller.js';
 import { ALLOWED_ACCOUNT_TYPES } from '../../constants/constants.js';
-import { DEV_MODE, LIBS, MILO_CONFIG } from '../../scripts/scripts.js';
+import { LIBS } from '../../scripts/scripts.js';
 import {
   getIcon,
   buildNoAccessScreen,
@@ -418,7 +418,6 @@ function buildBackToDashboardBtn(props, config) {
   if (!sidePanel) return;
 
   const url = new URL(`${window.location.origin}${config['event-dashboard-url']}`);
-  if (DEV_MODE) url.searchParams.set('devMode', true);
   const backBtn = createTag('a', { class: 'back-btn', href: url.toString() }, 'Back', { parent: sidePanel });
   backBtn.prepend(getIcon('chev-left'));
 }
@@ -554,20 +553,11 @@ export default async function init(el) {
     import(`${miloLibs}/features/spectrum-web-components/dist/link.js`),
   ]);
 
-  const { search } = window.location;
-  const urlParams = new URLSearchParams(search);
-  const devMode = urlParams.get('devMode');
-
   const config = readBlockConfig(el);
   el.innerHTML = '';
   buildLoadingScreen(el);
   const profile = BlockMediator.get('imsProfile');
 
-  if (devMode === 'true' && ['stage', 'local'].includes(MILO_CONFIG.env.name)) {
-    buildDashboard(el, config);
-    return;
-  }
-
   if (profile) {
     if (profile.noProfile || !ALLOWED_ACCOUNT_TYPES.includes(profile.account_type)) {
       buildNoAccessScreen(el);

diff --git a/ecc/blocks/ecc-dashboard/ecc-dashboard.js b/ecc/blocks/ecc-dashboard/ecc-dashboard.js
@@ -7,7 +7,7 @@ import {
   unpublishEvent,
 } from '../../scripts/esp-controller.js';
 import { ALLOWED_ACCOUNT_TYPES } from '../../constants/constants.js';
-import { LIBS, MILO_CONFIG, DEV_MODE } from '../../scripts/scripts.js';
+import { LIBS } from '../../scripts/scripts.js';
 import { getIcon, buildNoAccessScreen, getEventPageHost, readBlockConfig } from '../../scripts/utils.js';
 import { quickFilter } from '../form-handler/data-handler.js';
 import BlockMediator from '../../scripts/deps/block-mediator.min.js';
@@ -388,7 +388,6 @@ function buildStatusTag(event) {
 function buildEventTitleTag(config, eventObj) {
   const url = new URL(`${window.location.origin}${config['create-form-url']}`);
   url.searchParams.set('eventId', eventObj.eventId);
-  if (DEV_MODE) url.searchParams.set('devMode', true);
   const eventTitleTag = createTag('a', { class: 'event-title-link', href: url.toString() }, eventObj.title);
   return eventTitleTag;
 }
@@ -407,7 +406,6 @@ function buildRSVPTag(config, eventObj) {
 
   const url = new URL(`${window.location.origin}${config['attendee-dashboard-url']}`);
   url.searchParams.set('eventId', eventObj.eventId);
-  if (DEV_MODE) url.searchParams.set('devMode', true);
 
   const rsvpTag = createTag('a', { class: 'rsvp-tag', href: url }, text);
   return rsvpTag;
@@ -709,11 +707,6 @@ export default async function init(el) {
   buildLoadingScreen(el);
   const profile = BlockMediator.get('imsProfile');
 
-  if (DEV_MODE === true && ['stage', 'local'].includes(MILO_CONFIG.env.name)) {
-    buildDashboard(el, config);
-    return;
-  }
-
   if (profile) {
     if (profile.noProfile || !ALLOWED_ACCOUNT_TYPES.includes(profile.account_type)) {
       buildNoAccessScreen(el);

diff --git a/ecc/blocks/event-community-link-component/event-community-link-component.js b/ecc/blocks/event-community-link-component/event-community-link-component.js
@@ -1,3 +1,4 @@
+import { LINK_REGEX } from '../../constants/constants.js';
 import { LIBS } from '../../scripts/scripts.js';
 import { generateToolTip } from '../../scripts/utils.js';
 
@@ -14,7 +15,7 @@ async function decorateFields(row) {
     id: 'community-url-details',
     class: 'text-input',
     placeholder: text,
-    pattern: '^https:\\/\\/[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,5}(:[0-9]{1,5})?(\\/.*)?$',
+    pattern: LINK_REGEX,
     size: 'xl',
   });
 

diff --git a/ecc/blocks/form-handler/controllers/checkbox-component-controller.js b/ecc/blocks/form-handler/controllers/checkbox-component-controller.js
@@ -40,7 +40,11 @@ export default function init(component, props) {
   });
 }
 
-export async function onUpdate(_component, _props) {
+export async function onPayloadUpdate(_component, _props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(_component, _props) {
   // Do nothing
 }
 

diff --git a/ecc/blocks/form-handler/controllers/event-agenda-component-controller.js b/ecc/blocks/form-handler/controllers/event-agenda-component-controller.js
@@ -17,7 +17,11 @@ export function onSubmit(component, props) {
   props.payload = { ...props.payload, ...agendaInfo };
 }
 
-export async function onUpdate(_component, _props) {
+export async function onPayloadUpdate(_component, _props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(_component, _props) {
   // Do nothing
 }
 

diff --git a/ecc/blocks/form-handler/controllers/event-community-link-component-controller.js b/ecc/blocks/form-handler/controllers/event-community-link-component-controller.js
@@ -16,7 +16,11 @@ export function onSubmit(component, props) {
   }
 }
 
-export async function onUpdate(_component, _props) {
+export async function onPayloadUpdate(_component, _props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(_component, _props) {
   // Do nothing
 }
 

diff --git a/ecc/blocks/form-handler/controllers/event-format-component-controller.js b/ecc/blocks/form-handler/controllers/event-format-component-controller.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-vars */
 import { getSeries } from '../../../scripts/esp-controller.js';
-import { LIBS, BlockMediator } from '../../../scripts/scripts.js';
+import BlockMediator from '../../../scripts/deps/block-mediator.min.js';
+import { LIBS } from '../../../scripts/scripts.js';
 import { changeInputValue } from '../../../scripts/utils.js';
 
 const { createTag } = await import(`${LIBS}/utils/utils.js`);
@@ -52,7 +53,7 @@ function initStepLock(component) {
   onFormatChange();
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   const { seriesId } = props.payload;
   if (seriesId) {
     const partnerSelectorGroups = document.querySelectorAll('partner-selector-group');
@@ -67,6 +68,10 @@ export async function onUpdate(component, props) {
   }
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 async function populateSeriesOptions(props, component) {
   const seriesSelect = component.querySelector('#series-select-input');
   if (!seriesSelect) return;

diff --git a/ecc/blocks/form-handler/controllers/event-info-component-controller.js b/ecc/blocks/form-handler/controllers/event-info-component-controller.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-use-before-define */
 import { getEvents } from '../../../scripts/esp-controller.js';
-import { BlockMediator, LIBS } from '../../../scripts/scripts.js';
+import BlockMediator from '../../../scripts/deps/block-mediator.min.js';
+import { LIBS } from '../../../scripts/scripts.js';
 import { changeInputValue } from '../../../scripts/utils.js';
 
 const { createTag, getConfig } = await import(`${LIBS}/utils/utils.js`);
@@ -342,10 +343,14 @@ export function onSubmit(component, props) {
   props.payload = { ...props.payload, ...eventInfo };
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   // do nothing
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 function checkEventDuplication(event, compareMetrics) {
   const titleMatch = event.title === compareMetrics.title;
   const startDateMatch = event.localStartDate === compareMetrics.startDate;
@@ -376,7 +381,7 @@ export default async function init(component, props) {
     BlockMediator.set('eventDupMetrics', { ...BlockMediator.get('eventDupMetrics'), title: eventTitleInput.value });
   });
 
-  endTimeInput.addEventListener('change', () => {
+  const updateEndTimeOptions = () => {
     if (datePicker.dataset.startDate !== datePicker.dataset.endDate) return;
     const allOptions = startTimeInput.querySelectorAll('sp-menu-item');
     allOptions.forEach((option) => {
@@ -386,9 +391,9 @@ export default async function init(component, props) {
         option.disabled = false;
       }
     });
-  });
+  };
 
-  startTimeInput.addEventListener('change', () => {
+  const updateStartTimeOptions = () => {
     if (datePicker.dataset.startDate !== datePicker.dataset.endDate) return;
     const allOptions = endTimeInput.querySelectorAll('sp-menu-item');
     allOptions.forEach((option) => {
@@ -398,9 +403,9 @@ export default async function init(component, props) {
         option.disabled = false;
       }
     });
-  });
+  };
 
-  datePicker.addEventListener('change', () => {
+  const updateTimeOptionsBasedOnDate = () => {
     if (datePicker.dataset.startDate !== datePicker.dataset.endDate) {
       startTimeInput?.querySelectorAll('sp-menu-item')?.forEach((option) => {
         option.disabled = false;
@@ -409,7 +414,13 @@ export default async function init(component, props) {
         option.disabled = false;
       });
     }
+  };
 
+  endTimeInput.addEventListener('change', updateEndTimeOptions);
+  startTimeInput.addEventListener('change', updateStartTimeOptions);
+
+  datePicker.addEventListener('change', () => {
+    updateTimeOptionsBasedOnDate();
     BlockMediator.set('eventDupMetrics', { ...BlockMediator.get('eventDupMetrics'), startDate: datePicker.dataset.startDate });
   });
 
@@ -473,6 +484,10 @@ export default async function init(component, props) {
     });
     component.classList.add('prefilled');
   }
+
+  updateEndTimeOptions();
+  updateStartTimeOptions();
+  updateTimeOptionsBasedOnDate();
 }
 
 export function onEventUpdate(component, props) {

diff --git a/ecc/blocks/form-handler/controllers/event-partners-component-controller.js b/ecc/blocks/form-handler/controllers/event-partners-component-controller.js
@@ -95,7 +95,7 @@ export async function onSubmit(component, props) {
   props.payload = { ...props.payload, showSponsors };
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   if (!PARTNERS_SERIES_ID || PARTNERS_SERIES_ID !== props.eventDataResp.seriesId) {
     const partnersGroup = component.querySelector('partner-selector-group');
 
@@ -108,6 +108,10 @@ export async function onUpdate(component, props) {
   }
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 export default async function init(component, props) {
   const eventData = props.eventDataResp;
   const partnersGroup = component.querySelector('partner-selector-group');

diff --git a/ecc/blocks/form-handler/controllers/event-topics-component-controller.js b/ecc/blocks/form-handler/controllers/event-topics-component-controller.js
@@ -9,7 +9,11 @@ export function onSubmit(component, props) {
   props.payload = { ...props.payload, topics, fullTopicsValue };
 }
 
-export async function onUpdate(_component, _props) {
+export async function onPayloadUpdate(_component, _props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(_component, _props) {
   // Do nothing
 }
 

diff --git a/ecc/blocks/form-handler/controllers/img-upload-component-controller.js b/ecc/blocks/form-handler/controllers/img-upload-component-controller.js
@@ -38,10 +38,14 @@ function updateImgUploadComponentConfigs(component) {
   component.dataset.configs = JSON.stringify(configs);
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   updateImgUploadComponentConfigs(component);
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 export default async function init(component, props) {
   const type = getComponentImageType(component);
   const dropzones = component.querySelectorAll('image-dropzone');

diff --git a/ecc/blocks/form-handler/controllers/product-promotion-component-controller.js b/ecc/blocks/form-handler/controllers/product-promotion-component-controller.js
@@ -100,10 +100,14 @@ async function updateProductSelector(component, props) {
   });
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   await updateProductSelector(component, props);
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 export default async function init(component, props) {
   const eventData = props.eventDataResp;
   const productGroup = component.querySelector('product-selector-group');

diff --git a/ecc/blocks/form-handler/controllers/profile-component-controller.js b/ecc/blocks/form-handler/controllers/profile-component-controller.js
@@ -101,7 +101,7 @@ export async function onSubmit(component, props) {
   }
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   const containers = component.querySelectorAll('profile-container');
   containers.forEach(async (container) => {
     if (props.payload.seriesId && props.payload.seriesId !== container.seriesId) {
@@ -113,6 +113,10 @@ export async function onUpdate(component, props) {
   });
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 async function prefillProfiles(props) {
   const d = await props.eventDataResp;
   if (d?.eventId && d.seriesId) {

diff --git a/ecc/blocks/form-handler/controllers/registration-details-component-controller.js b/ecc/blocks/form-handler/controllers/registration-details-component-controller.js
@@ -59,7 +59,11 @@ export function onSubmit(component, props) {
   props.payload = { ...props.payload, ...rsvpData };
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(component, props) {
   if (!props.eventDataResp) return;
 
   if (props.eventDataResp.cloudType === 'CreativeCloud') {

diff --git a/ecc/blocks/form-handler/controllers/registration-fields-component-controller.js b/ecc/blocks/form-handler/controllers/registration-fields-component-controller.js
@@ -12,7 +12,11 @@ export function onSubmit(component, props) {
   props.payload = { ...props.payload, rsvpFormFields };
 }
 
-export async function onUpdate(_component, _props) {
+export async function onPayloadUpdate(_component, _props) {
+  // Do nothing
+}
+
+export async function onRespUpdate(_component, _props) {
   // Do nothing
 }
 

diff --git a/ecc/blocks/form-handler/controllers/terms-conditions-component-controller.js b/ecc/blocks/form-handler/controllers/terms-conditions-component-controller.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-unused-vars */
-import { ECC_ENV, LIBS } from '../../../scripts/scripts.js';
+import { LIBS } from '../../../scripts/scripts.js';
 import HtmlSanitizer from '../../../scripts/deps/html-sanitizer.js';
-import { fetchThrottledMemoizedText, getEventPageHost } from '../../../scripts/utils.js';
-import { getFilteredCachedResponse } from '../data-handler.js';
+import { fetchThrottledMemoizedText, getECCEnv } from '../../../scripts/utils.js';
 
-const { customFetch } = await import(`${LIBS}/utils/helpers.js`);
 const { createTag } = await import(`${LIBS}/utils/utils.js`);
 
 function buildTerms(terms) {
@@ -37,7 +35,7 @@ async function loadPreview(component, templateId) {
 
   let host;
   if (window.location.href.includes('.hlx.')) {
-    host = window.location.origin.replace(window.location.hostname, `${ECC_ENV}--events-milo--adobecom.hlx.page`);
+    host = window.location.origin.replace(window.location.hostname, `${getECCEnv()}--events-milo--adobecom.hlx.page`);
   } else {
     host = window.location.origin;
   }
@@ -63,12 +61,16 @@ async function loadPreview(component, templateId) {
   }
 }
 
-export async function onUpdate(component, props) {
+export async function onPayloadUpdate(component, props) {
   const { templateId } = props.payload;
   if (!templateId) return;
   await loadPreview(component, templateId);
 }
 
+export async function onRespUpdate(_component, _props) {
+  // Do nothing
+}
+
 export default async function init(component, props) {
   const { templateId } = props.payload;
   if (!templateId) return;