Merge pull request #41 from Netcentric/result-page-loading

Result page loading
Netcentric · Mar 19, 2024 · df18055 · df18055
2 parents f92f557 + 412c896
commit df18055
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/scripts/aem.js b/scripts/aem.js
@@ -563,10 +563,9 @@ function buildBlock(blockName, content) {
  * @param {Element} block The block element
  */
 async function loadBlock(block) {
-  const status = block.dataset.blockStatus;
-  if (status !== 'loading' && status !== 'loaded') {
+  const { blockName, status } = block.dataset;
+  if (blockName && status !== 'loading' && status !== 'loaded') {
     block.dataset.blockStatus = 'loading';
-    const { blockName } = block.dataset;
     try {
       const cssLoaded = loadCSS(`${window.hlx.codeBasePath}/blocks/${blockName}/${blockName}.css`);
       const decorationComplete = new Promise((resolve) => {

diff --git a/scripts/scripts.js b/scripts/scripts.js
@@ -94,14 +94,7 @@ async function prepareSpecification() {
   const isEngineFocus = !isShipFocus && isTemplate('engine-focus');
   const isConfigurationResult = !isShipFocus && !isEngineFocus && isTemplate('configuration-result');
   try {
-    const configurationsPromise = isConfigurationResult && fetch('https://main--edge-delivery-solari--netcentric.hlx.page/configurations.json', {
-      mode: 'no-cors',
-      cache: 'no-cache',
-      headers: {
-        'Content-Type': 'application/json',
-        'Cache-Control': 'no-cache',
-      },
-    });
+    const configurationsPromise = isConfigurationResult && fetch('/configurations.json', { cache: 'no-cache' });
 
     if (!isShipFocus && !isEngineFocus && !isConfigurationResult) {
       return;