From 476db607b1613c1ad88e1ba4e3ea5ea879026239 Mon Sep 17 00:00:00 2001
From: Andrea Pellegatta <andrea@clayton.io>
Date: Tue, 15 Nov 2022 11:45:14 +0100
Subject: [PATCH 1/2] fix: added missing fields to flow - severity and priority

---
 .../flows/ClaytonDiffScan.flow-meta.xml       |  12 ++
 ...__c-copado__Project Layout.layout-meta.xml | 184 ------------------
 2 files changed, 12 insertions(+), 184 deletions(-)
 delete mode 100644 force-app/main/default/layouts/copado__Project__c-copado__Project Layout.layout-meta.xml

diff --git a/force-app/main/default/flows/ClaytonDiffScan.flow-meta.xml b/force-app/main/default/flows/ClaytonDiffScan.flow-meta.xml
index 48278bc..050a36c 100644
--- a/force-app/main/default/flows/ClaytonDiffScan.flow-meta.xml
+++ b/force-app/main/default/flows/ClaytonDiffScan.flow-meta.xml
@@ -451,12 +451,24 @@
                 <elementReference>Create_Static_Code_Analysis_Violations.commentx5fbody</elementReference>
             </value>
         </inputAssignments>
+        <inputAssignments>
+            <field>copado__Priority__c</field>
+            <value>
+                <elementReference>IssuePriority</elementReference>
+            </value>
+        </inputAssignments>
         <inputAssignments>
             <field>copado__Rule__c</field>
             <value>
                 <elementReference>Create_Static_Code_Analysis_Violations.name</elementReference>
             </value>
         </inputAssignments>
+        <inputAssignments>
+            <field>copado__Severity__c</field>
+            <value>
+                <elementReference>IssueSeverity</elementReference>
+            </value>
+        </inputAssignments>
         <inputAssignments>
             <field>copado__Static_Code_Analysis_Result__c</field>
             <value>
diff --git a/force-app/main/default/layouts/copado__Project__c-copado__Project Layout.layout-meta.xml b/force-app/main/default/layouts/copado__Project__c-copado__Project Layout.layout-meta.xml
deleted file mode 100644
index 5ce378f..0000000
--- a/force-app/main/default/layouts/copado__Project__c-copado__Project Layout.layout-meta.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Layout xmlns="http://soap.sforce.com/2006/04/metadata">
-    <excludeButtons>Submit</excludeButtons>
-    <layoutSections>
-        <customLabel>false</customLabel>
-        <detailHeading>false</detailHeading>
-        <editHeading>true</editHeading>
-        <label>Information</label>
-        <layoutColumns>
-            <layoutItems>
-                <behavior>Required</behavior>
-                <field>Name</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__Start_Date__c</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__End_Date__c</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__Index_Metadata__c</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>Clayton_Project_Id__c</field>
-            </layoutItems>
-        </layoutColumns>
-        <layoutColumns>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>OwnerId</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__Status__c</field>
-            </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__Deployment_Flow__c</field>
-            </layoutItems>
-        </layoutColumns>
-        <style>TwoColumnsTopToBottom</style>
-    </layoutSections>
-    <layoutSections>
-        <customLabel>true</customLabel>
-        <detailHeading>true</detailHeading>
-        <editHeading>true</editHeading>
-        <label>Description</label>
-        <layoutColumns>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>copado__Description__c</field>
-            </layoutItems>
-        </layoutColumns>
-        <style>OneColumn</style>
-    </layoutSections>
-    <layoutSections>
-        <customLabel>true</customLabel>
-        <detailHeading>true</detailHeading>
-        <editHeading>true</editHeading>
-        <label>Project Summary</label>
-        <layoutColumns>
-            <layoutItems>
-                <reportChartComponent>
-                    <cacheData>false</cacheData>
-                    <contextFilterableField>FK_CUSTENT_ID</contextFilterableField>
-                    <hideOnError>true</hideOnError>
-                    <includeContext>true</includeContext>
-                    <reportName>Story_Point_totals_by_Project_and_Status</reportName>
-                    <showTitle>true</showTitle>
-                    <size>SMALL</size>
-                </reportChartComponent>
-            </layoutItems>
-        </layoutColumns>
-        <layoutColumns/>
-        <style>TwoColumnsLeftToRight</style>
-    </layoutSections>
-    <layoutSections>
-        <customLabel>false</customLabel>
-        <detailHeading>false</detailHeading>
-        <editHeading>true</editHeading>
-        <label>System Information</label>
-        <layoutColumns>
-            <layoutItems>
-                <behavior>Readonly</behavior>
-                <field>CreatedById</field>
-            </layoutItems>
-        </layoutColumns>
-        <layoutColumns>
-            <layoutItems>
-                <behavior>Readonly</behavior>
-                <field>LastModifiedById</field>
-            </layoutItems>
-        </layoutColumns>
-        <style>TwoColumnsTopToBottom</style>
-    </layoutSections>
-    <layoutSections>
-        <customLabel>true</customLabel>
-        <detailHeading>false</detailHeading>
-        <editHeading>true</editHeading>
-        <label>Custom Links</label>
-        <layoutColumns/>
-        <layoutColumns/>
-        <layoutColumns/>
-        <style>CustomLinks</style>
-    </layoutSections>
-    <miniLayout>
-        <fields>Name</fields>
-        <fields>copado__Deployment_Flow__c</fields>
-        <fields>copado__Start_Date__c</fields>
-        <fields>copado__End_Date__c</fields>
-        <fields>copado__Status__c</fields>
-    </miniLayout>
-    <relatedLists>
-        <fields>NAME</fields>
-        <fields>copado__Start_Date__c</fields>
-        <fields>copado__End_Date__c</fields>
-        <fields>copado__Status__c</fields>
-        <fields>copado__Story_points__c</fields>
-        <relatedList>copado__Sprint__c.copado__Project__c</relatedList>
-    </relatedLists>
-    <relatedLists>
-        <fields>NAME</fields>
-        <fields>copado__User_Story_Title__c</fields>
-        <fields>copado__userStory_Role__c</fields>
-        <fields>copado__userStory_need__c</fields>
-        <fields>copado__userStory_reason__c</fields>
-        <fields>copado__Status__c</fields>
-        <fields>copado__Story_Points_SFDC__c</fields>
-        <fields>copado__Story_Points_Other__c</fields>
-        <fields>copado__Parent_Epic_Title__c</fields>
-        <fields>copado__Promote_Change__c</fields>
-        <relatedList>copado__User_Story__c.copado__Project__c</relatedList>
-    </relatedLists>
-    <relatedLists>
-        <fields>TASK.SUBJECT</fields>
-        <fields>TASK.WHO_NAME</fields>
-        <fields>ACTIVITY.TASK</fields>
-        <fields>TASK.DUE_DATE</fields>
-        <fields>TASK.STATUS</fields>
-        <fields>TASK.PRIORITY</fields>
-        <fields>CORE.USERS.FULL_NAME</fields>
-        <relatedList>RelatedActivityList</relatedList>
-    </relatedLists>
-    <relatedLists>
-        <fields>TASK.SUBJECT</fields>
-        <fields>TASK.WHO_NAME</fields>
-        <fields>ACTIVITY.TASK</fields>
-        <fields>TASK.DUE_DATE</fields>
-        <fields>CORE.USERS.FULL_NAME</fields>
-        <fields>TASK.LAST_UPDATE</fields>
-        <relatedList>RelatedHistoryList</relatedList>
-    </relatedLists>
-    <relatedLists>
-        <fields>NAME</fields>
-        <fields>copado__Planned_Date__c</fields>
-        <fields>copado__Description__c</fields>
-        <fields>copado__Status__c</fields>
-        <relatedList>copado__Release__c.copado__Project__c</relatedList>
-    </relatedLists>
-    <relatedLists>
-        <fields>NAME</fields>
-        <fields>copado__Status__c</fields>
-        <fields>copado__Source_Environment__c</fields>
-        <fields>copado__Source_Org_Credential__c</fields>
-        <fields>copado__Destination_Environment__c</fields>
-        <fields>copado__Destination_Org_Credential__c</fields>
-        <relatedList>copado__Promotion__c.copado__Project__c</relatedList>
-    </relatedLists>
-    <showEmailCheckbox>false</showEmailCheckbox>
-    <showHighlightsPanel>false</showHighlightsPanel>
-    <showInteractionLogPanel>false</showInteractionLogPanel>
-    <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
-    <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
-    <summaryLayout>
-        <masterLabel>00h09000001AoH5</masterLabel>
-        <sizeX>4</sizeX>
-        <sizeY>0</sizeY>
-        <summaryLayoutStyle>Default</summaryLayoutStyle>
-    </summaryLayout>
-</Layout>

From 576aec3f83157962f30f0a74b72259ff3e05b099 Mon Sep 17 00:00:00 2001
From: Andrea Pellegatta <andrea@clayton.io>
Date: Tue, 15 Nov 2022 12:43:47 +0100
Subject: [PATCH 2/2] feat : base branch calculated from UserStory "view in
 git" property feat: version 1.6.1

---
 .../main/default/flows/Initialise_Scan_Context.flow-meta.xml  | 2 +-
 sfdx-project.json                                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/flows/Initialise_Scan_Context.flow-meta.xml b/force-app/main/default/flows/Initialise_Scan_Context.flow-meta.xml
index 521b642..cf86c83 100644
--- a/force-app/main/default/flows/Initialise_Scan_Context.flow-meta.xml
+++ b/force-app/main/default/flows/Initialise_Scan_Context.flow-meta.xml
@@ -54,7 +54,7 @@
             <assignToReference>BaseBranch</assignToReference>
             <operator>Assign</operator>
             <value>
-                <stringValue>feature/{!Get_User_Story.Name}</stringValue>
+                <elementReference>Get_User_Story.copado__View_in_Git__c</elementReference>
             </value>
         </assignmentItems>
     </assignments>
diff --git a/sfdx-project.json b/sfdx-project.json
index eaf29b2..4848659 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -4,8 +4,8 @@
             "path": "force-app",
             "default": true,
             "package": "Clayton for Copado",
-            "versionName": "Version 1.6.1",
-            "versionNumber": "1.6.1.NEXT",
+            "versionName": "Version 1.6.2",
+            "versionNumber": "1.6.2.NEXT",
             "dependencies": [
                 {
                     "package": "Copado Deployer@17.8.0.0"