From 7932367b4c08cb86a6d49cbec50f60bb2730c229 Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 18 Aug 2024 00:46:55 +1000
Subject: [PATCH 01/28] First draft of changes to CSS for moving the buttons.
 Needs more thorough testing.

---
 .../lwc/indicatorBundle/indicatorBundle.html  | 126 ++++++++++--------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index 9c4eebd..fbe27d3 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -3,61 +3,77 @@
         <template if:false={errorOccurred}>
             <!-- <lightning-card variant="narrow" icon-name={card.icon} title={card.title}> -->
             <lightning-card variant="narrow">
-                <lightning-button-icon
-                    variant="bare"
-                    icon-name="utility:info_alt"
-                    alternative-text="Indicator Value Key"
-                    class="slds-var-m-left_xx-small"
-                    title="Indicator Value Key"
-                    slot="actions"
-                    onclick={handleInfoKeyClick}
-                    aria-haspopup="dialog"
-                ></lightning-button-icon> 
-                <template if:true={showRefresh}>
-                    <lightning-button-icon 
-                        variant="bare"
-                        icon-name="utility:refresh"
-                        alternative-text="Refresh"
-                        class="slds-var-m-left_xx-small"
-                        title="Refresh"
-                        slot="actions"
-                        onclick={refreshCmdt}
-                    ></lightning-button-icon>
-                </template>
-                <template lwc:if={hasHeader} class="cardIcon">
-                    <template lwc:if={showTitle}>
-                        <h3 slot="title">
-                            <lightning-icon 
-                                lwc:if={card.icon}
-                                icon-name={card.icon} 
-                                size="small"
-                                class={card.iconClass}
-                            >
-                            </lightning-icon>
-                            {card.title}
-                        </h3>
-                    </template>
-                    <template lwc:if={showDescription}>
-                        <p class="slds-var-p-horizontal_medium slds-var-p-bottom_small">{card.body}</p>
-                    </template>
-                </template>
-                <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                <div class="slds-var-m-left_medium">
-                    <template if:true={results}>
-                        <template for:each={results} for:item="fld">
-                            <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
-                                ind-text={fld.fTextShown}
-                                ind-size={indsSize}
-                                ind-shape={indsShape} 
-                                ind-hover-text={fld.fHoverValue}
-                                ind-icon={fld.fIconName}
-                                ind-image={fld.fImageURL}
-                                ind-background-color={fld.fIconBackground}
-                                ind-foreground-color={fld.fIconForeground}
-                                >
-                            </c-indicator-bundle-item>
-                        </template>
-                    </template>
+                <div class="slds-grid grid-wrap">                  
+                    <div class="slds-col slds-grid slds-grid_vertical">
+                        <template lwc:if={hasHeader} class="slds-icon_container slds-var-m-right_small">
+                            <div class="slds-col slds-size_1-of-1">
+                                <template lwc:if={showTitle}>
+                                    <div class="slds-var-p-left_medium slds-var-p-bottom_x-small">
+                                        <h2 slot="title" class="slds-card__header-title">
+                                            <lightning-icon 
+                                                lwc:if={card.icon}
+                                                icon-name={card.icon} 
+                                                size="small"
+                                                class={card.iconClass}
+                                            >
+                                            </lightning-icon>
+                                            {card.title}
+                                        </h2>
+                                    </div>
+                                </template>
+                            </div>
+                            <div class="slds-col slds-size_1-of-1">
+                                <template lwc:if={showDescription}>
+                                    <p class="slds-var-p-left_medium slds-var-p-right_x-small slds-var-p-bottom_small">{card.body}</p>
+                                </template>
+                            </div>
+                        </template>       
+                        <div class="slds-col slds-size_1-of-1">
+                            <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
+                            <div class="slds-var-p-left_medium slds-clearfix">
+                                <template if:true={results}>
+                                    <template for:each={results} for:item="fld">
+                                        <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
+                                            ind-text={fld.fTextShown}
+                                            ind-size={indsSize}
+                                            ind-shape={indsShape} 
+                                            ind-hover-text={fld.fHoverValue}
+                                            ind-icon={fld.fIconName}
+                                            ind-image={fld.fImageURL}
+                                            ind-background-color={fld.fIconBackground}
+                                            ind-foreground-color={fld.fIconForeground}
+                                            >
+                                        </c-indicator-bundle-item>
+                                    </template>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="slds-var-p-right_medium slds-var-p-bottom_x-small" >
+                        <div class="slds-button-group" role="group">
+                            <lightning-button-icon
+                                variant="base"
+                                icon-name="utility:info_alt"
+                                alternative-text="Indicator Value Key"
+                                class="slds-var-m-left_xx-small"
+                                title="Indicator Value Key"
+                                slot="actions"
+                                onclick={handleInfoKeyClick}
+                                aria-haspopup="dialog"
+                            ></lightning-button-icon> 
+                            <template if:true={showRefresh}>
+                                <lightning-button-icon 
+                                    variant="base"
+                                    icon-name="utility:refresh"
+                                    alternative-text="Refresh"
+                                    class="slds-var-m-left_xx-small"
+                                    title="Refresh"
+                                    slot="actions"
+                                    onclick={refreshCmdt}
+                                ></lightning-button-icon>
+                            </template>
+                        </div>
+                    </div>
                 </div>
             </lightning-card>
         </template>

From 4c798b2200a552b87004d121639dd257982fe232 Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 18 Aug 2024 22:38:54 +1000
Subject: [PATCH 02/28] Ready for PR

---
 .../main/default/lwc/indicatorBundle/indicatorBundle.html   | 6 +++---
 .../main/default/lwc/indicatorBundle/indicatorBundle.js     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index fbe27d3..f9ca42a 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -6,7 +6,7 @@
                 <div class="slds-grid grid-wrap">                  
                     <div class="slds-col slds-grid slds-grid_vertical">
                         <template lwc:if={hasHeader} class="slds-icon_container slds-var-m-right_small">
-                            <div class="slds-col slds-size_1-of-1">
+                            <div class="slds-col">
                                 <template lwc:if={showTitle}>
                                     <div class="slds-var-p-left_medium slds-var-p-bottom_x-small">
                                         <h2 slot="title" class="slds-card__header-title">
@@ -22,13 +22,13 @@ <h2 slot="title" class="slds-card__header-title">
                                     </div>
                                 </template>
                             </div>
-                            <div class="slds-col slds-size_1-of-1">
+                            <div class="slds-col">
                                 <template lwc:if={showDescription}>
                                     <p class="slds-var-p-left_medium slds-var-p-right_x-small slds-var-p-bottom_small">{card.body}</p>
                                 </template>
                             </div>
                         </template>       
-                        <div class="slds-col slds-size_1-of-1">
+                        <div class="slds-col">
                             <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
                             <div class="slds-var-p-left_medium slds-clearfix">
                                 <template if:true={results}>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 2bb92c5..a95441f 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -108,9 +108,9 @@ export default class IndicatorBundle extends LightningElement {
                     }
 
                     if(this.bundle.CardIconBackground || this.bundle.CardIconForeground ){
-                        this.card.iconClass = 'cardIcon slds-var-m-right_xx-small ';
+                        this.card.iconClass = 'cardIcon slds-var-m-right_x-small ';
                     } else {
-                        this.card.iconClass = 'slds-var-m-right_xx-small ';
+                        this.card.iconClass = 'slds-var-m-right_x-small ';
                     }
 
                     // console.log('Card Data');

From 08db8cd3f5770b05e399cf35ca5c44102dede95b Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 18 Aug 2024 23:54:04 +1000
Subject: [PATCH 03/28] Dynamic Forms Layout without button layout changes

---
 .../lwc/indicatorBundle/indicatorBundle.html  | 41 ++++++++++++-------
 .../lwc/indicatorBundle/indicatorBundle.js    | 15 ++++++-
 .../indicatorBundle.js-meta.xml               |  1 +
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index 9c4eebd..136365f 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -24,25 +24,38 @@
                         onclick={refreshCmdt}
                     ></lightning-button-icon>
                 </template>
-                <template lwc:if={hasHeader} class="cardIcon">
+                <template lwc:if={isDynamicForms}>
                     <template lwc:if={showTitle}>
-                        <h3 slot="title">
-                            <lightning-icon 
-                                lwc:if={card.icon}
-                                icon-name={card.icon} 
-                                size="small"
-                                class={card.iconClass}
-                            >
-                            </lightning-icon>
-                            {card.title}
-                        </h3>
+                        <div>
+                        <div class={sectionHeaderClass}>
+                                <h3 slot="title" class="label slds-section__title slds-truncate slds-p-top_xx-small slds-p-bottom_xx-small slds-theme_shade">
+                                <span class="slds-var-m-left_medium" title="Section Title">{card.title}</span>
+                                </h3>
+                            </div>
+                        </div>
                     </template>
-                    <template lwc:if={showDescription}>
-                        <p class="slds-var-p-horizontal_medium slds-var-p-bottom_small">{card.body}</p>
+                </template>
+                <template lwc:else>
+                    <template lwc:if={hasHeader} class="cardIcon">
+                        <template lwc:if={showTitle}>
+                            <h3 slot="title">
+                                <lightning-icon 
+                                    lwc:if={card.icon}
+                                    icon-name={card.icon} 
+                                    size="small"
+                                    class={card.iconClass}
+                                >
+                                </lightning-icon>
+                                {card.title}
+                            </h3>
+                        </template>
                     </template>
                 </template>
+                <template lwc:if={showDescription}>
+                    <p class="slds-var-p-horizontal_medium slds-var-p-bottom_small">{card.body}</p>
+                </template>
                 <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                <div class="slds-var-m-left_medium">
+                <div class="slds-var-m-left_medium slds-clearfix">
                     <template if:true={results}>
                         <template for:each={results} for:item="fld">
                             <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 2bb92c5..4f424a8 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -14,6 +14,7 @@ export default class IndicatorBundle extends LightningElement {
     @api flexipageRegionWidth;  // Width of the container on record page
     @api showDescription;
     @api showTitle;
+    @api pageUsage = 'standard';
     @api indsSize = 'large';
     @api indsShape = 'base';
     @api showRefresh = false;
@@ -106,11 +107,21 @@ export default class IndicatorBundle extends LightningElement {
                     if( this.showTitle || this.showDescription ){
                         this.hasHeader = true;
                     }
+                    
+                    if( this.pageUsage == 'dynamic'){
+                        this.isDynamicForms = true;
+                    }
 
                     if(this.bundle.CardIconBackground || this.bundle.CardIconForeground ){
-                        this.card.iconClass = 'cardIcon slds-var-m-right_xx-small ';
+                        this.card.iconClass = 'cardIcon slds-var-m-right_x-small ';
+                    } else {
+                        this.card.iconClass = 'slds-var-m-right_x-small ';
+                    }
+
+                    if(this.flexipageRegionWidth == 'SMALL'){
+                        this.sectionHeaderClass = 'slds-section slds-is-open slds-var-p-horizontal_medium';
                     } else {
-                        this.card.iconClass = 'slds-var-m-right_xx-small ';
+                        this.sectionHeaderClass = 'slds-section slds-is-open';
                     }
 
                     // console.log('Card Data');
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 820c614..82286d0 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,6 +10,7 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="pageUsage" type="String" label="Page Usage" placeholder="standard" datasource="standard,dynamic" description="Choose the Page Usage - Standard Lightning Page, or styled to match Dynamic Forms"/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>

From 341da22ba400dc175cd22ac82e4c07623ff66ed7 Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Mon, 19 Aug 2024 23:46:01 +1000
Subject: [PATCH 04/28] All working with Dynamic Forns, except for Javascript
 that sets the cardIcon to another colour.

---
 .../lwc/indicatorBundle/indicatorBundle.html  | 83 +++++++++++--------
 .../lwc/indicatorBundle/indicatorBundle.js    | 16 +++-
 .../indicatorBundle.js-meta.xml               |  1 +
 3 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index f9ca42a..ed44098 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -2,14 +2,14 @@
     <template if:true={bundleActive}>
         <template if:false={errorOccurred}>
             <!-- <lightning-card variant="narrow" icon-name={card.icon} title={card.title}> -->
-            <lightning-card variant="narrow">
-                <div class="slds-grid grid-wrap">                  
-                    <div class="slds-col slds-grid slds-grid_vertical">
-                        <template lwc:if={hasHeader} class="slds-icon_container slds-var-m-right_small">
-                            <div class="slds-col">
-                                <template lwc:if={showTitle}>
-                                    <div class="slds-var-p-left_medium slds-var-p-bottom_x-small">
-                                        <h2 slot="title" class="slds-card__header-title">
+            <article class="slds-card">
+                <template lwc:if={isStandardUsage}>
+                    <template lwc:if={showTitle}>
+                        <div class="cardIcon">
+                            <div class="slds-card__header slds-grid">
+                                <header class="slds-media slds-media_center slds-has-flexi-truncate">
+                                    <div class="slds-media__body">
+                                        <h2 class="slds-card__header-title">
                                             <lightning-icon 
                                                 lwc:if={card.icon}
                                                 icon-name={card.icon} 
@@ -17,38 +17,53 @@ <h2 slot="title" class="slds-card__header-title">
                                                 class={card.iconClass}
                                             >
                                             </lightning-icon>
-                                            {card.title}
+                                            <slot name="title">
+                                                {card.title}
+                                            </slot>
                                         </h2>
                                     </div>
-                                </template>
-                            </div>
-                            <div class="slds-col">
-                                <template lwc:if={showDescription}>
-                                    <p class="slds-var-p-left_medium slds-var-p-right_x-small slds-var-p-bottom_small">{card.body}</p>
-                                </template>
+                                </header>
                             </div>
-                        </template>       
+                        </div>
+                    </template> 
+                </template>
+                <template lwc:else>  
+                    <template lwc:if={showTitle}>
+                        <div class={sectionHeaderClass}>
+                            <h3 slot="title" class="label slds-section__title slds-truncate slds-p-top_xx-small slds-p-bottom_xx-small slds-theme_shade">
+                                <span class="slds-var-m-left_medium" title="Section Title">{card.title}</span>
+                            </h3>
+                        </div>
+                    </template>      
+                </template>
+                <div class="slds-grid grid-wrap slds-card__body">
+                    <div class="slds-col slds-grid slds-grid_vertical">                 
                         <div class="slds-col">
-                            <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                            <div class="slds-var-p-left_medium slds-clearfix">
-                                <template if:true={results}>
-                                    <template for:each={results} for:item="fld">
-                                        <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
-                                            ind-text={fld.fTextShown}
-                                            ind-size={indsSize}
-                                            ind-shape={indsShape} 
-                                            ind-hover-text={fld.fHoverValue}
-                                            ind-icon={fld.fIconName}
-                                            ind-image={fld.fImageURL}
-                                            ind-background-color={fld.fIconBackground}
-                                            ind-foreground-color={fld.fIconForeground}
-                                            >
-                                        </c-indicator-bundle-item>
-                                    </template>
+                            <template lwc:if={showDescription}>
+                                <p class="slds-var-p-left_medium slds-var-p-right_x-small slds-var-p-bottom_small">{card.body}</p>
+                            </template>
+                        </div>   
+                        <div class="slds-col">
+                        <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
+                        <div class="slds-var-p-left_medium slds-clearfix">
+                            <template if:true={results}>
+                                <template for:each={results} for:item="fld">
+                                    <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
+                                        ind-text={fld.fTextShown}
+                                        ind-size={indsSize}
+                                        ind-shape={indsShape} 
+                                        ind-hover-text={fld.fHoverValue}
+                                        ind-icon={fld.fIconName}
+                                        ind-image={fld.fImageURL}
+                                        ind-background-color={fld.fIconBackground}
+                                        ind-foreground-color={fld.fIconForeground}
+                                        >
+                                    </c-indicator-bundle-item>
                                 </template>
-                            </div>
+                            </template>
                         </div>
                     </div>
+                    </div>
                     <div class="slds-var-p-right_medium slds-var-p-bottom_x-small" >
                         <div class="slds-button-group" role="group">
                             <lightning-button-icon
@@ -75,7 +90,7 @@ <h2 slot="title" class="slds-card__header-title">
                         </div>
                     </div>
                 </div>
-            </lightning-card>
+            </article>
         </template>
     </template>
     <template if:true={errorOccurred}>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index a95441f..242840f 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -14,6 +14,7 @@ export default class IndicatorBundle extends LightningElement {
     @api flexipageRegionWidth;  // Width of the container on record page
     @api showDescription;
     @api showTitle;
+    @api pageUsage = 'standard';
     @api indsSize = 'large';
     @api indsShape = 'base';
     @api showRefresh = false;
@@ -103,14 +104,21 @@ export default class IndicatorBundle extends LightningElement {
                         body: this.bundle.CardText
                     }
 
-                    if( this.showTitle || this.showDescription ){
-                        this.hasHeader = true;
+                    if( this.pageUsage == 'standard'){
+                        this.isStandardUsage = true;
                     }
 
                     if(this.bundle.CardIconBackground || this.bundle.CardIconForeground ){
-                        this.card.iconClass = 'cardIcon slds-var-m-right_x-small ';
+                        this.card.iconClass = 'cardIcon slds-media__figure slds-var-m-right_x-small ';
                     } else {
-                        this.card.iconClass = 'slds-var-m-right_x-small ';
+                        this.card.iconClass = 'slds-media__figure slds-var-m-right_x-small ';
+                    }
+
+                    if(this.flexipageRegionWidth == 'SMALL'){
+                        this.sectionHeaderClass = 'slds-section slds-is-open slds-var-p-horizontal_medium';
+                    } else {
+                        this.card.iconClass = 'slds-var-m-right_xx-small ';
+                        this.sectionHeaderClass = 'slds-section slds-is-open';
                     }
 
                     // console.log('Card Data');
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 820c614..82286d0 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,6 +10,7 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="pageUsage" type="String" label="Page Usage" placeholder="standard" datasource="standard,dynamic" description="Choose the Page Usage - Standard Lightning Page, or styled to match Dynamic Forms"/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>

From f7ab5fab734413652e41fb59a64e61fa5a1e3e3b Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Thu, 29 Aug 2024 21:19:43 -0400
Subject: [PATCH 05/28] Fixed the JS error that could not find the CSS style;
 refactored variable to get method

---
 .../default/lwc/indicatorBundle/indicatorBundle.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 242840f..87051fa 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -58,9 +58,13 @@ export default class IndicatorBundle extends LightningElement {
         }
     }
 
+    get isStandardUsage(){
+        return this.pageUsage == 'standard';
+    }
+
     initCSSVariables() {
 
-        if(this.bundle.CardIconBackground || this.bundle.CardIconForeground) {
+        if(this.showTitle && this.isStandardUsage && (this.bundle.CardIconBackground || this.bundle.CardIconForeground)) {
             var css = this.template.querySelector(".cardIcon").style;
 
             css.setProperty('--backgroundColor', this.bundle.CardIconBackground);
@@ -104,10 +108,6 @@ export default class IndicatorBundle extends LightningElement {
                         body: this.bundle.CardText
                     }
 
-                    if( this.pageUsage == 'standard'){
-                        this.isStandardUsage = true;
-                    }
-
                     if(this.bundle.CardIconBackground || this.bundle.CardIconForeground ){
                         this.card.iconClass = 'cardIcon slds-media__figure slds-var-m-right_x-small ';
                     } else {

From 59a92d1c317b3cf77ea8e600c780158f2e8c078d Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 1 Sep 2024 21:14:43 +1000
Subject: [PATCH 06/28] Changes to CSS to be more consistent wiht standard CSS

---
 .../lwc/indicatorBundle/indicatorBundle.html       | 14 ++++++++------
 .../default/lwc/indicatorBundle/indicatorBundle.js |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index ed44098..5786cb1 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -27,16 +27,18 @@ <h2 class="slds-card__header-title">
                         </div>
                     </template> 
                 </template>
-                <template lwc:else>  
+                <template lwc:else>
+                    <div class="slds-card__body slds-card__body_inner">  
                     <template lwc:if={showTitle}>
-                        <div class={sectionHeaderClass}>
-                            <h3 slot="title" class="label slds-section__title slds-truncate slds-p-top_xx-small slds-p-bottom_xx-small slds-theme_shade">
-                                <span class="slds-var-m-left_medium" title="Section Title">{card.title}</span>
+                        <div class="section-layout-container slds-section slds-is-open slds-button slds-section__title-action slds-theme_shade">
+                            <h3 slot="title" class="slds-truncate slds-p-around_xx-small">
+                                <span class="slds-text-heading_small" title="Section Title">{card.title}</span>
                             </h3>
                         </div>
-                    </template>      
+                    </template>  
+                    </div>    
                 </template>
-                <div class="slds-grid grid-wrap slds-card__body">
+                <div class={sectionBodyClass}>
                     <div class="slds-col slds-grid slds-grid_vertical">                 
                         <div class="slds-col">
                             <template lwc:if={showDescription}>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 87051fa..3a94546 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -115,10 +115,10 @@ export default class IndicatorBundle extends LightningElement {
                     }
 
                     if(this.flexipageRegionWidth == 'SMALL'){
-                        this.sectionHeaderClass = 'slds-section slds-is-open slds-var-p-horizontal_medium';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
                     } else {
-                        this.card.iconClass = 'slds-var-m-right_xx-small ';
-                        this.sectionHeaderClass = 'slds-section slds-is-open';
+                        this.card.iconClass = 'slds-media__figure slds-var-m-right_xx-small';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body slds-card__body_inner';
                     }
 
                     // console.log('Card Data');

From 077e0a3d21787326bce193ddfff5ffe5915b341f Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 1 Sep 2024 21:33:27 +1000
Subject: [PATCH 07/28] Changes to Title Style rather than Page Usage on CPE

---
 force-app/main/default/lwc/indicatorBundle/indicatorBundle.js | 4 ++--
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 3a94546..d431a3b 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -14,7 +14,7 @@ export default class IndicatorBundle extends LightningElement {
     @api flexipageRegionWidth;  // Width of the container on record page
     @api showDescription;
     @api showTitle;
-    @api pageUsage = 'standard';
+    @api titleStyle = 'Lightning Card';
     @api indsSize = 'large';
     @api indsShape = 'base';
     @api showRefresh = false;
@@ -59,7 +59,7 @@ export default class IndicatorBundle extends LightningElement {
     }
 
     get isStandardUsage(){
-        return this.pageUsage == 'standard';
+        return this.titleStyle == 'Lightning Card';
     }
 
     initCSSVariables() {
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 82286d0..45b7dd9 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,8 +10,8 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
-            <property name="pageUsage" type="String" label="Page Usage" placeholder="standard" datasource="standard,dynamic" description="Choose the Page Usage - Standard Lightning Page, or styled to match Dynamic Forms"/>
-            <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
+            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style - Standard Lightning Card, or title Style to match Dynamic Forms"/>
+            <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>        
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>
             <property name="indsShape" type="String" label="Indicator Shape" placeholder="base" datasource="base,circle" description="Choose the Indicator Shape."/>

From ad28d649edf8bd8830ad36840f7027ff2f86e21c Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Sun, 1 Sep 2024 22:39:30 +1000
Subject: [PATCH 08/28] Changes to CSS to make titles Align. Change to CPE to
 use Title Style

---
 .../lwc/indicatorBundle/indicatorBundle.html  | 70 +++++++++++--------
 .../lwc/indicatorBundle/indicatorBundle.js    | 17 ++---
 .../indicatorBundle.js-meta.xml               |  2 +-
 3 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index 136365f..6afd7c8 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -24,18 +24,7 @@
                         onclick={refreshCmdt}
                     ></lightning-button-icon>
                 </template>
-                <template lwc:if={isDynamicForms}>
-                    <template lwc:if={showTitle}>
-                        <div>
-                        <div class={sectionHeaderClass}>
-                                <h3 slot="title" class="label slds-section__title slds-truncate slds-p-top_xx-small slds-p-bottom_xx-small slds-theme_shade">
-                                <span class="slds-var-m-left_medium" title="Section Title">{card.title}</span>
-                                </h3>
-                            </div>
-                        </div>
-                    </template>
-                </template>
-                <template lwc:else>
+                <template lwc:if={isStandardUsage}>
                     <template lwc:if={hasHeader} class="cardIcon">
                         <template lwc:if={showTitle}>
                             <h3 slot="title">
@@ -51,26 +40,45 @@ <h3 slot="title">
                         </template>
                     </template>
                 </template>
-                <template lwc:if={showDescription}>
-                    <p class="slds-var-p-horizontal_medium slds-var-p-bottom_small">{card.body}</p>
-                </template>
-                <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                <div class="slds-var-m-left_medium slds-clearfix">
-                    <template if:true={results}>
-                        <template for:each={results} for:item="fld">
-                            <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
-                                ind-text={fld.fTextShown}
-                                ind-size={indsSize}
-                                ind-shape={indsShape} 
-                                ind-hover-text={fld.fHoverValue}
-                                ind-icon={fld.fIconName}
-                                ind-image={fld.fImageURL}
-                                ind-background-color={fld.fIconBackground}
-                                ind-foreground-color={fld.fIconForeground}
-                                >
-                            </c-indicator-bundle-item>
+                <template lwc:else>
+                    <div class="slds-card__body slds-card__body_inner"> 
+                        <template lwc:if={showTitle}>
+                            <div class="section-layout-container slds-section slds-is-open slds-button slds-section__title-action slds-theme_shade">
+                                <h3 slot="title" class="slds-truncate slds-p-around_xx-small">
+                                <span class="slds-text-heading_small" title="Section Title">{card.title}</span>
+                                </h3>
+                            </div>
                         </template>
-                    </template>
+                    </div>
+                </template>
+                <div class={sectionBodyClass}>
+                    <div class="slds-col slds-grid slds-grid_vertical">                 
+                        <div class="slds-col">
+                            <template lwc:if={showDescription}>
+                                <p class="slds-var-p-left_medium slds-var-p-right_x-small slds-var-p-bottom_small">{card.body}</p>
+                            </template>
+                        </div>   
+                        <div class="slds-col">
+                        <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
+                            <div class="slds-var-p-left_medium slds-clearfix">
+                                <template if:true={results}>
+                                    <template for:each={results} for:item="fld">
+                                        <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
+                                            ind-text={fld.fTextShown}
+                                            ind-size={indsSize}
+                                            ind-shape={indsShape} 
+                                            ind-hover-text={fld.fHoverValue}
+                                            ind-icon={fld.fIconName}
+                                            ind-image={fld.fImageURL}
+                                            ind-background-color={fld.fIconBackground}
+                                            ind-foreground-color={fld.fIconForeground}
+                                            >
+                                        </c-indicator-bundle-item>
+                                    </template>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </lightning-card>
         </template>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 4f424a8..dad52fe 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -14,7 +14,7 @@ export default class IndicatorBundle extends LightningElement {
     @api flexipageRegionWidth;  // Width of the container on record page
     @api showDescription;
     @api showTitle;
-    @api pageUsage = 'standard';
+    @api titleStyle = 'Lightning Card';
     @api indsSize = 'large';
     @api indsShape = 'base';
     @api showRefresh = false;
@@ -58,6 +58,10 @@ export default class IndicatorBundle extends LightningElement {
         }
     }
 
+    get isStandardUsage(){
+        return this.titleStyle == 'Lightning Card';
+    }
+
     initCSSVariables() {
 
         if(this.bundle.CardIconBackground || this.bundle.CardIconForeground) {
@@ -107,21 +111,18 @@ export default class IndicatorBundle extends LightningElement {
                     if( this.showTitle || this.showDescription ){
                         this.hasHeader = true;
                     }
-                    
-                    if( this.pageUsage == 'dynamic'){
-                        this.isDynamicForms = true;
-                    }
 
                     if(this.bundle.CardIconBackground || this.bundle.CardIconForeground ){
                         this.card.iconClass = 'cardIcon slds-var-m-right_x-small ';
                     } else {
                         this.card.iconClass = 'slds-var-m-right_x-small ';
                     }
-
+                    
                     if(this.flexipageRegionWidth == 'SMALL'){
-                        this.sectionHeaderClass = 'slds-section slds-is-open slds-var-p-horizontal_medium';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
                     } else {
-                        this.sectionHeaderClass = 'slds-section slds-is-open';
+                        this.card.iconClass = 'slds-media__figure slds-var-m-right_xx-small';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body slds-card__body_inner';
                     }
 
                     // console.log('Card Data');
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 82286d0..4633fce 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,7 +10,7 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
-            <property name="pageUsage" type="String" label="Page Usage" placeholder="standard" datasource="standard,dynamic" description="Choose the Page Usage - Standard Lightning Page, or styled to match Dynamic Forms"/>
+            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style - Standard Lightning Card, or title Style to match Dynamic Forms"/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>

From 82fc05d3ef6b4763249b60378d7d02439d50f22c Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Mon, 2 Sep 2024 16:15:47 +1000
Subject: [PATCH 09/28] Incorporating vertical space changes into this branch
 also

---
 .forceignore                                  |  5 +++-
 .../indicatorBundleItem.html                  | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.forceignore b/.forceignore
index 6a0c7fe..fc86577 100644
--- a/.forceignore
+++ b/.forceignore
@@ -18,4 +18,7 @@ package.xml
 **/Account/**
 **/Contact/**
 
-**/unpackaged/**
\ No newline at end of file
+**/unpackaged/**
+**/tsconfig.json
+
+**/*.ts
diff --git a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
index c33ab5a..78ea653 100644
--- a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
+++ b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
@@ -1,13 +1,15 @@
 <template>
-    <template if:false={record}>
-        <lightning-avatar 
-            size={indSize}
-            variant={indShape}
-            initials={indText}
-            src={indImage} 
-            fallback-icon-name={indIcon}
-            alternative-text={indHoverText} 
-            class={indClass}>
-        </lightning-avatar>
-    </template>
+    <div class="slds-var-m-bottom_x-small slds-float_left">
+        <template if:false={record}>
+            <lightning-avatar 
+                size={indSize}
+                variant={indShape}
+                initials={indText}
+                src={indImage} 
+                fallback-icon-name={indIcon}
+                alternative-text={indHoverText} 
+                class={indClass}>
+            </lightning-avatar>
+        </template>
+    </div>
 </template>
\ No newline at end of file

From a4489326208484398fd77894f5feed6f9b67a4a4 Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Mon, 2 Sep 2024 16:25:53 +1000
Subject: [PATCH 10/28] Added Vertical Spacing between icons

---
 .../indicatorBundleItem.html                  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
index c33ab5a..78ea653 100644
--- a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
+++ b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
@@ -1,13 +1,15 @@
 <template>
-    <template if:false={record}>
-        <lightning-avatar 
-            size={indSize}
-            variant={indShape}
-            initials={indText}
-            src={indImage} 
-            fallback-icon-name={indIcon}
-            alternative-text={indHoverText} 
-            class={indClass}>
-        </lightning-avatar>
-    </template>
+    <div class="slds-var-m-bottom_x-small slds-float_left">
+        <template if:false={record}>
+            <lightning-avatar 
+                size={indSize}
+                variant={indShape}
+                initials={indText}
+                src={indImage} 
+                fallback-icon-name={indIcon}
+                alternative-text={indHoverText} 
+                class={indClass}>
+            </lightning-avatar>
+        </template>
+    </div>
 </template>
\ No newline at end of file

From 304a2498a16445ab750791435adb8403020d134d Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Mon, 2 Sep 2024 17:21:24 +1000
Subject: [PATCH 11/28] Modifed CSS for Dynamic Forms to be more like standard
 Field Sections

---
 .../main/default/lwc/indicatorBundle/indicatorBundle.html | 2 +-
 .../main/default/lwc/indicatorBundle/indicatorBundle.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index 6afd7c8..96bac89 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -60,7 +60,7 @@ <h3 slot="title" class="slds-truncate slds-p-around_xx-small">
                         </div>   
                         <div class="slds-col">
                         <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                            <div class="slds-var-p-left_medium slds-clearfix">
+                            <div class="slds-var-m-left_medium slds-clearfix">
                                 <template if:true={results}>
                                     <template for:each={results} for:item="fld">
                                         <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index dad52fe..8d3b515 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -118,11 +118,11 @@ export default class IndicatorBundle extends LightningElement {
                         this.card.iconClass = 'slds-var-m-right_x-small ';
                     }
                     
-                    if(this.flexipageRegionWidth == 'SMALL'){
-                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
-                    } else {
-                        this.card.iconClass = 'slds-media__figure slds-var-m-right_xx-small';
+                    if(this.isStandardUsage != true){
                         this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body slds-card__body_inner';
+                    } else {
+                        this.card.iconClass = 'slds-media__figure slds-var-m-right_x-small';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
                     }
 
                     // console.log('Card Data');

From b0f339e69f86890fddb564b80af2335c7c3020a2 Mon Sep 17 00:00:00 2001
From: JodieM <jminers@gmail.com>
Date: Mon, 2 Sep 2024 18:05:01 +1000
Subject: [PATCH 12/28] Simplifed CSS to match to Dynamic Forms Feature

---
 .../main/default/lwc/indicatorBundle/indicatorBundle.html | 2 +-
 .../main/default/lwc/indicatorBundle/indicatorBundle.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index 5786cb1..adc2087 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -47,7 +47,7 @@ <h3 slot="title" class="slds-truncate slds-p-around_xx-small">
                         </div>   
                         <div class="slds-col">
                         <!-- TODO: Do we put this in a Layout which would be responsive to the container, this could allow for empty slots too -->
-                        <div class="slds-var-p-left_medium slds-clearfix">
+                        <div class="slds-var-m-left_medium slds-clearfix">
                             <template if:true={results}>
                                 <template for:each={results} for:item="fld">
                                     <c-indicator-bundle-item if:true={fld.fShowAvatar} key={fld.fName}
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index d431a3b..2a463f7 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -114,11 +114,11 @@ export default class IndicatorBundle extends LightningElement {
                         this.card.iconClass = 'slds-media__figure slds-var-m-right_x-small ';
                     }
 
-                    if(this.flexipageRegionWidth == 'SMALL'){
-                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
-                    } else {
-                        this.card.iconClass = 'slds-media__figure slds-var-m-right_xx-small';
+                    if(this.isStandardUsage != true){
                         this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body slds-card__body_inner';
+                    } else {
+                        this.card.iconClass = 'slds-media__figure slds-var-m-right_x-small';
+                        this.sectionBodyClass = 'slds-grid grid-wrap slds-card__body';
                     }
 
                     // console.log('Card Data');

From 6bcbcc5a6347e8842f72c730f61f79d91a40a63b Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Mon, 7 Oct 2024 20:04:34 -0400
Subject: [PATCH 13/28] Pull Request changes

---
 .../indicatorBundle.js-meta.xml               |  2 +-
 .../indicatorBundleItem.html                  | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 4633fce..7553d86 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,7 +10,7 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
-            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style - Standard Lightning Card, or title Style to match Dynamic Forms"/>
+            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms"/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>
diff --git a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
index 78ea653..55fdf6c 100644
--- a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
+++ b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.html
@@ -1,15 +1,13 @@
 <template>
     <div class="slds-var-m-bottom_x-small slds-float_left">
-        <template if:false={record}>
-            <lightning-avatar 
-                size={indSize}
-                variant={indShape}
-                initials={indText}
-                src={indImage} 
-                fallback-icon-name={indIcon}
-                alternative-text={indHoverText} 
-                class={indClass}>
-            </lightning-avatar>
-        </template>
+        <lightning-avatar 
+            size={indSize}
+            variant={indShape}
+            initials={indText}
+            src={indImage} 
+            fallback-icon-name={indIcon}
+            alternative-text={indHoverText} 
+            class={indClass}>
+        </lightning-avatar>
     </div>
 </template>
\ No newline at end of file

From d47b24abcb9011d4f043c39d58c48fa01607a21b Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Tue, 8 Oct 2024 00:16:52 -0400
Subject: [PATCH 14/28] Allow single indicator for use in Flow

---
 .../indicatorBundleItem.js-meta.xml           | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.js-meta.xml b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.js-meta.xml
index eac275d..e308e5c 100644
--- a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.js-meta.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
-    <isExposed>false</isExposed>
+    <apiVersion>61.0</apiVersion>
+    <isExposed>true</isExposed>
+    <masterLabel>Indicator Item</masterLabel>
+    <description>Display at-a-glance visual representations of status, values, and key details about a record.</description>
+    <targets>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="indSize" type="String" label="Indicator Size" description="Enter size:  medium or large" default="large" role="inputOnly" required="true"/>
+            <property name="indShape" type="String" label="Indicator Shape" description="Enter shape:  base or circle" default="base" role="inputOnly" required="true"/>
+            <property name="indText" type="String" label="Static Text" description="(Optional) The Static Text used when being used instead of Field, Icon, or Image URL. NOTE: Displays first 3 characters / emojis" role="inputOnly" />
+            <property name="indImage" type="String" label="Image" description="(Optional) The URL to the image of the Indicator when being used instead of Field, Text, or Icon." role="inputOnly" />
+            <property name="indIcon" type="String" label="Icon" description="(Optional) The Lightning Design System icon from https://lightningdesignsystem.com/icons/ when being used instead of Field, Text, or Image URL." role="inputOnly" />
+            <property name="indHoverText" type="String" label="Hover Text" description="The hover text of the Indicator." role="inputOnly" />
+            <property name="indBackgroundColor" type="String" label="Background Color" description="(Optional) Override the default background of the Indicator's Salesforce Icon." role="inputOnly" />
+            <property name="indForegroundColor" type="String" label="Foreground Color" description="(Optional) Override the default foreground of the Indicator's Salesforce Icon." role="inputOnly" />
+        </targetConfig>
+    </targetConfigs>
 </LightningComponentBundle>
\ No newline at end of file

From 889bb60c696038b9c42847c821b42875b6273aeb Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Tue, 8 Oct 2024 00:22:38 -0400
Subject: [PATCH 15/28] Resolved utility icon colors, hover text colors, and
 removed forced uppercase

---
 .../main/default/lwc/indicatorBundle/indicatorBundle.css  | 4 ++++
 .../main/default/lwc/indicatorBundle/indicatorBundle.js   | 8 ++++----
 .../lwc/indicatorBundleItem/indicatorBundleItem.css       | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.css b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.css
index a95f064..8583fe4 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.css
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.css
@@ -1,4 +1,8 @@
 .cardIcon {
     --slds-c-icon-color-foreground: var(--foregroundColor);
     --slds-c-icon-color-background: var(--backgroundColor);
+    --slds-c-icon-color-foreground-default: var(--foregroundColor);
+    --slds-c-avatar-initials-text-color-hover:  var(--foregroundColor);
+    --slds-c-avatar-text-color-hover:  var(--foregroundColor);
+    --slds-c-avatar-text-color: var(--foregroundColor);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 2a463f7..4154d89 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -343,21 +343,21 @@ export default class IndicatorBundle extends LightningElement {
                                 //If no Icon Text is entered if the field is a Boolean then show the icon otherwise show the field value    
                                 ...dataValue || dataValue === 0 ? {
                                     ...matchedExtension ? {
-                                            fTextShown: matchedExtension.TextValue ? matchedExtension.TextValue.toUpperCase().substring(0,3) : ''
+                                            fTextShown: matchedExtension.TextValue ? matchedExtension.TextValue.substring(0,3) : ''
                                         } : {
                                         ...dataValue && item.TextValue ? {
-                                                fTextShown : item.TextValue.toUpperCase().substring(0,3) 
+                                                fTextShown : item.TextValue.substring(0,3) 
                                             } : {
                                                 ...item.EmptyStaticBehavior === 'Use Icon Only' ? { 
                                                         fTextShown : '' 
                                                     } : {
-                                                        fTextShown : typeof(dataValue) === 'boolean' ? '' : String(dataValue).toUpperCase().substring(0,3)
+                                                        fTextShown : typeof(dataValue) === 'boolean' ? '' : String(dataValue).substring(0,3)
                                                     }
                                             }
                                         }
                                     } : {
                                     ...(dataValue === false || dataValue === null || dataValue === '') && item.DisplayFalse ? {
-                                            fTextShown : item.FalseTextValue ? item.FalseTextValue.toUpperCase().substring(0,3) : ''
+                                            fTextShown : item.FalseTextValue ? item.FalseTextValue.substring(0,3) : ''
                                         } : {
                                             fTextShown : '' 
                                         }
diff --git a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.css b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.css
index 401ae97..45a9f21 100644
--- a/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.css
+++ b/force-app/main/default/lwc/indicatorBundleItem/indicatorBundleItem.css
@@ -5,5 +5,8 @@
 .indicatorIcon {
     --slds-c-icon-color-foreground: var(--foregroundColor);
     --slds-c-icon-color-background: var(--backgroundColor);
+    --slds-c-icon-color-foreground-default: var(--foregroundColor);
+    --slds-c-avatar-initials-text-color-hover:  var(--foregroundColor);
+    --slds-c-avatar-text-color-hover:  var(--foregroundColor);
     --slds-c-avatar-text-color: var(--foregroundColor);
 }
\ No newline at end of file

From 94bbb7fbc79ef520aa68a2ff6d9cc71b46f2a677 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Tue, 8 Oct 2024 00:49:30 -0400
Subject: [PATCH 16/28] Removed data.com cooper:companyInsightTeaserCard

---
 .../flexipages/Account_Record_Page_Indicators.flexipage     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage b/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage
index 3d88e33..718c472 100644
--- a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage
+++ b/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage
@@ -32,12 +32,6 @@
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
-        <itemInstances>
-            <componentInstance>
-                <componentName>cooper:companyInsightTeaserCard</componentName>
-                <identifier>cooper_companyInsightTeaserCard</identifier>
-            </componentInstance>
-        </itemInstances>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>

From fbdd2905301fa6a2eb217d7a833583734259945c Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Tue, 8 Oct 2024 02:39:28 -0400
Subject: [PATCH 17/28] Permit the use of an Id from a field

---
 .../lwc/illustration/illustration.html        |  2 +-
 .../lwc/indicatorBundle/indicatorBundle.html  |  6 ++
 .../lwc/indicatorBundle/indicatorBundle.js    | 60 +++++++++++++++++--
 .../indicatorBundle.js-meta.xml               |  4 +-
 4 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/lwc/illustration/illustration.html b/force-app/main/default/lwc/illustration/illustration.html
index 7883783..9169c4e 100644
--- a/force-app/main/default/lwc/illustration/illustration.html
+++ b/force-app/main/default/lwc/illustration/illustration.html
@@ -6,7 +6,7 @@
     <div class="slds-text-longform">
       <h3 class="slds-text-heading_medium">{heading}</h3>
       <slot name="messageBody">
-        <p class="slds-text-body_regular">{messageBody}</p>
+        <p class="slds-text-body_regular slds-p-around_xx-small">{messageBody}</p>
       </slot>
     </div>
   </div>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
index adc2087..b892cc9 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.html
@@ -92,6 +92,12 @@ <h3 slot="title" class="slds-truncate slds-p-around_xx-small">
                         </div>
                     </div>
                 </div>
+                <template lwc:if={displayFooter}>
+                    <footer class="slds-card__footer">
+                        <lightning-badge label={mappedField}></lightning-badge>
+                        <lightning-helptext content={targetMessage}></lightning-helptext>
+                    </footer>
+                </template>
             </article>
         </template>
     </template>
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
index 2a463f7..08bcd84 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js
@@ -1,5 +1,6 @@
-import { LightningElement, api, wire } from 'lwc';
+import { LightningElement, api, wire, track } from 'lwc';
 import { getRecord, getFieldValue } from 'lightning/uiRecordApi';
+import { getObjectInfo } from 'lightning/uiObjectInfoApi';
 import { refreshApex } from '@salesforce/apex';
 import KeyModal from 'c/indicatorBundleKey';
 
@@ -18,6 +19,13 @@ export default class IndicatorBundle extends LightningElement {
     @api indsSize = 'large';
     @api indsShape = 'base';
     @api showRefresh = false;
+    @api mappedField = ''; // API Field Name for the record
+    @api showFooter = false;
+
+    targetIdField;     // Syntax of template field:  sObject.Field_Name__c
+    targetIdValue;
+    targetMessage;
+
     bundleActive = true;    // Set default active status
     hasHeader = false;      // Hide header by default
 
@@ -35,9 +43,16 @@ export default class IndicatorBundle extends LightningElement {
     errorOccurred = false;
     errorMessage = '';
     showIllustration = false;
-    illustration = {};
+    @track illustration = {};
 
     connectedCallback(){
+        if(this.mappedField == null || this.mappedField.trim() == ""){
+            this.targetIdValue = this.recordId;
+        } else {
+            this.targetIdField = this.objectApiName + '.' + this.mappedField;
+            console.log(this.targetIdField);
+        }
+
         if(!this.bundleName){
             this.errorOccurred = true;
             this.showIllustration = true;
@@ -48,7 +63,37 @@ export default class IndicatorBundle extends LightningElement {
             }
         } else {
             this.showIllustration=false;
-            this.illustration = {};
+            // this.illustration = {};
+        }
+    }
+
+    // Check the record for an existing field value in order to initialize it.
+    @wire(getRecord, { recordId: '$recordId', fields: '', optionalFields: '$targetIdField' }) 
+    record ({error, data}) {
+        if(error) {
+            console.log('ERROR');
+            this.errorOccurred = true;
+            this.showIllustration = true;
+            this.illustration = {
+                heading : 'Errors Using the Mapped Field',
+                messageBody: 'Check the API Name for the custom field API name: ' + this.mappedField,
+                imageName: 'custom:setup'
+            }
+        } else if (data) {
+            if( JSON.stringify(data.fields) === '{}' ) {
+                this.errorOccurred = true;
+                this.showIllustration = true;
+                this.illustration = {
+                    heading : 'Problem Using Mapped Field',
+                    messageBody: 'Check the case-sensitive API Name for the mapped field API name: ' + this.mappedField,
+                    imageName: 'custom:setup'
+                };
+            } else {
+                this.targetMessage = 'This Indicator Bundle displays indicators based on the record id (' + data.fields[this.mappedField].value + ') in the mapped field \"' + this.mappedField + '\" from the ' + data.apiName + ' object.';
+                this.targetIdValue = getFieldValue(data, this.targetIdField);
+                this.showIllustration=false;
+                this.illustration = {};
+            }
         }
     }
 
@@ -62,6 +107,10 @@ export default class IndicatorBundle extends LightningElement {
         return this.titleStyle == 'Lightning Card';
     }
 
+    get displayFooter() {
+        return this.showFooter && (this.mappedField != null && this.mappedField.trim() != "");
+    }
+
     initCSSVariables() {
 
         if(this.showTitle && this.isStandardUsage && (this.bundle.CardIconBackground || this.bundle.CardIconForeground)) {
@@ -169,9 +218,10 @@ export default class IndicatorBundle extends LightningElement {
         refreshApex(this.wiredData);
     }
  
-    // Get the field values for the current record based on the configured fields in CMDT
+    // Get the field values for the target record based on the configured fields in CMDT
     // Using 'optionalFields' ensures that if a user does not have access to a field, the indicator will not show.
-    @wire(getRecord, { recordId: '$recordId', optionalFields: '$apiFieldnameDefinitions' })
+    // TODO: Add fields parameter to retrieve the record name for use when the targetIdValue is for another record.
+    @wire(getRecord, { recordId: '$targetIdValue', optionalFields: '$apiFieldnameDefinitions' })
     wiredRecord(result) {
 
         const {error,data} = result;
diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 7553d86..35d6750 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -10,12 +10,14 @@
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
             <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
-            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms"/>
+            <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>
             <property name="indsSize" type="String" label="Indicator Size" placeholder="large" datasource="large,medium" description="Choose the Indicator Size."/>
             <property name="indsShape" type="String" label="Indicator Shape" placeholder="base" datasource="base,circle" description="Choose the Indicator Shape."/>
             <property name="showRefresh" type="Boolean" label="Show refresh button" description="Enable an admin button to refresh the values."/>
+            <property name="mappedField" type="String" label="(Optional) Mapped Id Field" description="(Optional) Instead of using the current Record Id, provide the API Name of a field (Case Sensitive) on this object which holds a Record Id or Relationship Id to use that value." placeholder="Example: Source_Id__c, ParentId, or AccountId" />
+            <property name="showFooter" type="Boolean" label="Show footer when using Mapped Id Field" description="Enable a footer to show what mapped field is being used."/>
             <supportedFormFactors>
                 <supportedFormFactor type="Large" />
                 <supportedFormFactor type="Small" />

From e010fef9271116672551ff7229a1183671ec138e Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Thu, 14 Nov 2024 10:25:45 -0500
Subject: [PATCH 18/28] Added namespace to datasource Apex reference

---
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 35d6750..9410004 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -9,7 +9,7 @@
     </targets>
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
-            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://%%%NAMESPACE_DOT%%%IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
             <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>

From 23deafae041f830382248b7958fdcb7d48422875 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Thu, 14 Nov 2024 12:03:09 -0500
Subject: [PATCH 19/28] Hardcoded namespace for datasource instead of injected

---
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 9410004..342f3b2 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -9,7 +9,7 @@
     </targets>
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
-            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://%%%NAMESPACE_DOT%%%IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://inds.IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
             <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>

From 8225bd600f0a71118339dfac88cc8fdae05320a0 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Thu, 14 Nov 2024 12:29:10 -0500
Subject: [PATCH 20/28] Revert "Added namespace to datasource Apex reference"

This reverts commit e010fef9271116672551ff7229a1183671ec138e.
---
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 342f3b2..9410004 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -9,7 +9,7 @@
     </targets>
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
-            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://inds.IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://%%%NAMESPACE_DOT%%%IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
             <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>

From e10aaec75827ae2a9e1eb9db0b74209266db94e5 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Thu, 14 Nov 2024 14:30:30 -0500
Subject: [PATCH 21/28] Hardcoding namespace

---
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 9410004..342f3b2 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -9,7 +9,7 @@
     </targets>
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
-            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://%%%NAMESPACE_DOT%%%IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://inds.IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
             <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>

From 951ef43fb10d43c500cf6826cc77d576b8de38b2 Mon Sep 17 00:00:00 2001
From: Cori O'Brien <37851761+coriobriensfdo@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:19:17 -0800
Subject: [PATCH 22/28] Update CODEOWNERS

Description to use: Adding ECCN information per Salesforce OSPO request
---
 .github/CODEOWNERS | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 316ce36..f1550f4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,5 +6,9 @@
 /tasks/               @SFDO-Community/sfdo-release-engineers
 
 # Actions
-/.github              @SFDO-Community/sfdo-release-engineers
-/scripts              @SFDO-Community/sfdo-release-engineers
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
+
+
+#ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow

From e9e88feb1f36329b35c61df7f2f69c03ad26fc44 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:17:32 -0500
Subject: [PATCH 23/28] Added namespace injection for indicator bundle's
 configuration

---
 .../default/lwc/indicatorBundle/indicatorBundle.js-meta.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
index 342f3b2..9410004 100644
--- a/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
+++ b/force-app/main/default/lwc/indicatorBundle/indicatorBundle.js-meta.xml
@@ -9,7 +9,7 @@
     </targets>
     <targetConfigs>
         <targetConfig targets="lightning__RecordPage">
-            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://inds.IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
+            <property name="bundleName" type="String" label="Indicator Bundle" datasource="apex://%%%NAMESPACE_DOT%%%IndicatorListBundleSelector" description="Choose the Indicator Bundle."/>
             <property name="titleStyle" type="String" label="Title Style" placeholder="Lightning Card" datasource="Lightning Card,Dynamic Forms" description="Choose the Title Style: Standard Lightning Card or a style to match Dynamic Forms."/>
             <property name="showTitle" type="Boolean" default="true" label="Display Title" description="Display the Indicator's Title on the component."/>
             <property name="showDescription" type="Boolean" default="true" label="Display Description" description="Display the Indicator's Description on the component."/>

From 53e7234ec25c80d988661bd561803b14e199cbb6 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:18:27 -0500
Subject: [PATCH 24/28] Restructured unpackaged sample indicators into a single
 folder with parts, adding deployment of objects so page layouts are assigned
 right away.

---
 ...or_Bundle.Account_Company_Info.md-meta.xml |   0
 ...or_Bundle.Contact_Contact_Info.md-meta.xml |   0
 ..._Company_Info_Account_Industry.md-meta.xml |   0
 ..._Company_Info_Account_Location.md-meta.xml |   0
 ...t_Company_Info_Account_Revenue.md-meta.xml |   0
 ...nt_Company_Info_Account_Source.md-meta.xml |   0
 ...em.Account_Company_Info_Rating.md-meta.xml |   0
 ...tem.Contact_Contact_Info_Email.md-meta.xml |   0
 ...em.Contact_Contact_Info_Mobile.md-meta.xml |   0
 ...tem.Contact_Contact_Info_Phone.md-meta.xml |   0
 ...or_Item.Account_Annual_Revenue.md-meta.xml |   0
 ...ndicator_Item.Account_Industry.md-meta.xml |   0
 ...ndicator_Item.Account_Location.md-meta.xml |   0
 ..._Indicator_Item.Account_Rating.md-meta.xml |   0
 ..._Indicator_Item.Account_Source.md-meta.xml |   0
 ...__Indicator_Item.Contact_Email.md-meta.xml |   0
 ..._Indicator_Item.Contact_Mobile.md-meta.xml |   0
 ...__Indicator_Item.Contact_Phone.md-meta.xml |   0
 ...count_Annual_Revenue_100k_500k.md-meta.xml |   0
 ...sion.Account_Annual_Revenue_1M.md-meta.xml |   0
 ...Account_Annual_Revenue_500k_1M.md-meta.xml |   0
 ....Account_Industry_Construction.md-meta.xml |   0
 ...n.Account_Industry_Electronics.md-meta.xml |   0
 ...ension.Account_Industry_Energy.md-meta.xml |   0
 ...n.Account_Industry_Engineering.md-meta.xml |   0
 ...on.Account_Industry_Government.md-meta.xml |   0
 ...Account_Industry_Manufacturing.md-meta.xml |   0
 ...on.Account_Industry_Technology.md-meta.xml |   0
 ...ion.Account_Industry_Utilities.md-meta.xml |   0
 ..._Extension.Account_Location_CA.md-meta.xml |   0
 ...ension.Account_Location_Canada.md-meta.xml |   0
 ..._Extension.Account_Location_US.md-meta.xml |   0
 ....Account_Location_UnitedStates.md-meta.xml |   0
 ..._Extension.Account_Rating_Cold.md-meta.xml |   0
 ...m_Extension.Account_Rating_Hot.md-meta.xml |   0
 ..._Extension.Account_Rating_Warm.md-meta.xml |   0
 ...Extension.Account_Source_Other.md-meta.xml |   0
 ...ccount_Source_Partner_Referral.md-meta.xml |   0
 ...Extension.Account_Source_Phone.md-meta.xml |   0
 ....Account_Source_Purchased_List.md-meta.xml |   0
 ...m_Extension.Account_Source_Web.md-meta.xml |   0
 .../{ => Part_1}/package.xml                  |   0
 ...Record_Page_Indicators.flexipage-meta.xml} |   4 +
 ...Record_Page_Indicators.flexipage-meta.xml} |  46 +++
 .../Part_2/flexipages}/package.xml            |   0
 .../objects/Account/Account.object-meta.xml   | 254 +++++++++++++
 .../objects/Contact/Contact.object-meta.xml   | 358 ++++++++++++++++++
 47 files changed, 662 insertions(+)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle.Account_Company_Info.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle.Contact_Contact_Info.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Industry.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Location.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Revenue.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Source.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Rating.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Email.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Mobile.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Phone.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Account_Annual_Revenue.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Account_Industry.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Account_Location.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Account_Rating.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Account_Source.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Contact_Email.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Contact_Mobile.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item.Contact_Phone.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_100k_500k.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_1M.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_500k_1M.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Construction.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Electronics.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Energy.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Engineering.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Government.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Manufacturing.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Technology.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Utilities.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_CA.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_Canada.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_US.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_UnitedStates.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Cold.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Hot.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Warm.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Other.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Partner_Referral.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Phone.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Purchased_List.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Web.md-meta.xml (100%)
 rename unpackaged/config/sample_AccountContact/{ => Part_1}/package.xml (100%)
 rename unpackaged/config/{sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage => sample_AccountContact/Part_2/flexipages/Account_Record_Page_Indicators.flexipage-meta.xml} (98%)
 rename unpackaged/config/{sample_AccountContact_FlexiPages/flexipages/Contact_Record_Page_Indicators.flexipage => sample_AccountContact/Part_2/flexipages/Contact_Record_Page_Indicators.flexipage-meta.xml} (82%)
 rename unpackaged/config/{sample_AccountContact_FlexiPages => sample_AccountContact/Part_2/flexipages}/package.xml (100%)
 create mode 100644 unpackaged/config/sample_AccountContact/Part_3/objects/Account/Account.object-meta.xml
 create mode 100644 unpackaged/config/sample_AccountContact/Part_3/objects/Contact/Contact.object-meta.xml

diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle.Account_Company_Info.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle.Account_Company_Info.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle.Account_Company_Info.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle.Account_Company_Info.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle.Contact_Contact_Info.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle.Contact_Contact_Info.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle.Contact_Contact_Info.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle.Contact_Contact_Info.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Industry.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Industry.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Industry.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Industry.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Location.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Location.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Location.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Location.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Revenue.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Revenue.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Revenue.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Revenue.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Source.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Source.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Source.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Account_Source.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Rating.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Rating.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Rating.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Account_Company_Info_Rating.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Email.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Email.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Email.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Email.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Mobile.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Mobile.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Mobile.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Mobile.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Phone.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Phone.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Phone.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Bundle_Item.Contact_Contact_Info_Phone.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Annual_Revenue.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Annual_Revenue.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Annual_Revenue.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Annual_Revenue.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Industry.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Industry.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Industry.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Industry.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Location.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Location.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Location.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Location.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Rating.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Rating.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Rating.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Rating.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Source.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Source.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Account_Source.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Account_Source.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Email.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Email.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Email.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Email.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Mobile.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Mobile.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Mobile.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Mobile.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Phone.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Phone.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item.Contact_Phone.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item.Contact_Phone.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_100k_500k.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_100k_500k.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_100k_500k.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_100k_500k.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_1M.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_1M.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_1M.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_1M.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_500k_1M.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_500k_1M.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_500k_1M.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Annual_Revenue_500k_1M.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Construction.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Construction.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Construction.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Construction.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Electronics.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Electronics.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Electronics.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Electronics.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Energy.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Energy.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Energy.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Energy.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Engineering.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Engineering.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Engineering.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Engineering.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Government.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Government.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Government.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Government.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Manufacturing.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Manufacturing.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Manufacturing.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Manufacturing.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Technology.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Technology.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Technology.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Technology.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Utilities.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Utilities.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Utilities.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Industry_Utilities.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_CA.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_CA.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_CA.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_CA.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_Canada.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_Canada.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_Canada.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_Canada.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_US.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_US.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_US.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_US.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_UnitedStates.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_UnitedStates.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_UnitedStates.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Location_UnitedStates.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Cold.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Cold.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Cold.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Cold.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Hot.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Hot.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Hot.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Hot.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Warm.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Warm.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Warm.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Rating_Warm.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Other.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Other.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Other.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Other.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Partner_Referral.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Partner_Referral.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Partner_Referral.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Partner_Referral.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Phone.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Phone.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Phone.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Phone.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Purchased_List.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Purchased_List.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Purchased_List.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Purchased_List.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Web.md-meta.xml b/unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Web.md-meta.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Web.md-meta.xml
rename to unpackaged/config/sample_AccountContact/Part_1/customMetadata/___NAMESPACE___Indicator_Item_Extension.Account_Source_Web.md-meta.xml
diff --git a/unpackaged/config/sample_AccountContact/package.xml b/unpackaged/config/sample_AccountContact/Part_1/package.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact/package.xml
rename to unpackaged/config/sample_AccountContact/Part_1/package.xml
diff --git a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage b/unpackaged/config/sample_AccountContact/Part_2/flexipages/Account_Record_Page_Indicators.flexipage-meta.xml
similarity index 98%
rename from unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage
rename to unpackaged/config/sample_AccountContact/Part_2/flexipages/Account_Record_Page_Indicators.flexipage-meta.xml
index 718c472..b552200 100644
--- a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Account_Record_Page_Indicators.flexipage
+++ b/unpackaged/config/sample_AccountContact/Part_2/flexipages/Account_Record_Page_Indicators.flexipage-meta.xml
@@ -209,6 +209,10 @@
                     <name>showDescription</name>
                     <value>true</value>
                 </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showFooter</name>
+                    <value>false</value>
+                </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>showRefresh</name>
                     <value>true</value>
diff --git a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Contact_Record_Page_Indicators.flexipage b/unpackaged/config/sample_AccountContact/Part_2/flexipages/Contact_Record_Page_Indicators.flexipage-meta.xml
similarity index 82%
rename from unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Contact_Record_Page_Indicators.flexipage
rename to unpackaged/config/sample_AccountContact/Part_2/flexipages/Contact_Record_Page_Indicators.flexipage-meta.xml
index f6ded4f..6806155 100644
--- a/unpackaged/config/sample_AccountContact_FlexiPages/flexipages/Contact_Record_Page_Indicators.flexipage
+++ b/unpackaged/config/sample_AccountContact/Part_2/flexipages/Contact_Record_Page_Indicators.flexipage-meta.xml
@@ -209,6 +209,10 @@
                     <name>showDescription</name>
                     <value>true</value>
                 </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showFooter</name>
+                    <value>false</value>
+                </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>showRefresh</name>
                     <value>true</value>
@@ -221,6 +225,48 @@
                 <identifier>%%%NAMESPACE_OR_C%%%_indicatorBundle</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>bundleName</name>
+                    <value>Account_Company_Info</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>indsShape</name>
+                    <value>circle</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>indsSize</name>
+                    <value>medium</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>mappedField</name>
+                    <value>AccountId</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showDescription</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showFooter</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showRefresh</name>
+                    <value>false</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>showTitle</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>titleStyle</name>
+                    <value>Lightning Card</value>
+                </componentInstanceProperties>
+                <componentName>%%%NAMESPACE_OR_C%%%:indicatorBundle</componentName>
+                <identifier>%%%NAMESPACE_OR_C%%%_indicatorBundle2</identifier>
+            </componentInstance>
+        </itemInstances>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
diff --git a/unpackaged/config/sample_AccountContact_FlexiPages/package.xml b/unpackaged/config/sample_AccountContact/Part_2/flexipages/package.xml
similarity index 100%
rename from unpackaged/config/sample_AccountContact_FlexiPages/package.xml
rename to unpackaged/config/sample_AccountContact/Part_2/flexipages/package.xml
diff --git a/unpackaged/config/sample_AccountContact/Part_3/objects/Account/Account.object-meta.xml b/unpackaged/config/sample_AccountContact/Part_3/objects/Account/Account.object-meta.xml
new file mode 100644
index 0000000..4a9467b
--- /dev/null
+++ b/unpackaged/config/sample_AccountContact/Part_3/objects/Account/Account.object-meta.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortalUser</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortalUser</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortalUser</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>New</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>New</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>New</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <comment>Action override created by Lightning App Builder during activation.</comment>
+        <content>Account_Record_Page_Indicators</content>
+        <formFactor>Large</formFactor>
+        <skipRecordTypeSelect>false</skipRecordTypeSelect>
+        <type>Flexipage</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortalUser</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortalUser</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortalUser</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>WebsiteHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>WebsiteHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>WebsiteHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+    <enableFeeds>true</enableFeeds>
+    <enableHistory>false</enableHistory>
+    <externalSharingModel>Private</externalSharingModel>
+    <searchLayouts>
+        <customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
+        <customTabListAdditionalFields>ACCOUNT.ADDRESS1_CITY</customTabListAdditionalFields>
+        <customTabListAdditionalFields>ACCOUNT.PHONE1</customTabListAdditionalFields>
+        <lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
+        <lookupDialogsAdditionalFields>ACCOUNT.SITE</lookupDialogsAdditionalFields>
+        <lookupDialogsAdditionalFields>CORE.USERS.ALIAS</lookupDialogsAdditionalFields>
+        <lookupDialogsAdditionalFields>ACCOUNT.TYPE</lookupDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.SITE</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CORE.USERS.ALIAS</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.TYPE</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.PHONE1</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.PHONE2</lookupPhoneDialogsAdditionalFields>
+        <searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>ACCOUNT.SITE</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>ACCOUNT.PHONE1</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>CORE.USERS.ALIAS</searchResultsAdditionalFields>
+    </searchLayouts>
+    <sharingModel>ReadWrite</sharingModel>
+</CustomObject>
diff --git a/unpackaged/config/sample_AccountContact/Part_3/objects/Contact/Contact.object-meta.xml b/unpackaged/config/sample_AccountContact/Part_3/objects/Contact/Contact.object-meta.xml
new file mode 100644
index 0000000..c451540
--- /dev/null
+++ b/unpackaged/config/sample_AccountContact/Part_3/objects/Contact/Contact.object-meta.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <actionOverrides>
+        <actionName>AddCampaign</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>AddCampaign</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>AddCampaign</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>AddToCampaign</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>AddToCampaign</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>AddToCampaign</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CallHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>CancelEdit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Clone</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Clone</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Clone</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Delete</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Edit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EmailHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortal</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortal</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableCustomerPortal</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnablePartnerPortalUser</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnablePartnerPortalUser</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnablePartnerPortalUser</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableSelfService</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableSelfService</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>EnableSelfService</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>List</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ListClean</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Merge</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Merge</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Merge</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>NewContact</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>NewContact</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>NewContact</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>RequestUpdate</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SaveEdit</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>SmsHighlightAction</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>Tab</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <comment>Action override created by Lightning App Builder during activation.</comment>
+        <content>Contact_Record_Page_Indicators</content>
+        <formFactor>Large</formFactor>
+        <skipRecordTypeSelect>false</skipRecordTypeSelect>
+        <type>Flexipage</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>View</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortal</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortal</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewCustomerPortal</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewPartnerPortalUser</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewPartnerPortalUser</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewPartnerPortalUser</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewSelfService</actionName>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewSelfService</actionName>
+        <formFactor>Large</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <actionOverrides>
+        <actionName>ViewSelfService</actionName>
+        <formFactor>Small</formFactor>
+        <type>Default</type>
+    </actionOverrides>
+    <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
+    <enableFeeds>true</enableFeeds>
+    <enableHistory>false</enableHistory>
+    <externalSharingModel>ControlledByParent</externalSharingModel>
+    <searchLayouts>
+        <customTabListAdditionalFields>FULL_NAME</customTabListAdditionalFields>
+        <customTabListAdditionalFields>ACCOUNT.NAME</customTabListAdditionalFields>
+        <customTabListAdditionalFields>CONTACT.PHONE1</customTabListAdditionalFields>
+        <lookupDialogsAdditionalFields>FULL_NAME</lookupDialogsAdditionalFields>
+        <lookupDialogsAdditionalFields>ACCOUNT.NAME</lookupDialogsAdditionalFields>
+        <lookupDialogsAdditionalFields>ACCOUNT.SITE</lookupDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>FULL_NAME</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.NAME</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.SITE</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE1</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE2</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE3</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE4</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE5</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>CONTACT.PHONE6</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.PHONE1</lookupPhoneDialogsAdditionalFields>
+        <lookupPhoneDialogsAdditionalFields>ACCOUNT.PHONE2</lookupPhoneDialogsAdditionalFields>
+        <searchResultsAdditionalFields>FULL_NAME</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>ACCOUNT.NAME</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>ACCOUNT.SITE</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>CONTACT.PHONE1</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>CONTACT.EMAIL</searchResultsAdditionalFields>
+        <searchResultsAdditionalFields>CORE.USERS.ALIAS</searchResultsAdditionalFields>
+    </searchLayouts>
+    <sharingModel>ControlledByParent</sharingModel>
+</CustomObject>

From a8242a2ad3102bfe90323a41acfc6ab377e1ffdd Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:19:14 -0500
Subject: [PATCH 25/28] Deployment validation issues meant adding a space to
 the image LWC so it would deploy

---
 .../main/default/lwc/illustrationImage/illustrationImage.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/force-app/main/default/lwc/illustrationImage/illustrationImage.html b/force-app/main/default/lwc/illustrationImage/illustrationImage.html
index 41a40c8..d973c26 100644
--- a/force-app/main/default/lwc/illustrationImage/illustrationImage.html
+++ b/force-app/main/default/lwc/illustrationImage/illustrationImage.html
@@ -1 +1,3 @@
-<template></template>
\ No newline at end of file
+<template>
+    <div>&nbsp;</div>
+</template>
\ No newline at end of file

From e66a72ef4f6700fa991da291f419109641946ae9 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:19:32 -0500
Subject: [PATCH 26/28] Removed unnecessary force ignore settings

---
 .forceignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.forceignore b/.forceignore
index fc86577..0abc75d 100644
--- a/.forceignore
+++ b/.forceignore
@@ -15,10 +15,7 @@ package.xml
 **profile
 **/profiles/**
 **/settings/**
-**/Account/**
-**/Contact/**
 
-**/unpackaged/**
 **/tsconfig.json
 
 **/*.ts

From 5bb7d7ed225b51d8927580e6dc2bf38a91b075d2 Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:20:53 -0500
Subject: [PATCH 27/28] Updated CCI YAML to address typo in `org` block,
 removed namespace from dev org, changed unmanaged metadata tasks/flows to fit
 restructure, and misc formatting

---
 cumulusci.yml | 56 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/cumulusci.yml b/cumulusci.yml
index 1695c0f..cd01968 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -4,9 +4,9 @@ project:
     package:
         name: Salesforce-Indicators
         namespace: inds
-        api_version: '55.0'
+        api_version: '65.0'
     git:
-        default_branch: 'master'
+        default_branch: 'main'
     test:
         name_match: '%Tests'
     source_format: sfdx
@@ -16,8 +16,7 @@ orgs:
         dev:
             config_file: orgs/dev.json
             days: 30
-            namespaced: True
-    scratch:
+            namespaced: false
         demo:
             config_file: orgs/demo.json
             days: 15
@@ -45,7 +44,7 @@ tasks:
         group: Salesforce Metadata
         class_path: cumulusci.tasks.salesforce.Deploy
         options:
-            path: unpackaged/config/sample_AccountContact
+            path: unpackaged/config/sample_AccountContact/Part_1
     
     deploy_sample_indicators_layouts:
         description: Deploys - Sample Indicators Layouts
@@ -53,7 +52,15 @@ tasks:
         group: Salesforce Metadata
         class_path: cumulusci.tasks.salesforce.Deploy
         options:
-            path: unpackaged/config/sample_AccountContact_FlexiPages
+            path: unpackaged/config/sample_AccountContact/Part_2
+    
+    deploy_sample_indicators_objects:
+        description: Deploys - Sample Indicators Assigning Layouts to Objects
+        name: Deploy Page Layouts for Sample Indicators
+        group: Salesforce Metadata
+        class_path: cumulusci.tasks.salesforce.Deploy
+        options:
+            path: unpackaged/config/sample_AccountContact/Part_3
     
     deploy_training_indicators:
         description: Deploys - Example Indicators used for Training 
@@ -80,16 +87,17 @@ tasks:
 flows:
   sample_inds:
     steps:
-        1:
-            task: deploy_sample_indicators
-            ui_options:
-              is_required: False
-              is_recommended: False
-        2:
-            task: deploy_sample_indicators_layouts
-            ui_options:
-              is_required: False
-              is_recommended: False
+      1:
+        task: deploy_sample_indicators
+        ui_options:
+          is_required: False
+          is_recommended: False
+      2:
+        task: deploy_sample_indicators_layouts
+        ui_options:
+          is_required: False
+          is_recommended: False
+  
   customer_org:
     steps:
       1:
@@ -103,12 +111,16 @@ flows:
         ui_options:
           is_required: False
           is_recommended: False
+  
   config_dev:
     steps:
-        3:
-            task: generate_accounts_and_contacts
-        4:
-            flow: sample_inds
+      3:
+        task: generate_accounts_and_contacts
+      4:
+        flow: sample_inds
+      5:
+        task: deploy_sample_indicators_objects
+  
   config_demo:
     steps:
       1:
@@ -116,8 +128,10 @@ flows:
       2:
         flow: sample_inds
       3:
-        task: deploy_training_indicators
+        task: deploy_sample_indicators_objects
       4:
+        task: deploy_training_indicators
+      5:
         task: generate_accounts_and_contacts
 
 plans:

From c714536f9761f0dea97cde2bf2c58ba30cc18d6b Mon Sep 17 00:00:00 2001
From: tschug <timschug@gmail.com>
Date: Sat, 20 Dec 2025 16:49:44 -0500
Subject: [PATCH 28/28] Revised CCI YAML + Added A4D Workflow

---
 .a4drules/workflows/new-inds-org.md | 116 ++++++++++++++++++++++++++++
 cumulusci.yml                       |   4 +-
 2 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 .a4drules/workflows/new-inds-org.md

diff --git a/.a4drules/workflows/new-inds-org.md b/.a4drules/workflows/new-inds-org.md
new file mode 100644
index 0000000..e8497c6
--- /dev/null
+++ b/.a4drules/workflows/new-inds-org.md
@@ -0,0 +1,116 @@
+Use known or explicit CumulusCI (CCI) plans, flows, and tasks first, and if these are unclear then use the the Salesforce DX MCP server tools next and only fall back to `sf` if the MCP service is unavailable.
+
+<detailed_sequence_of_steps>
+
+# Setup a New Scratch Org - Detailed Sequence of Steps
+
+Perform the steps below independently in the following order.
+
+## 1. Confirm Org Alias
+ 
+    ```xml
+    <ask_followup_question>
+        <question>Enter the org alias.
+        <options>["dev", "demo", "beta", "feature"]</options>
+    </ask_followup_question>
+    ```
+
+## 2. Check for Existing Org
+
+    Check if the org already exists and is active.
+
+## 3. Create and Deploy
+
+    If the alias exists as a name of a Scratch Org that is NOT EXPIRED and IS ACTIVE or exists as a Connected Org, DO NOT create a new scratch org and skip to the next step.
+
+    If the alias exists as a name of a Scratch Org and is EXPIRED or NOT ACTIVE, then create the new scratch org.
+
+## 4. Open in Browser
+
+    Open the org in the browser.
+
+## 5. Set as Default
+
+    If the org already exists but it is not the default org or the org was just created, then set it as the default org.
+
+</detailed_sequence_of_steps>
+
+<common_commands>
+
+1. When you need to get the list of all configured Salesforce orgs or find out which org is the default or if a scratch org is expired.
+
+```bash
+cci org list
+```
+
+2. When checking if an org is active, review the output of `cci org list` 
+
+The output shows: 
+- A value with a "+" in the Default column indicates the org is the default. 
+- A bare integer (e.g., "1") indicates the lifespan in days and the org is not active. 
+- A fractional value (e.g., "16/30") indicates the org is on day 16 of a 30-day lifespan when it will expire.
+- A value with a "+" in the Expired column indicates the org is expired.
+- A value in the Domain further reinforces that a scratch org is active and assigned to that domain.
+
+- Explicitly treat bare interger in Days as NOT ACTIVE and require creating or recreating the scratch org.
+- Require Domain present to consider a scratch org ACTIVE.
+- If alias is default (+) but NOT ACTIVE, still create.
+
+3. Create a new scratch and deploy metadata from the CCI project. This command should not be run if an org is already active as it could cause conflicts. Confirm with user if it should be run.
+
+Running this command takes several minutes to fully execute and the subsequent steps should not be run until this is fully completed.
+
+Based on the alias, a different command should be run.
+
+For `dev` or `feature` use:
+
+```bash
+cci flow run dev_org --org <alias>
+```
+
+For `demo` use:
+
+```bash
+cci flow run config_demo --org <alias>
+```
+
+For `beta` use:
+
+```bash
+cci flow run install_beta --org <alias>
+```
+
+
+4. Open org in browser
+
+```bash
+cci org browser <alias>
+```
+
+5. Set org as the default for the project
+
+```bash
+cci org default <alias>
+```
+
+6. Set a CCI dev hub
+
+```xml
+<ask_followup_question>
+    <question>What is the alias of the dev hub?
+</ask_followup_question>
+```
+
+```xml
+<ask_followup_question>
+    <question>Should this dev hub always be assigned for the project?
+    <options>["Yes", "No"]</options>
+</ask_followup_question>
+```
+If the dev hub should always be assigned for the project, append `--project` to the following command when running it.
+
+```bash
+cci service default devhub <alias> 
+```
+
+</common_commands>
\ No newline at end of file
diff --git a/cumulusci.yml b/cumulusci.yml
index cd01968..85f89ff 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -130,8 +130,10 @@ flows:
       3:
         task: deploy_sample_indicators_objects
       4:
-        task: deploy_training_indicators
+        task: deploy_sample_indicators_layouts
       5:
+        task: deploy_training_indicators
+      6:
         task: generate_accounts_and_contacts
 
 plans: