From d6f387a5d654d6af92a4c450e191ecc8590f2791 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Wed, 20 Dec 2023 09:32:41 +0900
Subject: [PATCH 01/20] Fix text alighnment issue #11 for text block

---
 .../lwc/ggwContentBlockModal/ggwContentBlockModal.html   | 9 ++-------
 .../lwc/ggwContentBlockModal/ggwContentBlockModal.js     | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.html b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.html
index 337e8d5..0809c65 100644
--- a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.html
+++ b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.html
@@ -1,17 +1,11 @@
 <template>
     <lightning-card title={titleAvailableBlocks} icon-name="utility:description">
-        <!--
-        <lightning-button label="Save" slot="actions"></lightning-button>
--->
         <template if:true={contentblocks}>
 
             <template for:each={contentblocks} for:item="block">
             
                 <div key={block.recordid} class="slds-box slds-box_xx-small slds-m-left_xx-small slds-m-right_xxx-small slds-m-bottom_xx-small">
                     <lightning-card  title={block.title}>
-                        <!--
-                        <lightning-input type="checkbox-button" label={block.title} name={block.recordid} slot="actions"></lightning-input>
-                    -->
                         <lightning-button-stateful
                             label-when-off="Select"
                             label-when-on="Selected"
@@ -26,7 +20,8 @@
                             >
                         </lightning-button-stateful>
 
-                        <lightning-formatted-rich-text
+                        <lightning-formatted-rich-text 
+                            class="slds-text-align_left"
                             value={block.displaytext}
                         ></lightning-formatted-rich-text>
                         
diff --git a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js
index 1050c44..6c9b55b 100644
--- a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js
+++ b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js
@@ -33,7 +33,7 @@ export default class GgwContentBlockModal extends LightningElement {
     // Select a block method
     handleSelectClick(evt){
         //console.log('### Button event: '+evt.target.name);
-        //--- MUST do tehse JSON tricks to clone arraye to update data
+        //--- MUST do these JSON tricks to clone array to update data
         // if not get error Cannot assign to read only property
         let tmpBlocks = JSON.parse(JSON.stringify(this.contentblocks));
         // When selecting block with statefull button ensure all otehrs are DESELECTED Only one allowed selected

From df17ef5647505d8229b837823bc6c0b9efc66dce Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Wed, 20 Dec 2023 10:32:01 +0900
Subject: [PATCH 02/20] Fix issue #24 changel Section label on Selected Item

---
 .../GGW_Selected_Item__c/fields/GGW_Section__c.field-meta.xml   | 2 +-
 scripts/dx/sforg                                                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/force-app/main/default/objects/GGW_Selected_Item__c/fields/GGW_Section__c.field-meta.xml b/force-app/main/default/objects/GGW_Selected_Item__c/fields/GGW_Section__c.field-meta.xml
index faa2643..0d05df4 100644
--- a/force-app/main/default/objects/GGW_Selected_Item__c/fields/GGW_Section__c.field-meta.xml
+++ b/force-app/main/default/objects/GGW_Selected_Item__c/fields/GGW_Section__c.field-meta.xml
@@ -5,7 +5,7 @@
     <description>Link to section</description>
     <externalId>false</externalId>
     <inlineHelpText>Link to section</inlineHelpText>
-    <label>GGW Section</label>
+    <label>Section</label>
     <referenceTo>GGW_Section__c</referenceTo>
     <relationshipLabel>Selected Items</relationshipLabel>
     <relationshipName>Selected_Items</relationshipName>
diff --git a/scripts/dx/sforg b/scripts/dx/sforg
index e75a9db..813c37f 100755
--- a/scripts/dx/sforg
+++ b/scripts/dx/sforg
@@ -28,6 +28,8 @@ sf org create scratch --target-dev-hub labsDevHub --alias $ORG_ALIAS --definitio
 # Push source
 echo "--- PUSH SOURCE FOR: $ORG_ALIAS"
 sf project deploy start --target-org $ORG_ALIAS || { echo 'Source push failed' ; exit 1; }
+# To pull source from scxratch org
+# sf project retrieve start --target-org $ORG_ALIAS
 
 # Assign Permission Set to users
 echo "--- ASSIGN PERMISSIONS FOR: $ORG_ALIAS"

From 888ae46696033db41b0d5f60066d9d976ca4bbef Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Wed, 20 Dec 2023 10:56:38 +0900
Subject: [PATCH 03/20] FIx data day format on block modal issues #2

---
 force-app/main/default/classes/GGW_ContentBlockWrapper.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
index a8a5ee7..fd76cf5 100644
--- a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
+++ b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
@@ -40,7 +40,7 @@ public class GGW_ContentBlockWrapper {
         // Count words in rich text with APEX methods
         integer words = block.Description__c.normalizeSpace().stripHtmlTags().replaceAll('\\S','').length() ;
         this.wordcount = words;
-        this.displaydate = block.CreatedDate.format('YYYY-MM'); // Format this to short
+        this.displaydate = block.CreatedDate.format('YYYY-MM-dd'); // Format this to short
         // Temporary value for tag default
         //this.displaybadge = ''; // TODO find how to fill this what make a tag?
         this.totalblocks = cnt;

From 014275ef689eda4d13033b32508851f8fadf6b93 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Wed, 20 Dec 2023 11:01:48 +0900
Subject: [PATCH 04/20] Fix for issue #3 word count on text block

---
 force-app/main/default/classes/GGW_ContentBlockWrapper.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
index fd76cf5..62e2733 100644
--- a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
+++ b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls
@@ -39,7 +39,7 @@ public class GGW_ContentBlockWrapper {
         this.languagelabel = GGW_Util.toLanguageLabel(block.Language__c); // Language label
         // Count words in rich text with APEX methods
         integer words = block.Description__c.normalizeSpace().stripHtmlTags().replaceAll('\\S','').length() ;
-        this.wordcount = words;
+        this.wordcount = words + 1; // Adjust of undercount by 1 noted in Issue #3
         this.displaydate = block.CreatedDate.format('YYYY-MM-dd'); // Format this to short
         // Temporary value for tag default
         //this.displaybadge = ''; // TODO find how to fill this what make a tag?

From 32842965122905787d33542ee16717e891f83805 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Wed, 20 Dec 2023 13:00:38 +0900
Subject: [PATCH 05/20] Fix issues #10 new section creation

---
 .../default/classes/GGW_ApplicationCtrl.cls   |   2 +
 .../ggwNewApplication/ggwNewApplication.html  |  11 +-
 .../ggwNewApplication/ggwNewApplication.js    | 193 +++++++-----------
 3 files changed, 84 insertions(+), 122 deletions(-)

diff --git a/force-app/main/default/classes/GGW_ApplicationCtrl.cls b/force-app/main/default/classes/GGW_ApplicationCtrl.cls
index af7bd77..c9df4bf 100644
--- a/force-app/main/default/classes/GGW_ApplicationCtrl.cls
+++ b/force-app/main/default/classes/GGW_ApplicationCtrl.cls
@@ -210,10 +210,12 @@ public without sharing class GGW_ApplicationCtrl {
     @AuraEnabled
     public static GGW_SectionWrapper createNewSection(String name){
         GGW_Section__c maxOrder = findMaxOrderSection();
+        String lang = GGW_Util.getGrantLanguage();
         GGW_Section__c s = new GGW_Section__c();
         s.Name = name;
         s.Recommended__c = true;
         s.Suggested__c = true;
+        s.Language__c = lang;
         s.Sort_Order__c = getSectionSortOrder(maxOrder);
         if(Schema.sObjectType.GGW_Section__c.isCreateable()){
             insert s;
diff --git a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.html b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.html
index db2beb9..a18ce6e 100644
--- a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.html
+++ b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.html
@@ -11,8 +11,7 @@
                 <lightning-button label="Create" onclick={handleApplicationRecordCreate}></lightning-button>
             </lightning-button-group>
         </lightning-button-group>
-      <!---  <lightning-button label="Create" slot="actions" onclick={handleApplicationRecordCreate}></lightning-button>
-      -->
+
         <div class="slds-box slds-box_xx-small slds-var-m-left_xx-small slds-var-m-right_xxx-small slds-var-m-bottom_xx-small">
             <lightning-input type="text" label="Grant Name" onchange={handleGrantNameChange}></lightning-input>
             
@@ -66,12 +65,18 @@
                             class="slds-var-m-bottom_small"
                         >
                             <lightning-layout-item flexibility="grow">
-                                <lightning-input type="text" onchange={handleSectionInputChange} label="Create new section"></lightning-input>
+                                <lightning-input 
+                                    type="text" 
+                                    value={newSectionName} 
+                                    onchange={handleSectionInputChange} 
+                                    label="Create new section">
+                                </lightning-input>
                             </lightning-layout-item>
                             <lightning-layout-item class="slds-var-p-left_xx-small">
                                 <lightning-button
                                     label="New Section"
                                     onclick={handleCreateNewSection}
+                                    disabled={disableSectionCreateButton}
                                 ></lightning-button>
                             </lightning-layout-item>
                         </lightning-layout>
diff --git a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js
index d723aa8..873f9f8 100644
--- a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js
+++ b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js
@@ -18,14 +18,12 @@ const DELAY = 300;
 export default class GgwNewApplication extends NavigationMixin(LightningElement) {
     error;
     _title = 'New Grant Application';
-    message = 'New grant was created';
-    variant = 'success';
     @api availableActions = [];
     @api language = 'en_US';
-    // -- List of checkobxes gested section
+    // -- List of checkobxes suggested section
     value = []; //['Statement of need','Plan of action','Budget narrative']; // Sample recommended selected Section IDs or items
     options = []; // List of Suggested sections display as checkboxes list the values show what is suggested from data
-    searchKey = ''; // Seach key for find Sections
+    searchKey = ''; // Search key for find Sections
 
     // --- Hold the original list of values temporary
     basevalue = []; //['Statement of need','Plan of action','Budget narrative']; // Sample recommends selected items
@@ -36,10 +34,48 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
     optionsSectionAdd = [];
     // ---
     newSectionName;
+    disableSectionCreateButton = true;
     // --New Grant name & Status combo box
     grantNameValue;
     statusValue;
     // ---
+    showToastSuccess(msg){
+        const evt = new ShowToastEvent({
+            title: this._title,
+            message: msg,
+            variant: 'success',
+        });
+        this.dispatchEvent(evt);    
+    }
+    showToastError(msg){
+        const evt = new ShowToastEvent({
+            title: this._title,
+            message: msg,
+            variant: 'error',
+        });
+        this.dispatchEvent(evt);    
+    }
+    showToastWarning(msg){
+        const evt = new ShowToastEvent({
+            title: this._title,
+            message: msg,
+            variant: 'warning',
+        });
+        this.dispatchEvent(evt);    
+    }
+    navigateToGrantEditorPage(recordId){
+        this[NavigationMixin.Navigate]({
+            type: 'standard__navItemPage',
+            attributes: {
+                apiName: 'GGW_Grant_Editor'
+            },
+            state: {
+                c__recordId: recordId,
+                c__uictx: 'page'
+            }
+        });
+    }
+
     connectedCallback() {
         this.getSectionsList();
     }
@@ -77,33 +113,6 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
                 console.log('New Application wireFoundSections: unknown error')
             }
         }
-    // Intialize seggested sections list for home page
-    // Used in checkbox group to select sections to use by Grant application
-    /* 
-    @wire(getSections)
-        wireSugestedSection({error,data}){
-            if (data) {
-
-                for(var i=0; i<data.length; i++)  {
-                    this.options = [...this.options ,{label: data[i].label, value: data[i].recordid} ];  
-                    this.baseoptions = [...this.baseoptions ,{label: data[i].label, value: data[i].recordid} ];  
-
-                    if(data[i].selected == true){
-                        this.value.push(data[i].recordid);
-                        this.basevalue.push(data[i].recordid);
-                    }
-                }                
-                this.error = undefined;
-            }else if(error){
-                console.log(error);
-                this.error = error;
-            }else{
-		        // eslint-disable-next-line no-console
-		        console.log('unknown error')
-            }
-        }
-    */
-
     getSectionsList() {
         // Call SFDC method query sections
         getSections()
@@ -166,7 +175,7 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
                 }
             }
         }
-        // REset
+        // Reset
         this.options = [];
         this.options = tempSectionOptions;
         this.value = [];
@@ -184,24 +193,34 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
             this.searchKey = searchKey;
         }, DELAY);
     }
-
+    isStringEmpty(str) {
+        if (typeof str === "string" && str.length === 0) {
+            //console.log("The string is empty");
+            return true;
+          } else if (str === null) {
+            //console.log("The string is null");
+            return true
+          } else {
+            //console.log("The string is not empty or null");
+            return false;
+          }
+        return false;
+    }
     handleSectionInputChange(event) {
         this.newSectionName = event.detail.value;
+        if(!this.isStringEmpty(this.newSectionName)){
+            this.disableSectionCreateButton = false; // enable create section button
+        }else{
+            this.disableSectionCreateButton = true; // disable if text is erased
+        }
     }
     // CREATE NEW Section - use standard page layout
     // Navigate to New Section record page not baes UX
-    // Will use custom metho call instead
+    // Will use custom method call instead
     handleCreateNewSection(){
-        /* THIS METHOD TO NAVIAGTE STANDARD NEW RECORD
-        this[NavigationMixin.Navigate]({
-            type: 'standard__objectPage',
-            attributes: {
-                objectApiName: 'GGW_Section__c',
-                actionName: 'new'
-            }
-        });  **/
-        // THIS WILL CALL APEX METHOD
-        if(this.newSectionName != null){
+        // CALL APEX METHOD createNewSection
+        //if(this.newSectionName != null){
+        if(!this.isStringEmpty(this.newSectionName)){
             createNewSection({name: this.newSectionName})
                 .then((result) => {
                     console.log('NEW SECTION: '+JSON.stringify(result));
@@ -214,28 +233,19 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
                     this.options = this.baseoptions;
                     this.value = [];
                     this.value = this.basevalue;
+                    // Clear Section input
+                    this.disableSectionCreateButton = true;
+                    this.newSectionName = null;
 
-                    this.message = 'New Section was created with ID: ';
-                    this.variant = 'success';
+                    this.showToastSuccess(`New Section was created with ID: ${result.recordid}`);
                 })
                 .catch((error) => {
                     this.error = error;
-                    //this.contacts = undefined;
-                    this.message = this.error;
-                    this.variant = 'error';
+                    this.showToastError(this.error);
                 });
         }else{
-            this.message = 'Please provide a name to create a new Section.';
-            this.variant = 'warning';
+            this.showToastWarning(`Please provide a name to create a new Section.`);
         }
-        // Display toaster message
-        const evt = new ShowToastEvent({
-                title: this._title,
-                message: this.message,
-                variant: this.variant,
-        });
-        this.dispatchEvent(evt);
-
     }
 
     // Create new Grant application event handler
@@ -245,74 +255,19 @@ export default class GgwNewApplication extends NavigationMixin(LightningElement)
             // Create record/s for new app save and continue to next
             newGrant({name: this.grantNameValue, sections: this.value})
                 .then((result) => {
-                    //this.contacts = result;
                     console.log('NEW GRANT: '+JSON.stringify(result));
                     this.error = undefined;
-
-                    // check if NEXT is allowed on this screen
-                    /*
-                    console.log('NEXT Try Navigate IF FLOW');
-                    if (this.availableActions.find((action) => action === 'NEXT')) {
-                        // navigate to the next screen
-                        console.log('Navigate FLOW NEXT IF Action is OK');
-                        const navigateNextEvent = new FlowNavigationNextEvent();
-                        this.dispatchEvent(navigateNextEvent);
-                    }
-                    */
-                    this.message = 'New Grant Application was created with ID: '+result.Id;
-                    this.variant = 'success';
-                    // Display toaster message
-                    const evt = new ShowToastEvent({
-                        title: this._title,
-                        message: this.message,
-                        variant: this.variant,
-                    });
-                    this.dispatchEvent(evt);
-
+                    
+                    this.showToastSuccess(`New Grant Application was created with ID: ${result.Id}`);
                     // Navigate to New Grant record page
-                    this[NavigationMixin.Navigate]({
-                            type: 'standard__navItemPage',
-                            attributes: {
-                                apiName: 'GGW_Grant_Editor'
-                            },
-                            state: {
-                                c__recordId: result.Id,
-                                c__uictx: 'page'
-                            }
-                        });
-                    /** This navi to standard Grant record page    
-                        type: 'standard__recordPage',
-                        attributes: {
-                            recordId: result.Id,
-                            objectApiName: 'GGW_Grant_Application__c',
-                            actionName: 'view'
-                        }
-                    }); */
+                    this.navigateToGrantEditorPage(result.Id);
                 })
                 .catch((error) => {
                     this.error = error;
-                    //this.contacts = undefined;
-                    this.message = this.error;
-                    this.variant = 'error';
-                    // Display toaster message
-                    const evt = new ShowToastEvent({
-                        title: this._title,
-                        message: this.message,
-                        variant: this.variant,
-                    });
-                    this.dispatchEvent(evt);
+                    this.showToastError(this.error);
                 });
         }else{
-            this.message = 'Please provide a name to create a Grant application.';
-            this.variant = 'warning';
-            // Display toaster message
-            const evt = new ShowToastEvent({
-                title: this._title,
-                message: this.message,
-                variant: this.variant,
-            });
-            this.dispatchEvent(evt);
+            this.showToastWarning(`Please provide a name to create a Grant application.`);
         }
-    
     }
 }
\ No newline at end of file

From 1e7977314c43bb4568d245155edd6f6d2e753fc6 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 13:13:48 +0900
Subject: [PATCH 06/20] Unfinished work need investigation

---
 .../main/default/pages/GGW_GrantPreview.page  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/force-app/main/default/pages/GGW_GrantPreview.page b/force-app/main/default/pages/GGW_GrantPreview.page
index 1143f8c..641237c 100644
--- a/force-app/main/default/pages/GGW_GrantPreview.page
+++ b/force-app/main/default/pages/GGW_GrantPreview.page
@@ -7,6 +7,7 @@
         
         <style></style>
         <apex:stylesheet value="{!URLFOR($Resource.GGWStyles, 'resources/css/gww_grant_preview.css')}"/>
+
     </head>
     <body>
 
@@ -20,6 +21,8 @@
         </h1>
 
         <br/>
+        <button class="btn" onclick="copyContent()">Copy!</button>
+            
         <apex:repeat value="{!items}" var="item" id="theItemRepeat">
             <h3 id='temp:C:CQJ7784f8c1101544c3b3dc3f648'>
                 <b><span style="color:#181818" textcolor="#181818">
@@ -27,12 +30,28 @@
                 </span></b>
             </h3>
 
+             
+
             <span style="color:#181818" textcolor="#181818">
                 <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>
             </span>
             <br/>
 
         </apex:repeat>
+
+        <script type="text/javascript">
+            function copyContent() {
+                let text = document.getElementById('j_id0:theItemRepeat:1:textBlock').innerHTML;
+                console.log(`### ${text}`);
+              try {
+                navigator.clipboard.writeText(text);
+                console.log('Content copied to clipboard');
+              } catch (err) {
+                console.error('Failed to copy: ', err);
+              }
+            }
+        </script>
+
     </body>
 
 </apex:page>
\ No newline at end of file

From 6dcc71745bb53ff0b9adca18053c3d100637de75 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 16:23:50 +0900
Subject: [PATCH 07/20] Feature #27 Edit mode toggle functionality

---
 .vscode/settings.json                         |   5 +-
 .../default/lwc/ggwSection/ggwSection.html    |  53 ++---
 .../main/default/lwc/ggwSection/ggwSection.js | 225 ++++++++----------
 .../lwc/ggwSection/ggwSection.js-meta.xml     |   2 +-
 4 files changed, 121 insertions(+), 164 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 58aa9ed..456c731 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,8 @@
     "**/.mvn": true,
     "**/.exchange_modules_tmp": true,
     ".mule": true
-  }
+  },
+  "cSpell.words": [
+    "onselectedblockchange"
+  ]
 }
diff --git a/force-app/main/default/lwc/ggwSection/ggwSection.html b/force-app/main/default/lwc/ggwSection/ggwSection.html
index facc0b1..51baaf9 100644
--- a/force-app/main/default/lwc/ggwSection/ggwSection.html
+++ b/force-app/main/default/lwc/ggwSection/ggwSection.html
@@ -1,21 +1,14 @@
 <template>
     <lightning-card title={displayTitle} >
       <lightning-button-group slot="actions">
-        <lightning-button-icon icon-name="utility:add"  alternative-text="Add block" title="Add block"  onclick={showModal}></lightning-button-icon>
-        <lightning-button-icon icon-name="utility:edit"  alternative-text="Edit" title="Edit block"  onclick={handleEnableEdit}></lightning-button-icon>
-        <lightning-button-icon icon-name="utility:save"  alternative-text="Save" title="save" onclick={saveRichText}></lightning-button-icon>
-        <lightning-button-icon icon-name="utility:insert_template"  alternative-text="Add to library" title="Add to library"  onclick={addBlockToLibrary}></lightning-button-icon>
-        <lightning-button-icon icon-name="utility:delete"  alternative-text="Delete section" title="Delete section"  onclick={handleDeleteSection}></lightning-button-icon>
+        <lightning-button-icon icon-name="utility:add"  alternative-text="Add block" title="Add block" aria-label="Add block" data-button-number="01" onclick={showModal}><label>Add block</label></lightning-button-icon>
+        <lightning-button-icon-stateful icon-name="utility:edit" selected={enableEdit} alternative-text="Edit" title="Edit block" data-button-number="02" onclick={handleEnableEdit}><label>Edit block</label></lightning-button-icon-stateful>
+        <lightning-button-icon icon-name="utility:save"  alternative-text="Save" title="save" data-button-number="03" onclick={saveRichText}><label>Save</label></lightning-button-icon>
+        <lightning-button-icon icon-name="utility:insert_template"  alternative-text="Add to library" title="Add to library" data-button-number="04" onclick={addBlockToLibrary}><label>Add to Library</label></lightning-button-icon>
+        <lightning-button-icon icon-name="utility:delete"  alternative-text="Delete section" title="Delete section" data-button-number="05" onclick={handleDeleteSection}><label>Delete</label></lightning-button-icon>
 
-  <!--
-        <lightning-button-menu alternative-text="Order menu" variant="border-filled" icon-name="utility:settings" onselect={handleReorderOnselect}>
-          <template for:each={sectionorder} for:item="ord">
-            <lightning-menu-item value={ord} label={ord} key={ord}></lightning-menu-item>
-            </template>
-        </lightning-button-menu>
-  -->
       </lightning-button-group>
-        <div class="slds-box slds-box_xx-small slds-m-left_x-small slds-m-right_x-small slds-m-bottom_xx-small">            
+        <div class="slds-box slds-box_xx-small slds-var-m-left_x-small slds-var-m-right_x-small slds-var-m-bottom_xx-small">            
           <template if:false={enableEdit}>
             <lightning-formatted-rich-text
                 value={textBlock}
@@ -34,37 +27,19 @@
     <template if:true={openModal}>  
         <div class="slds-modal slds-fade-in-open slds-backdrop">  
           <div class="slds-modal__container">  
-            <!------HEADER Section 
-            <div class="slds-modal__header">  
-              <lightning-button-icon icon-name="utility:close" alternative-text="Close this window" size="large"  
-                variant="bare-inverse" onclick={closeModal} class="slds-modal__close">  
-              </lightning-button-icon>  
-              <h2>Welcome To SalesforcePoint.com</h2>  
-            </div>  
-        -->
-            <!------Body Section-->  
+            <!-- Body Section -->  
             <div class="slds-modal__content slds-p-around_medium">  
-                <center>  
-
-                    <c-ggw-content-block-modal
+                <c-ggw-content-block-modal
                       section={sectionId}
                       application={applicationId}
-                      onselectedblockchange={hanldeSelectedBlockChange}
-                    ></c-ggw-content-block-modal>
-
-                </center>  
+                      onselectedblockchange={handleSelectedBlockChange}
+                ></c-ggw-content-block-modal>                 
             </div>  
-            <!------Footer Section-->  
+            <!--Footer Section-->  
             <div class="slds-modal__footer">  
-              <!-- TODO ONLY Show Save button is there are available Blocks for section 
-                 
-              <template if:true={sectionHasBlocks}>
-                <lightning-button label="Save" onclick={saveCloseModal}></lightning-button>  
-              </template>
-            -->
-            <lightning-button icon-name="utility:close" label="Cancel" onclick={closeModal} class="slds-var-m-right_xx-small"></lightning-button>  
-            <lightning-button icon-name="utility:save" label="Save" variant="brand" onclick={saveCloseModal} class="slds-var-m-left_xx-small"></lightning-button>
-          </div>  
+              <lightning-button icon-name="utility:close" label="Cancel" onclick={closeModal} class="slds-var-m-right_xx-small"></lightning-button>  
+              <lightning-button icon-name="utility:save" label="Save" variant="brand" onclick={saveCloseModal} class="slds-var-m-left_xx-small"></lightning-button>
+            </div>  
           </div>  
         </div>  
     </template>   
diff --git a/force-app/main/default/lwc/ggwSection/ggwSection.js b/force-app/main/default/lwc/ggwSection/ggwSection.js
index 8f45076..e292ca3 100644
--- a/force-app/main/default/lwc/ggwSection/ggwSection.js
+++ b/force-app/main/default/lwc/ggwSection/ggwSection.js
@@ -24,7 +24,7 @@ export default class GgwSection extends LightningElement {
     @api selectedItemId;
     @api sectioncount;
     @api sortorder;
-    @api displayTitle; // Assmeble dynamic title '['+this.sortorder+'] '+this.sectionTitle;
+    @api displayTitle;
 
     @track openModal = false;
     @track confirmation;
@@ -35,10 +35,30 @@ export default class GgwSection extends LightningElement {
     sectionorder = ['1','2','3','4'];
     _title = 'Section';
     enableEdit = false;
+    textChanged = false;  // Track if user changed some text in section
+    textBlockBuffer; // Store temporary
+    textBlockOrigin; // Keep original text block
+
+    showToastSuccess(msg){
+        const evt = new ShowToastEvent({
+            title: this._title,
+            message: msg,
+            variant: 'success',
+        });
+        this.dispatchEvent(evt);
+    }
+    showToastError(msg){
+        const evt = new ShowToastEvent({
+            title: this._title,
+            message: msg,
+            variant: 'error',
+        });
+        this.dispatchEvent(evt);
+    }
     showModal() {
         console.log('# Section ID: '+this.key);
         this.openModal = true;
-        // Seve initial selecetd text to restore later
+        // Save initial selected text to restore later
         this.saveSelectedText = this.textBlock;
     }
     // Close model no section change as cancel action
@@ -46,91 +66,84 @@ export default class GgwSection extends LightningElement {
         this.openModal = false;
         this.textBlock = this.saveSelectedText; // Restore initial text
     }
-    handleEnableEdit(){
-        this.enableEdit = true;
+    /**
+     * Toggle Edit mode ON/OFF with text changes validations
+     * Including Save text to temporary buffer to rollback to original text
+     * Uses Lightning Confirmation modal box
+     * 
+     * @param {*} NONE
+     */
+    async handleEnableEdit(){
+        if(this.textChanged === true){
+            const result = await LightningConfirm.open({
+                message: `You have unsaved changes. Are you sure you want to cancel edits.`,
+                label: 'Confirm Cancel Edit',
+            });
+            if(result == true){
+                this.enableEdit = false;
+                this.textChanged = false;
+                this.textBlock = this.textBlockOrigin;
+            }else{
+                console.log('cancel delete section!')
+            }
+        }else{
+            this.enableEdit = this.enableEdit ? false : true;
+        }
     }
     // Save set selected section text and close modal
     saveCloseModal() {
         this.openModal = false;
 
-            // Save selected text block data in SFDC
-            saveSelectedSectionText({itemid: this.selectedItemId, blockid: this.blockId})
-                .then((result) => {
-                    //this.contacts = result;
+        // Save selected text block data in SFDC
+        saveSelectedSectionText({itemid: this.selectedItemId, blockid: this.blockId})
+            .then((result) => {
                     console.log('Update App selected item: '+JSON.stringify(result));
-                    this.error = undefined;
-    
-                    // Display toaster message
-                    const evt = new ShowToastEvent({
-                        title: this._title,
-                        message: 'Grant Application was updated with text block.',
-                        variant: 'success',
-                    });
-                    this.dispatchEvent(evt);
-                })
-                .catch((error) => {
+                    this.error = undefined;    
+                    showToastSuccess(`Grant Application was updated with text block.`)
+            })
+            .catch((error) => {
                     this.error = error;
-    
-                    // Display ERROR toaster message
-                    const evt = new ShowToastEvent({
-                        title: this._title,
-                        message: this.error,
-                        variant: 'error',
-                    });
-                    this.dispatchEvent(evt);
-                    
-                });
-    
+                    this.showToastError(this.error);                    
+            });
     }
-    // Delete Item section BUtton click handler call APEX method to delete here with 
+    // Delete Item section Button click handler call APEX method to delete here with 
     // confirmation Modal
     // This only delete selected ITEM junction from Grant and refresh UI for sections.
     async handleDeleteSection(){
         // Before delete add confirmation modal ensure user action not a mistake
         // Define the properties of our confirmation modal
-            const result = await LightningConfirm.open({
-                message: 'Are you sure you want to delete section "'+ this.sectionTitle +'" from this grant?',  // Modal body text
+        const result = await LightningConfirm.open({
+                message: `Are you sure you want to delete section ${this.sectionTitle} from this grant?`,  // Modal body text
                 //variant: 'headerless',
                 label: 'Confirm Delete Section',
                 // setting theme would have no effect
-            });
-            //Confirm has been closed
-            //result is true if OK was clicked
-            //and false if cancel was clicked
-            if(result == true){
-                // Delete section
-                this.deleteSectionCall();
-            }else{
-                console.log('cancel delete section!')
-            }
-            //console.log('Delete Confirm: '+result);
+        });
+        //Confirm has been closed
+        //result is true if OK was clicked
+        //and false if cancel was clicked
+        if(result == true){
+            // Delete section
+            this.deleteSectionCall();
+        }else{
+            console.log('cancel delete section!')
+        }
+        //console.log('Delete Confirm: '+result);
         
     }
-    /** DEPRECATED Using Lightning promprt Summer 22
-     * Generic Modal Action button handler User confirms button click
-     * called to handle the confirmation modal's custom onbuttonclick event
-     * This method can be called for confirming many actions such as 
-     * delete section or save block to library
-     * @param {*} event - on button click
-     *
-    handleConfirmationButtonModal(event){
-        // We pass the event to the function in the utility class along with the confirmation object
-        handleConfirmationButtonClick(event, this.confirmation);
-    }*/
     /**
-     * Call APEX Method to delete selected item - setion from grant
+     * Call APEX Method to delete selected item - section from grant
      */
     deleteSectionCall(){
         deleteSection({itemId: this.selectedItemId})
             .then((result) => {
                 //this.contacts = result;
-                console.log('Delete item: '+this.selectedItemId);
+                console.log(`Delete item: ${this.selectedItemId}`);
                 this.error = undefined;
 
                 // Fire delete event to parent
-                // Bubble UP the deletesection event to parent.
+                // Bubble UP the delete section event to parent.
                 var sectionObject = { section: this.selectedItemId };
-                const selectedBlockEvent = new CustomEvent("deletesection", {
+                const selectedBlockEvent = new CustomEvent('deletesection', {
                     detail: sectionObject,
                     bubbles: true
                 });
@@ -139,41 +152,27 @@ export default class GgwSection extends LightningElement {
                 this.dispatchEvent(selectedBlockEvent);
 
                 // Display toaster message for selected section item deleted from Salesforce completed
-                const evt = new ShowToastEvent({
-                    title: this._title,
-                    message: 'Delete Grant section.',
-                    variant: 'success',
-                });
-                this.dispatchEvent(evt);
+                this.showToastSuccess(`Delete Grant section.`);
             })
             .catch((error) => {
                 this.error = error;
-
-                // Display ERROR toaster message
-                const evt = new ShowToastEvent({
-                    title: this._title,
-                    message: this.error,
-                    variant: 'error',
-                });
-                this.dispatchEvent(evt);
+                this.showToastError(this.error);
             });
     }
     connectedCallback() {
-        //this.subscribeToMessageChannel();
-        //this.textBlock = 'Text placehold';
-        //this.sectionTitle += ' Order - '+this.sortorder; 
-        this.displayTitle = '['+this.sortorder+'] '+this.sectionTitle;
+        this.displayTitle = `[${this.sortorder}] ${this.sectionTitle}`;
         this.sectionorder = [];
         for(var i=0; i<this.sectioncount; i++)  {
             this.sectionorder.push(i+1);
         }
+        this.textBlockOrigin = this.textBlock;
     }
     /**
      * Action button handler User selects on ContentBlockModal one of the blocks by a button click
      * to add text block to a section
      * @param {*} event - on button click holds text adn block ID
      */
-    hanldeSelectedBlockChange(event){
+    handleSelectedBlockChange(event){
         this.textBlock = event.detail.blocktext;
         this.blockId = event.detail.blockid;
         // Bubble UP the selectedblockchange event with the text data.
@@ -194,47 +193,40 @@ export default class GgwSection extends LightningElement {
      * @param {*} event - on button click event not used in this action
      */
     saveRichText(event){
+        if(!this.textChanged){
+            this.showToastSuccess(`Nothing to update.`);
+            return;
+        }
+        this.textBlock = this.textBlockBuffer;
         updateSelectedItemText({itemid: this.selectedItemId, richtext: this.textBlock})
         .then((result) => {
-            //this.contacts = result;
             console.log('Updated text on selected item: '+JSON.stringify(result));
             this.error = undefined;
-
-            // Display toaster message
-            const evt = new ShowToastEvent({
-                title: this._title,
-                message: 'Text block updated.',
-                variant: 'success',
-            });
-            this.dispatchEvent(evt);
+            this.showToastSuccess(`Text block updated.`);
 
             // Disable Edit panel
             this.enableEdit = false;
+            this.textChanged = false;
+            this.textBlockOrigin = this.textBlock; // Set Origin text same as current saved text
         })
         .catch((error) => {
             this.error = error;
-
-            // Display ERROR toaster message
-            const evt = new ShowToastEvent({
-                title: this._title,
-                message: this.error,
-                variant: 'error',
-            });
-            this.dispatchEvent(evt);
-            
+            this.showToastError(this.error);            
         });
     }
     /**
      * Rich Text input change event handler, fire when  user changes rich text in the text box
-     * This even used to update text data in a variable to use later to save call.
+     * This event used to update text data in a variable to use later to save call.
      * @param {*} event  - contains rich text changed value 
      */
     handleTextBlockChange(event){
-        this.textBlock = event.target.value;
+        //this.textBlock = event.target.value;
+        this.textBlockBuffer = event.target.value;
+        this.textChanged = true;
     }
     /**
-     * TBD - NOT FULLY IMPLIMENTED
-     * This is menue handler for sorting section
+     * TBD - NOT FULLY IMPLEMENTED
+     * This is menu handler for sorting section
      * NOT yet decided if we actually be using this
      * @param {*} event 
      */
@@ -243,20 +235,20 @@ export default class GgwSection extends LightningElement {
         this.sortorder = this.selectedItemOrderValue;
         this.displayTitle = this.sectionTitle + ' Order - '+this.sortorder;
         // call method apex to update sort order for selected item
-        // TODO ----- IMPLIMENT IF WE DCIDE to use this sorting event
+        // TODO ----- IMPLEMENT IF WE DECIDE to use this sorting event
     }
     /**
      * Action button handler ADD Block TO LIBRARY on section toolbar, 
-     * cofirm the action and commit save changes adding new text block in Salesforce
-     * Add block text record to a related section recod, to collect content blocks library
+     * confirm the action and commit save changes adding new text block in Salesforce
+     * Add block text record to a related section record, to collect content blocks library
      * 
      * @param {*} event 
      */
     addBlockToLibrary(){
         // Before delete add confirmation modal ensure user action not a mistake
         LightningPrompt.open({
-            message: 'Are you sure you want to add this text block to section "'+ this.sectionTitle +'"? If yes please enter block name.',  // Modal body text
-            //theme defaults to "default"
+            message: `Are you sure you want to add this text block to section ${this.sectionTitle}? If yes please enter block name.`,  // Modal body text
+            // theme defaults to "default"
             label: 'Add Block to Library', // this is the header text
             defaultValue: 'name new block', //this is optional
         }).then((result) => {
@@ -265,7 +257,7 @@ export default class GgwSection extends LightningElement {
             //and null if cancel was clicked
             if(result != null){
                 console.log('New block save Name: '+result);
-                // Add save ne block to libarary
+                // Add save new block to library
                 this.saveNewTextBlock(result);
             }else{
                 console.log('cancel save block!')
@@ -277,34 +269,21 @@ export default class GgwSection extends LightningElement {
      * Call APEX methods to save new text block for given section
      * to reuse later in other applications.
      * This new blocks can be tagged by users by adding Topic labels
+     * 
+     * @param {*} blockname 
      */
     saveNewTextBlock(blockname){
         // Create new text block to save for future use
         addTextBlockToLibrary({sectionid: this.sectionId, richtext: this.textBlock, name: blockname})
         .then((result) => {
-            //this.contacts = result;
-            //console.log('Updated text on selected item: '+result);
             this.error = undefined;
-
-            // Display toaster message
-            const evt = new ShowToastEvent({
-                title: this._title,
-                message: 'New text block added to library for Section:'+this.sectionTitle,
-                variant: 'success',
-            });
-            this.dispatchEvent(evt);
+            this.showToastSuccess(`New text block added to library for Section: ${this.sectionTitle}`);
         })
         .catch((error) => {
             this.error = error;
             console.log(error);
             if(this.error){
-                // Display ERROR toaster message
-                const evt = new ShowToastEvent({
-                    title: this._title,
-                    message: this.error,
-                    variant: 'error',
-                });
-                this.dispatchEvent(evt);
+                this.showToastError(this.error);
             }
         });
     }
diff --git a/force-app/main/default/lwc/ggwSection/ggwSection.js-meta.xml b/force-app/main/default/lwc/ggwSection/ggwSection.js-meta.xml
index 14d0167..cea07f0 100644
--- a/force-app/main/default/lwc/ggwSection/ggwSection.js-meta.xml
+++ b/force-app/main/default/lwc/ggwSection/ggwSection.js-meta.xml
@@ -1,5 +1,5 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-	<apiVersion>52.0</apiVersion>
+	<apiVersion>58.0</apiVersion>
 	<isExposed>true</isExposed>
 	<masterLabel>Ggw section</masterLabel>
 	<targets>

From 0f321274c97efcabee3b7354ef9100bb0ef6b702 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 16:28:17 +0900
Subject: [PATCH 08/20] Update APEX API version to 58.0

---
 .../main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
index 9bbf7b4..642d054 100644
--- a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
+++ b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
\ No newline at end of file

From 8023922ea88b02c9803e9fd5c25903a668a20d0f Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 16:31:36 +0900
Subject: [PATCH 09/20] Update API version 58.0

---
 force-app/main/default/classes/GGW_ApplicationCtrl.cls-meta.xml | 2 +-
 .../main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml   | 2 +-
 .../default/lwc/ggwNewApplication/ggwNewApplication.js-meta.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/GGW_ApplicationCtrl.cls-meta.xml b/force-app/main/default/classes/GGW_ApplicationCtrl.cls-meta.xml
index 40d6793..7a51829 100644
--- a/force-app/main/default/classes/GGW_ApplicationCtrl.cls-meta.xml
+++ b/force-app/main/default/classes/GGW_ApplicationCtrl.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>54.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
index 9bbf7b4..642d054 100644
--- a/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
+++ b/force-app/main/default/classes/GGW_ContentBlockWrapper.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js-meta.xml b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js-meta.xml
index 5e6be18..9664297 100644
--- a/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js-meta.xml
+++ b/force-app/main/default/lwc/ggwNewApplication/ggwNewApplication.js-meta.xml
@@ -1,5 +1,5 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-	<apiVersion>52.0</apiVersion>
+	<apiVersion>58.0</apiVersion>
 	<isExposed>true</isExposed>
 	<masterLabel>New Grant Application</masterLabel>
 	<targets>

From 26fffc01274807544aa782f0501676fc68a3d2d7 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 16:33:18 +0900
Subject: [PATCH 10/20] Update API version 58.0

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

diff --git a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js-meta.xml b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js-meta.xml
index 59f5855..1cda26c 100644
--- a/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js-meta.xml
+++ b/force-app/main/default/lwc/ggwContentBlockModal/ggwContentBlockModal.js-meta.xml
@@ -1,5 +1,5 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-	<apiVersion>52.0</apiVersion>
+	<apiVersion>58.0</apiVersion>
 	<isExposed>true</isExposed>
 	<masterLabel>Ggw content block modal</masterLabel>
 	<targets>

From ccc31e81c1828f21f0b51b91f50b746c1a8f567e Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 17:07:35 +0900
Subject: [PATCH 11/20] Feature #1 add copy/paste functionality to swection
 editor copy button to clipboard

---
 .../main/default/lwc/ggwSection/ggwSection.html    |  1 +
 .../main/default/lwc/ggwSection/ggwSection.js      | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/force-app/main/default/lwc/ggwSection/ggwSection.html b/force-app/main/default/lwc/ggwSection/ggwSection.html
index 51baaf9..7670e75 100644
--- a/force-app/main/default/lwc/ggwSection/ggwSection.html
+++ b/force-app/main/default/lwc/ggwSection/ggwSection.html
@@ -6,6 +6,7 @@
         <lightning-button-icon icon-name="utility:save"  alternative-text="Save" title="save" data-button-number="03" onclick={saveRichText}><label>Save</label></lightning-button-icon>
         <lightning-button-icon icon-name="utility:insert_template"  alternative-text="Add to library" title="Add to library" data-button-number="04" onclick={addBlockToLibrary}><label>Add to Library</label></lightning-button-icon>
         <lightning-button-icon icon-name="utility:delete"  alternative-text="Delete section" title="Delete section" data-button-number="05" onclick={handleDeleteSection}><label>Delete</label></lightning-button-icon>
+        <lightning-button-icon icon-name="utility:copy"  alternative-text="Copy" title="copy" data-button-number="06" onclick={copyText}><label>Copy</label></lightning-button-icon>
 
       </lightning-button-group>
         <div class="slds-box slds-box_xx-small slds-var-m-left_x-small slds-var-m-right_x-small slds-var-m-bottom_xx-small">            
diff --git a/force-app/main/default/lwc/ggwSection/ggwSection.js b/force-app/main/default/lwc/ggwSection/ggwSection.js
index e292ca3..fb7101d 100644
--- a/force-app/main/default/lwc/ggwSection/ggwSection.js
+++ b/force-app/main/default/lwc/ggwSection/ggwSection.js
@@ -55,6 +55,20 @@ export default class GgwSection extends LightningElement {
         });
         this.dispatchEvent(evt);
     }
+
+    copyText(){
+        let tempText = this.textBlock.replace( /(<([^>]+)>)/ig, '');
+        
+        navigator.clipboard.writeText(tempText).then(
+            () => {
+                this.showToastSuccess(`Data copied to clipboard`);
+            },
+            () => {
+                this.showToastError(`Copy FAILED ERROR`);
+            },
+          );
+    }
+
     showModal() {
         console.log('# Section ID: '+this.key);
         this.openModal = true;

From 4d37cbb9d87ac7fb1d57280fa14e02456a041343 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Thu, 21 Dec 2023 21:33:21 +0900
Subject: [PATCH 12/20] Add copy function to clipboard in HTML preview page for
 each section Issue #6

---
 .../main/default/pages/GGW_GrantPreview.page  | 44 ++++++++++++++-----
 .../pages/GGW_GrantPreview.page-meta.xml      |  2 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/pages/GGW_GrantPreview.page b/force-app/main/default/pages/GGW_GrantPreview.page
index 641237c..7bc7db3 100644
--- a/force-app/main/default/pages/GGW_GrantPreview.page
+++ b/force-app/main/default/pages/GGW_GrantPreview.page
@@ -4,10 +4,12 @@
         <title>Grant Application: {!appName}</title>
         <meta charset="UTF-8"></meta>
         <link href="http://fonts.googleapis.com/css?family=Crimson+Text:400,400italic,700,700italic|Roboto:400,700,700italic,400italic" rel="stylesheet" type="text/css"></link>
-        
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"></link>
+
         <style></style>
-        <apex:stylesheet value="{!URLFOR($Resource.GGWStyles, 'resources/css/gww_grant_preview.css')}"/>
 
+        <apex:stylesheet value="{!URLFOR($Resource.GGWStyles, 'resources/css/gww_grant_preview.css')}"/>
+        
     </head>
     <body>
 
@@ -21,35 +23,57 @@
         </h1>
 
         <br/>
-        <button class="btn" onclick="copyContent()">Copy!</button>
+        
             
         <apex:repeat value="{!items}" var="item" id="theItemRepeat">
-            <h3 id='temp:C:CQJ7784f8c1101544c3b3dc3f648'>
+            <h3 id='tempSectionHeader'>
                 <b><span style="color:#181818" textcolor="#181818">
                     <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>
+                    
                 </span></b>
             </h3>
 
-             
+            <button id="copyBtn" class="btn" onclick="copyContent('{!$Component.theItemRepeat.textBlock}')"><i class="fa fa-copy"></i></button>
 
-            <span style="color:#181818" textcolor="#181818">
+            <span id="tempTextSpan" style="color:#181818" textcolor="#181818">
                 <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>
             </span>
+
             <br/>
 
         </apex:repeat>
 
         <script type="text/javascript">
-            function copyContent() {
-                let text = document.getElementById('j_id0:theItemRepeat:1:textBlock').innerHTML;
-                console.log(`### ${text}`);
+            function copyContent(itemId) {
+                let text = document.getElementById(itemId).innerHTML;
+                //console.log(`### ${text}`);
+
               try {
-                navigator.clipboard.writeText(text);
+                let tempText = text.replace( /(<([^>]+)>)/ig, ''); // clear all HTML rich tags
+                copyTextToClipboard(tempText);
                 console.log('Content copied to clipboard');
               } catch (err) {
                 console.error('Failed to copy: ', err);
               }
+              
             }
+
+            function copyTextToClipboard(text) { 
+                var textArea = document.createElement("textarea"); 
+                textArea.value = text; 
+                textArea.style.position="fixed"; //avoid scrolling to bottom 
+                document.body.appendChild(textArea); 
+                textArea.focus(); 
+                textArea.select(); 
+                try { 
+                    var successful = document.execCommand('copy'); 
+                    var msg = successful ? 'successful' : 'unsuccessful'; 
+                    //console.log(`Fallback: Copying text command was ${msg}`); 
+                } catch (err) { 
+                    //console.error(`Fallback: Oops, unable to copy`, err); 
+                } 
+                document.body.removeChild(textArea); 
+            } 
         </script>
 
     </body>
diff --git a/force-app/main/default/pages/GGW_GrantPreview.page-meta.xml b/force-app/main/default/pages/GGW_GrantPreview.page-meta.xml
index 821f74f..077ed01 100644
--- a/force-app/main/default/pages/GGW_GrantPreview.page-meta.xml
+++ b/force-app/main/default/pages/GGW_GrantPreview.page-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>52.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>GGW_GrantPreview</label>

From 24c74250fe49f8d182e60bc20d5663e9dcc500ca Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Fri, 22 Dec 2023 09:56:03 +0900
Subject: [PATCH 13/20] Remove inline styles in HTML

---
 .../main/default/pages/GGW_GrantPreview.page  | 20 +++++++++----------
 .../resources/css/gww_grant_preview.css       |  4 ++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/pages/GGW_GrantPreview.page b/force-app/main/default/pages/GGW_GrantPreview.page
index 7bc7db3..5187612 100644
--- a/force-app/main/default/pages/GGW_GrantPreview.page
+++ b/force-app/main/default/pages/GGW_GrantPreview.page
@@ -19,25 +19,25 @@
         </apex:outputPanel>
 
         <h1 id='temp:C:CQJeb278781ebae4fa1a2a1ac42b'>
-            <b><span style="color:#181818" textcolor="#181818">{!appName}</span></b>
+            <b><span class="ggw-span-text">{!appName}</span></b>
         </h1>
 
         <br/>
         
-            
         <apex:repeat value="{!items}" var="item" id="theItemRepeat">
             <h3 id='tempSectionHeader'>
-                <b><span style="color:#181818" textcolor="#181818">
-                    <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>
-                    
-                </span></b>
+                <b>
+                    <span class="ggw-span-text">
+                        <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>    
+                    </span>
+                </b>
             </h3>
 
             <button id="copyBtn" class="btn" onclick="copyContent('{!$Component.theItemRepeat.textBlock}')"><i class="fa fa-copy"></i></button>
-
-            <span id="tempTextSpan" style="color:#181818" textcolor="#181818">
-                <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>
-            </span>
+            
+            <span id="tempTextSpan" class="ggw-span-text">
+                <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>    
+            </span>            
 
             <br/>
 
diff --git a/force-app/main/default/staticresources/GGWStyles/resources/css/gww_grant_preview.css b/force-app/main/default/staticresources/GGWStyles/resources/css/gww_grant_preview.css
index 3b6a7ca..49de8a9 100644
--- a/force-app/main/default/staticresources/GGWStyles/resources/css/gww_grant_preview.css
+++ b/force-app/main/default/staticresources/GGWStyles/resources/css/gww_grant_preview.css
@@ -490,3 +490,7 @@ div[data-section-style="6"] ul ul ul ul ul li:before {
 div[data-section-style="6"] ul ul ul ul ul ul li:before {
     content: counter(indent5, lower-roman) ". ";
 }
+
+ggw-span-text {
+    color:#181818;
+}
\ No newline at end of file

From 4db956b3c64b05f137a5cc383f479212932b5e10 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Fri, 22 Dec 2023 15:02:55 +0900
Subject: [PATCH 14/20] Clean up remove inline HTML styles

---
 .../main/default/pages/GGW_GrantPreviewPdf.page      |  6 +++---
 .../main/default/pages/GGW_GrantPreviewWord.page     | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/pages/GGW_GrantPreviewPdf.page b/force-app/main/default/pages/GGW_GrantPreviewPdf.page
index be0e14d..5bbf370 100644
--- a/force-app/main/default/pages/GGW_GrantPreviewPdf.page
+++ b/force-app/main/default/pages/GGW_GrantPreviewPdf.page
@@ -14,18 +14,18 @@
             <br/>
         </apex:outputPanel>
         <h1 id='temp:C:CQJeb278781ebae4fa1a2a1ac42b'>
-            <b><span style="color:#181818" textcolor="#181818">{!appName}</span></b>
+            <b><span class="ggw-span-text">{!appName}</span></b>
         </h1>
 
         <br/>
         <apex:repeat value="{!items}" var="item" id="theItemRepeat">
             <h3 id='temp:C:CQJ7784f8c1101544c3b3dc3f648'>
-                <b><span style="color:#181818" textcolor="#181818">
+                <b><span class="ggw-span-text">
                     <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>
                 </span></b>
             </h3>
 
-            <span style="color:#181818" textcolor="#181818">
+            <span class="ggw-span-text">
                 <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>
             </span>
             <br/>
diff --git a/force-app/main/default/pages/GGW_GrantPreviewWord.page b/force-app/main/default/pages/GGW_GrantPreviewWord.page
index d34f682..bd49bc9 100644
--- a/force-app/main/default/pages/GGW_GrantPreviewWord.page
+++ b/force-app/main/default/pages/GGW_GrantPreviewWord.page
@@ -16,18 +16,20 @@
         </apex:outputPanel>
 
         <h1 id='temp:C:CQJeb278781ebae4fa1a2a1ac42b'>
-            <b><span style="color:#181818" textcolor="#181818">{!appName}</span></b>
+            <b><span class="ggw-span-text">{!appName}</span></b>
         </h1>
         <br/>        
 
         <apex:repeat value="{!items}" var="item" id="theItemRepeat">
             <h3 id='temp:C:CQJ7784f8c1101544c3b3dc3f648'>
-                <b><span style="color:#181818" textcolor="#181818">
-                    <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>
-                </span></b>
+                <b>
+                    <span class="ggw-span-text">
+                        <apex:outputText value="{!item.Section_Name__c}" id="sectionName"/>
+                    </span>
+                </b>
             </h3>
 
-            <span style="color:#181818" textcolor="#181818">
+            <span class="ggw-span-text">
                 <apex:outputText value="{!item.Text_Block__c}" escape="false" id="textBlock"/>
             </span>
             <br/>

From a115f2d073ae9bc8cbb7c3c4906b32ce689f9155 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Fri, 22 Dec 2023 17:46:38 +0900
Subject: [PATCH 15/20]  Fix bug #46 on existing app reordesr sections

---
 .vscode/settings.json                         |  5 +-
 .../ggwGrantApplication.js                    | 44 +++++------
 .../lwc/ggwOrderSections/ggwOrderSections.js  | 75 ++++++++-----------
 3 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 58aa9ed..a86940a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,8 @@
     "**/.mvn": true,
     "**/.exchange_modules_tmp": true,
     ".mule": true
-  }
+  },
+  "cSpell.words": [
+    "onsectionorderchange"
+  ]
 }
diff --git a/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js b/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js
index d164fab..8be41af 100644
--- a/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js
+++ b/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js
@@ -26,6 +26,13 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
     @api language = 'en_US';
     @track logoState = false; // Exclude or include logo
     @track showLogoButtons = false;
+    @track openModal = false; // OPen Reorder modal
+    @track openVFPExportModal = false; // Open export modal
+    @track grantPageURL = '';
+    @track sections = [];
+    @track grantRecordPage = GRANT_RECORD_PAGE_URL;
+    @track currentPageReference;
+ 
     noLogoDisplay = true; // Display empty avatar instead of logo
     displayTitle;
     status;
@@ -33,18 +40,12 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
     _title = GRANT_TITLE;
     message = 'Test';
     variant = 'success';
-    @track openModal = false; // OPen Reorder modal
-    @track openVFPExportModal = false; // Open export modal
     toggleIconName = 'utility:preview';
     toggleButtonLabel = 'Add Content';
-    @track grantPageURL = '';
-    @track sections = [];
     currentSections = [];
     container = 'modal';
     showModalFooter = false;
     showCard = true; // Display Editor card if data grant exists ELSE show illustration
-    @track grantRecordPage = GRANT_RECORD_PAGE_URL;
-    @track currentPageReference;
 
     showToastSuccess(msg){
         const evt = new ShowToastEvent({
@@ -106,7 +107,7 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
         .catch((error) => {
             console.log(error);
             this.error = error;
-            this.showToastError('Logo file delete error.');
+            this.showToastError(`Logo file delete error.`);
         });
     }
 
@@ -159,14 +160,14 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
 
     handleExportMenuSelect(event){
         const selectedItemValue = event.detail.value;
-        console.log('## handleExportMenuSelect: '+selectedItemValue);
-        if(selectedItemValue == 'exportPDF'){
+        console.log(`## handleExportMenuSelect: ${selectedItemValue}`);
+        if(selectedItemValue === 'exportPDF'){
             this.exportGrantVFPdf();
         }
-        if(selectedItemValue == 'exportWORD'){
+        if(selectedItemValue === 'exportWORD'){
            this.exportGrantVFWord(); 
         }
-        if(selectedItemValue == 'exportHTML'){
+        if(selectedItemValue === 'exportHTML'){
             this.exportGrantVFHTML(); 
          }
     }
@@ -238,11 +239,11 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
     setSectionsFromArray(selectedContentBlock){
         if (selectedContentBlock){
             this.sectioncount = selectedContentBlock.length;
-            for(var i = 0; i < selectedContentBlock.length; i++)  {
-                var item = selectedContentBlock[i];
-                var tmpText = item.displaytext ? item.displaytext : 'Text placeholder'; // Set text value condition for null
+            for(let i = 0; i < selectedContentBlock.length; i++)  {
+                let item = selectedContentBlock[i];
+                let tmpText = item.displaytext ? item.displaytext : 'Text placeholder'; // Set text value condition for null
                 this.sections = [...this.sections ,{label: item.sectionname, 
-                                                    displaytitle: '['+item.sortorder+'] ' + item.sectionname,
+                                                    displaytitle: `[${item.sortorder}] ${item.sectionname}`,
                                                     value: item.sectionid, // sfid for Section record
                                                     appid: this.recordId, // Id for Grant Application record 
                                                     hasblocks: true, 
@@ -322,18 +323,13 @@ export default class GgwGrantApplication extends NavigationMixin(LightningElemen
     }
     // Order section change
     handleSectionOrderChange(event){
-        
-       // TODO There strange problem refresh of section list is late even data is reloaded
-       // Modal Action box still not refresh, for now workaround close box reopen will show new order.
-       console.log(`handleSectionOrderChange: ORDER Change event: ${this.recordId}`);
-        // Arange new order sections on UI on client side
-        // refreshApex(this.handleLoad());
-        // Close modal
-        //this.openModal = false;
+        // TODO There strange problem refresh of section list is late even data is reloaded
+        // Modal Action box still not refresh, for now workaround close box reopen will show new order.
+        console.log(`handleSectionOrderChange: ORDER Change event: ${this.recordId}`);
         this.closeModal();
         if(event.detail.items){
             // Display toaster message if data was updated
-            showToastSuccess(`Updated grant sections order or add new section`);
+            this.showToastSuccess(`Updated grant sections order or add new section`);
         }
         // Reload data
         this.queryGrantApplication();
diff --git a/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js b/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js
index 0d34ca2..ea94a92 100644
--- a/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js
+++ b/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js
@@ -29,36 +29,44 @@ export default class GgwOrderSections extends LightningElement {
 	closeQuickAction() {
 		this.dispatchEvent(new CloseActionScreenEvent());
          // Fire event to UI
-         var cancelreorder = {action: 'close'};
-         const sectionOrderEvent = new CustomEvent("sectionorderchange", {
+         const cancelreorder = {action: 'close'};
+         const reOrderEvent = new CustomEvent("sectionorderchange", {
              detail: cancelreorder,
              bubbles: true
          });
- 
          // Dispatches the event.
-         this.dispatchEvent(sectionOrderEvent);
-        
+         this.dispatchEvent(reOrderEvent);
 	}
-
+    
+    confirmSectionReorder(){
+        // Fire event to UI to notify parent app to close modal reorder and update view
+        const neworder = {items: this.selected};
+        const sectionOrderEvent = new CustomEvent("sectionorderchange", {
+                detail: neworder,
+                bubbles: true
+        });
+        // Dispatches the event.
+        this.dispatchEvent(sectionOrderEvent);
+    }    
     // when the component is first initialized assign an initial value to sections and other Grant App variables    
     connectedCallback() {
         // --- Need this timeout delay to allow record ID from Quick Action on record page to be set
         // For some crazy reason LEX/LWC does not init record ID fast enough to init this call
         setTimeout(() => {
-            console.log('Init App with ID:'+this.recordId);
+            console.log(`Init App with ID: ${this.recordId}`);
             //this.displayTitle = 'Grant Application: ' + this.grant.data ? this.grant.data.fields.Name.value : null;
-            // Change to call imperative insted of wire for data refreshes
+            // Change to call imperative instead of wire for data refreshes
             getApplication({recordId: this.recordId})
                 .then((data) => {
-                    console.log('Grant Name: '+data.name);
+                    console.log(`Grant Name: ${data.name}`);
                     this.grantName = data.name;
-                    this.displayTitle = 'Grant Application: ' + data.name;
+                    this.displayTitle = `Grant Application: ${data.name}`;
                     this.status = data.status;
                     
                     if (data.selectedContentBlock){
                         this.sectioncount = data.selectedContentBlock.length;
-                        for(var i=0; i<data.selectedContentBlock.length; i++)  {
-                            var item = data.selectedContentBlock[i];
+                        for(let i=0; i<data.selectedContentBlock.length; i++)  {
+                            let item = data.selectedContentBlock[i];
                             // Use Selectors
                             this.sections = [...this.sections ,{label: item.sectionname, 
                                                                 value: item.selecteditemid, // sfid for Section record
@@ -68,19 +76,14 @@ export default class GgwOrderSections extends LightningElement {
                                 console.log('Selected: '+item.selecteditemid);
                             }
                                             
-                            // USE Data table
-                            //this.sections = [...this.sections ,{label: item.sectionname, 
-                            //                                    order: item.sortorder,
-                            //                                    id: item.sectionid, // sfid for Section record
-                            //                                    } ];                              
                         }                
                     }  
                     // New sections
                     if (data.unselectSectionList){
-                        console.log('UN-Selected: '+data.unselectSectionList);
-                        for(var i=0; i<data.unselectSectionList.length; i++)  {
-                            var sect = data.unselectSectionList[i];
-                            console.log(i + ' section: '+sect.label);
+                        console.log(`UN-Selected: ${data.unselectSectionList}`);
+                        for(let i=0; i<data.unselectSectionList.length; i++)  {
+                            let sect = data.unselectSectionList[i];
+                            console.log(`${i}  section: ${sect.label}`);
                             // Use Selectors
                             this.sections = [...this.sections ,{label: sect.label, 
                                                                 value: sect.recordid, // sfid for Section record
@@ -97,29 +100,27 @@ export default class GgwOrderSections extends LightningElement {
         }, 5);
     }
 
-    //get selected() {
-    //    return this._selected.length ? this._selected : 'none';
-    //}
-    // Methdod called by list order LWC standard component when order changes
-    // List items rearenged by user
+    // Method called by list order LWC standard component when order changes
+    // List items rearranged by user
     handleSectionOrderChange(e){
         this.selected = e.detail.value;
-        console.log('Order: '+this.selected);
-        //console.log('EVENT: '+JSON.stringify(e.detail));
+        console.log(`Order: ${this.selected}`);
     }
     // Save reorder sections for Grant in Salesforce call APEX to save data
     // Update Selected Items with new sort order
-    handleReorder(){
-        console.log('Call APEX to reOrder: '+this.selected);
+    handleReorder(e){
+        console.log(`Call APEX to reOrder: ${this.selected}`);
         reorderSections({sectionList: this.selected, appId: this.recordId})
             .then((data) => {
-                console.log('REORDER RETURENED OK ');
+                console.log(`REORDER RETURNED OK `);
                 this.error = undefined;
+                this.confirmSectionReorder();
             })
             .catch((error) => {
                 console.log(error);
                 this.error = error;
                 this.sections = undefined;  
+                console.log(`REORDER ERROR: ${this.error}`);
                 
                 const evt = new ShowToastEvent({
                     title: 'Reorder Error',
@@ -129,17 +130,5 @@ export default class GgwOrderSections extends LightningElement {
                 this.dispatchEvent(evt);    
         
             });
-        // Fire event to UI
-        var neworder = {items: this.selected};
-        const sectionOrderEvent = new CustomEvent("sectionorderchange", {
-            detail: neworder,
-            bubbles: true
-        });
-
-        // Dispatches the event.
-        this.dispatchEvent(sectionOrderEvent);
-
-        // Close
-        this.closeQuickAction();
     }
 }
\ No newline at end of file

From 214a85af5f1ec144d741dd67181d9a0a3ece0aa7 Mon Sep 17 00:00:00 2001
From: Igor Androsov <iandrosov@salesforce.com>
Date: Fri, 22 Dec 2023 17:49:07 +0900
Subject: [PATCH 16/20] Update API version 58.0

---
 .../lwc/ggwGrantApplication/ggwGrantApplication.js-meta.xml     | 2 +-
 .../default/lwc/ggwOrderSections/ggwOrderSections.js-meta.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js-meta.xml b/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js-meta.xml
index e776c04..f78d114 100644
--- a/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js-meta.xml
+++ b/force-app/main/default/lwc/ggwGrantApplication/ggwGrantApplication.js-meta.xml
@@ -1,5 +1,5 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-	<apiVersion>52.0</apiVersion>
+	<apiVersion>58.0</apiVersion>
 	<isExposed>true</isExposed>
 	<masterLabel>Ggw grant application</masterLabel>
 	<description>Grant Application editor</description>
diff --git a/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js-meta.xml b/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js-meta.xml
index 16835b8..25e49a4 100644
--- a/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js-meta.xml
+++ b/force-app/main/default/lwc/ggwOrderSections/ggwOrderSections.js-meta.xml
@@ -1,5 +1,5 @@
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-	<apiVersion>52.0</apiVersion>
+	<apiVersion>58.0</apiVersion>
 	<isExposed>true</isExposed>
 	<masterLabel>Ggw order sections</masterLabel>
 	<description>Compoenet shows list of sections and allow to reorder by setting order values for each.</description>

From f8999865d65e266199dff8121c56331d557fd495 Mon Sep 17 00:00:00 2001
From: Cid <cmendizabal@salesforce.com>
Date: Fri, 22 Dec 2023 11:29:38 -0500
Subject: [PATCH 17/20] modified gitignore to ignore vscode settings.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index eabfefe..6500be8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ tempdata
 tempdata-out
 *.cci/*
 .pmdCache
+.vscode/*

From a45f6c653e7753ba0c9f7b8990e09e4eb2b8903a Mon Sep 17 00:00:00 2001
From: Cid <cmendizabal@salesforce.com>
Date: Fri, 22 Dec 2023 11:31:46 -0500
Subject: [PATCH 18/20] update vscode/setting.json file and add the file to
 gitignore.

---
 .gitignore            | 1 +
 .vscode/settings.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6500be8..807984f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ tempdata-out
 *.cci/*
 .pmdCache
 .vscode/*
+.vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a86940a..2116ba2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -21,6 +21,6 @@
     ".mule": true
   },
   "cSpell.words": [
-    "onsectionorderchange"
+    "onsectionorderchange" 
   ]
 }

From 4bbad9320429fbd3dccf51e2f3aacf8187e8e05c Mon Sep 17 00:00:00 2001
From: Cid <cmendizabal@salesforce.com>
Date: Fri, 22 Dec 2023 11:23:33 -0500
Subject: [PATCH 19/20] Modified feature build

---
 .github/workflows/feature_build.yml | 70 +++++++++++++++++++----------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/feature_build.yml b/.github/workflows/feature_build.yml
index 7ef72d1..94402e5 100644
--- a/.github/workflows/feature_build.yml
+++ b/.github/workflows/feature_build.yml
@@ -10,30 +10,54 @@ on:
       - 'README.md'
 env:
   CUMULUSCI_KEYCHAIN_CLASS: cumulusci.core.keychain.EnvironmentProjectKeychain
-  CUMULUSCI_SERVICE_github: ${{ secrets.CUMULUSCI_SERVICE_github }}
+  CUMULUSCI_SERVICE_github: ${{ secrets.CUMULUSCI_SERVICE_GITHUB }}
 jobs:
   unit_tests:
     name: 'Deploy Code and Run Apex Tests'
-    runs-on: ubuntu-latest
+    runs-on: Ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install sfdx
-        run: |
-          mkdir sfdx
-          wget -qO- https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz | tar xJ -C sfdx --strip-components 1
-          echo $(realpath sfdx/bin) >> $GITHUB_PATH
-      - name: Authenticate Dev Hub
-        run: |
-          echo ${{ secrets.SFDX_AUTH_URL }} > sfdx_auth
-          sfdx force:auth:sfdxurl:store -f sfdx_auth -d
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: '3.8'
-      - name: Install CumulusCI
-        run: |
-          python -m pip install -U pip
-          pip install cumulusci
-      - name: Deploy and Run Tests
-        run: |
-          cci flow run ci_feature --org dev --delete-org
\ No newline at end of file
+        # Install Salesforce CLI
+        - name: 'Install Salesforce CLI'
+          run: |
+              npm install @salesforce/cli --location=global
+              nodeInstallPath=$(npm config get prefix)
+              echo "$nodeInstallPath/bin" >> $GITHUB_PATH
+              sf --version
+
+        # Checkout the source code
+        - name: 'Checkout source code'
+          uses: actions/checkout@v4
+
+        # Store secret for dev hub
+        - name: 'Populate auth file with DEV_HUB_AUTH secret'
+          shell: bash
+          run: |
+              echo ${{ secrets.DEV_HUB_AUTH}} > ./DEV_HUB_AUTH.txt
+              secretFileSize=$(wc -c "./DEV_HUB_AUTH.txt" | awk '{print $1}')
+              if [ $secretFileSize == 1 ]; then
+                  echo "Missing DEV_HUB_AUTH secret. Is this workflow running on a fork?";
+                  exit 1;
+              fi
+
+        # Authenticate dev hub
+        - name: 'Authenticate Dev Hub'
+          run: sf org login sfdx-url -f ./DEV_HUB_AUTH.txt -a devhub -d
+
+        # Remove auth file
+        - name: 'Remove auth file'
+          run: rm -f ./DEV_HUB_AUTH.txt
+        
+        # Install Python
+        - name: Set up Python
+          uses: actions/setup-python@v5
+          with:
+            python-version: '3.10'
+        #Install CumulusCI
+        - name: Install CumulusCI
+          run: |
+            python -m pip install -U pip
+            pip install cumulusci
+        #Use CCI to deploy and test feature
+        - name: Deploy and Run Tests
+          run: |
+            cci flow run ci_feature --org dev --delete-org
\ No newline at end of file

From bdc8ee575b202d14a2a3f35218fb626a04348711 Mon Sep 17 00:00:00 2001
From: Cid <cmendizabal@salesforce.com>
Date: Fri, 22 Dec 2023 12:10:18 -0500
Subject: [PATCH 20/20] modified beta release to support unlocked packages.

---
 .github/workflows/beta_release.yml | 81 ++++++++++++++++++++++++------
 cumulusci.yml                      | 12 ++++-
 2 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml
index e6edff8..0658510 100644
--- a/.github/workflows/beta_release.yml
+++ b/.github/workflows/beta_release.yml
@@ -1,40 +1,89 @@
 name: beta release
 
 on:
-  workflow_dispatch:
+  push:
     branches:
-      - "main"
+      - 'main'
     paths-ignore:
-      - "docs/**"
-      - "README.md"
-
+      - 'docs/**'
+      - 'README.md'
+env:
+      CUMULUSCI_KEYCHAIN_CLASS: cumulusci.core.keychain.EnvironmentProjectKeychain
+      CUMULUSCI_SERVICE_github: ${{ secrets.CUMULUSCI_SERVICE_GITHUB }}
 jobs:
   unit_tests:
     name: "Run Beta release"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install sfdx
+      # Install Salesforce CLI
+      - name: 'Install Salesforce CLI'
         run: |
-          mkdir sfdx
-          wget -qO- https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz | tar xJ -C sfdx --strip-components 1
-          echo $(realpath sfdx/bin) >> $GITHUB_PATH
-      - name: Authenticate Dev Hub
+            npm install @salesforce/cli --location=global
+            nodeInstallPath=$(npm config get prefix)
+            echo "$nodeInstallPath/bin" >> $GITHUB_PATH
+            sf --version
+
+      # Checkout the source code
+      - name: 'Checkout source code'
+        uses: actions/checkout@v4
+
+      # Store secret for dev hub
+      - name: 'Populate auth file with DEV_HUB_AUTH secret'
+        shell: bash
         run: |
-          echo ${{ secrets.SFDX_AUTH_URL }} > sfdx_auth
-          sfdx force:auth:sfdxurl:store -f sfdx_auth -d
-        # Create package version and extract its id
+            echo ${{ secrets.DEV_HUB_AUTH}} > ./DEV_HUB_AUTH.txt
+            secretFileSize=$(wc -c "./DEV_HUB_AUTH.txt" | awk '{print $1}')
+            if [ $secretFileSize == 1 ]; then
+                echo "Missing DEV_HUB_AUTH secret. Is this workflow running on a fork?";
+                exit 1;
+            fi
+
+      # Authenticate dev hub
+      - name: 'Authenticate Dev Hub'
+        run: sf org login sfdx-url -f ./DEV_HUB_AUTH.txt -a devhub -d
+
+      # Remove auth file
+      - name: 'Remove auth file'
+        run: rm -f ./DEV_HUB_AUTH.txt
+      
+      #Create Package Version
       - name: "Create package version"
         id: createPackageVersion
         run: |
           set +e
-          json=$(sfdx force:package:version:create -p "Grants Content Kit" --installationkeybypass --definitionfile config/project-scratch-def.json --wait 10 --targetdevhubusername ldodevhub --branch main -c --json)
+          json=$(sf package version create -p "Grants Content Kit" -x -f config/project-scratch-def.json -w 10 -b main -c --json)
           echo $json
           status=$(echo $json | jq '.status')
           if [ $status == "0" ]; then
           packageVersionId=$(echo $json | jq -r '.result.SubscriberPackageVersionId')
           echo "::set-output name=packageVersionId::$packageVersionId"
           else
-          echo "sfdx force:package:version:create failed"
+          echo "sf package creation failed"
           fi
           exit $status
+        
+      # Wait for package replication
+      - name: 'Wait for package replication'
+        run: sleep 360s
+ 
+      # Create scratch org
+      - name: 'Create scratch org'
+        run: sf org create scratch -f config/project-scratch-def.json -a scratch-org -d -y 1
+      # Install new package in scratch org
+      - name: 'Install new package version in scratch org'
+        run: sf package install -p ${{ steps.createPackageVersion.outputs.packageVersionId }} -w 10 -o scratch-org -r
+
+      # Install Python
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+            python-version: '3.10'
+      #Install CumulusCI
+      - name: Install CumulusCI
+        run: |
+            python -m pip install -U pip
+            pip install cumulusci
+      #Use CCI to deploy and test feature
+      - name: Generate Release Notes and 
+        run: |
+            cci flow run gk_release_beta --org feature --delete-org
\ No newline at end of file
diff --git a/cumulusci.yml b/cumulusci.yml
index 79c07c5..1a7a450 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -40,4 +40,14 @@ flows:
             5:
                task: command
                options:
-                   command: sfdx data import tree -p test-data/export-section-GGW_Section__c-plan.json
\ No newline at end of file
+                   command: sfdx data import tree -p test-data/export-section-GGW_Section__c-plan.json
+    
+    gk_release_beta:
+        description: 'Generate Release notes and auto merge main branch.'
+        steps:
+            1:
+                task: github_release
+            2: 
+                task: github_release_notes
+            3:
+                task: github_automerge_main
\ No newline at end of file