Skip to content

Commit

Permalink
Merge pull request #3 from dcheng666666/master
Browse files Browse the repository at this point in the history 
Fix Flexipage metadata deployment failure and scratch org creation failure under api version 58.0
  • Loading branch information
@ImJohnMDaniel
ImJohnMDaniel authored Nov 26, 2023
2 parents c490180 + deb1b95 commit 5059b1e
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 103 deletions.
6 changes: 1 addition & 5 deletions config/project-scratch-def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
"orgName": "force-di-samples",
"edition": "Developer",
"features": [],
"settings": {
"orgPreferenceSettings": {
"s1DesktopEnabled": true
}
}
"settings": {}
}
229 changes: 134 additions & 95 deletions force-app-1/main/flexipages/Account_Record_Page.flexipage-meta.xml
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
<flexiPageRegions>
<componentInstances>
<componentInstanceProperties>
<name>collapsed</name>
<value>false</value>
</componentInstanceProperties>
<componentName>force:highlightsPanel</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>collapsed</name>
<value>false</value>
</componentInstanceProperties>
<componentName>force:highlightsPanel</componentName>
<identifier>force_highlightsPanel</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>header</name>
<type>Region</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentName>runtime_sales_merge:mergeCandidatesPreviewCard</componentName>
</componentInstances>
<componentInstances>
<componentName>force:relatedListContainer</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>runtime_sales_merge:mergeCandidatesPreviewCard</componentName>
<identifier>runtime_sales_merge_mergeCandidatesPreviewCard</identifier>
</componentInstance>
</itemInstances>
<itemInstances>
<componentInstance>
<componentName>force:relatedListContainer</componentName>
<identifier>force_relatedListContainer</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>relatedTabContent</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentName>force:detailPanel</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>force:detailPanel</componentName>
<identifier>force_detailPanel</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>detailTabContent</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentInstanceProperties>
<name>active</name>
<value>false</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>relatedTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.relatedLists</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
</componentInstances>
<componentInstances>
<componentInstanceProperties>
<name>active</name>
<value>true</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>detailTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.detail</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>active</name>
<value>false</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>relatedTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.relatedLists</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
<identifier>relatedListsTab</identifier>
</componentInstance>
</itemInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>active</name>
<value>true</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>detailTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.detail</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
<identifier>detailTab</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>maintabs</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentInstanceProperties>
<name>tabs</name>
<value>maintabs</value>
</componentInstanceProperties>
<componentName>flexipage:tabset</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>tabs</name>
<value>maintabs</value>
</componentInstanceProperties>
<componentName>flexipage:tabset</componentName>
<identifier>flexipage_tabset</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>main</name>
<type>Region</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentName>runtime_sales_activities:activityPanel</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>runtime_sales_activities:activityPanel</componentName>
<identifier>runtime_sales_activities_activityPanel</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>activityTabContent</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentName>forceChatter:recordFeedContainer</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>forceChatter:recordFeedContainer</componentName>
<identifier>forceChatter_recordFeedContainer</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>feedTabContent</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentInstanceProperties>
<name>active</name>
<value>true</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>activityTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.activity</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
</componentInstances>
<componentInstances>
<componentInstanceProperties>
<name>body</name>
<value>feedTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.collaborate</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>active</name>
<value>true</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>body</name>
<value>activityTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.activity</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
<identifier>activityTab</identifier>
</componentInstance>
</itemInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>body</name>
<value>feedTabContent</value>
</componentInstanceProperties>
<componentInstanceProperties>
<name>title</name>
<value>Standard.Tab.collaborate</value>
</componentInstanceProperties>
<componentName>flexipage:tab</componentName>
<identifier>collaborateTab</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>sidebartabs</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
<componentInstances>
<componentName>accountRecordFlow</componentName>
</componentInstances>
<componentInstances>
<componentInstanceProperties>
<name>tabs</name>
<value>sidebartabs</value>
</componentInstanceProperties>
<componentName>flexipage:tabset</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>accountRecordFlow</componentName>
<identifier>accountRecordFlow</identifier>
</componentInstance>
</itemInstances>
<itemInstances>
<componentInstance>
<componentInstanceProperties>
<name>tabs</name>
<value>sidebartabs</value>
</componentInstanceProperties>
<componentName>flexipage:tabset</componentName>
<identifier>flexipage_tabset2</identifier>
</componentInstance>
</itemInstances>
<mode>Replace</mode>
<name>sidebar</name>
<type>Region</type>
Expand Down
9 changes: 6 additions & 3 deletions force-app-1/main/flexipages/di_Demo_Page.flexipage-meta.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
<flexiPageRegions>
<componentInstances>
<componentName>componentA</componentName>
</componentInstances>
<itemInstances>
<componentInstance>
<componentName>componentA</componentName>
<identifier>componentA</identifier>
</componentInstance>
</itemInstances>
<name>column1</name>
<type>Region</type>
</flexiPageRegions>
Expand Down

0 comments on commit 5059b1e

Please sign in to comment.