rename blocks

hlxsites · May 29, 2024 · f32b68a · f32b68a
1 parent c0f0b12
commit f32b68a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/...campaign-details/gmo-campaign-details.css → ...o-program-details/gmo-program-details.css b/...campaign-details/gmo-campaign-details.css → ...o-program-details/gmo-program-details.css
diff --git a/...-campaign-details/gmo-campaign-details.js → ...mo-program-details/gmo-program-details.js b/...-campaign-details/gmo-campaign-details.js → ...mo-program-details/gmo-program-details.js
@@ -1,8 +1,7 @@
 import { decorateIcons, readBlockConfig } from '../../scripts/lib-franklin.js';
 import { getQueryVariable } from '../../scripts/shared.js';
 import { getProgramInfo } from '../../scripts/graphql.js';
-import { resolveMappings, filterArray, getProductMapping } from '../../scripts/shared-mappings.js';
-import { checkBlankString } from '../gmo-campaign-list/gmo-campaign-list.js'
+import { resolveMappings, filterArray, getProductMapping, checkBlankString } from '../../scripts/shared-program.js';
 import { getBaseConfigPath } from '../../scripts/site-config.js';
 import { searchAsset } from '../../scripts/assets.js';
 

diff --git a/...o-campaign-header/gmo-campaign-header.css → ...gmo-program-header/gmo-program-header.css b/...o-campaign-header/gmo-campaign-header.css → ...gmo-program-header/gmo-program-header.css
@@ -6,7 +6,6 @@
 .inputs-wrapper {
     display: flex;
     height: 50px;
-    padding-left: 10px;
 }
 .search-wrapper {
     background-color: #FFF;

diff --git a/...mo-campaign-header/gmo-campaign-header.js → .../gmo-program-header/gmo-program-header.js b/...mo-campaign-header/gmo-campaign-header.js → .../gmo-program-header/gmo-program-header.js
diff --git a/...s/gmo-campaign-list/gmo-campaign-list.css → blocks/gmo-program-list/gmo-program-list.css b/...s/gmo-campaign-list/gmo-campaign-list.css → blocks/gmo-program-list/gmo-program-list.css
diff --git a/...ks/gmo-campaign-list/gmo-campaign-list.js → blocks/gmo-program-list/gmo-program-list.js b/...ks/gmo-campaign-list/gmo-campaign-list.js → blocks/gmo-program-list/gmo-program-list.js
@@ -1,7 +1,7 @@
 import { readBlockConfig } from '../../scripts/lib-franklin.js';
 import { decorateIcons } from '../../scripts/lib-franklin.js';
 import { graphqlAllCampaignsFilter, graphqlCampaignCount, generateFilterJSON, getMappingInfo } from '../../scripts/graphql.js';
-import { getProductMapping } from '../../scripts/shared-mappings.js'
+import { getProductMapping, checkBlankString } from '../../scripts/shared-program.js'
 import { getBaseConfigPath } from '../../scripts/site-config.js';
 import { searchAsset } from '../../scripts/assets.js';
 
@@ -473,10 +473,12 @@ function sortColumn(dir, property) {
 }
 
 // supply dummy data if none present
+/*
 export function checkBlankString(string) {
     if (string == undefined || string == '' ) {
         return 'Not Available';
     } else {
         return string;
     }
 }
+*/
diff --git a/scripts/shared-mappings.js → scripts/shared-program.js b/scripts/shared-mappings.js → scripts/shared-program.js
@@ -29,4 +29,15 @@ export async function getProductMapping(product) {
         label: productsText,
         icon: icon
     }
-}
+}
+
+/*
+*   Check for undefined/blank property and supply 'Not Available' if no data
+*/
+export function checkBlankString(string) {
+    if (string == undefined || string == '' ) {
+        return 'Not Available';
+    } else {
+        return string;
+    }
+}