Merge branch 'User/EDRD-94' of https://github.com/bcgov/MoH-SAT into …

…User/EDRD-94
bcgov · Dec 5, 2023 · c33132d · c33132d
2 parents f05000b + 8f69796
commit c33132d
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 36 deletions.
diff --git a/.github/workflows/Manual Build Check.yml b/.github/workflows/Manual Build Check.yml
@@ -0,0 +1,64 @@
+name: Manual Build Check
+on: 
+  workflow_dispatch:
+
+jobs:
+  build-check:
+    runs-on: ubuntu-latest
+    env:
+      SF_DISABLE_SOURCE_MEMBER_POLLING: true
+    steps:
+
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+
+    - name: 'Install Salesforce CLI'
+      run: |
+          wget https://developer.salesforce.com/media/salesforce-cli/sf/channels/stable/sf-linux-x64.tar.xz
+          mkdir ~/sfdx
+          tar xJf sf-linux-x64.tar.xz -C ~/sfdx --strip-components 1
+          echo "$HOME/sfdx/bin" >> $GITHUB_PATH
+          ~/sfdx/bin/sf version
+ 
+    - name: Authenticate DevHub
+      run: |
+        echo ${{ secrets.SALESFORCE_DEVHUB_AUTH }} > sfdxurl.txt
+        sf auth:sfdxurl:store --sfdx-url-file sfdxurl.txt --alias devhub --set-default-dev-hub
+       # sfdx auth:sfdxurl:store --sfdxurlfile sfdxurl.txt --setalias devhub --setdefaultdevhubusername
+    - name: Define CI org
+      run: sf org create scratch -v devhub --set-default -f config/project-scratch-def.json -a ciorg
+      # sfdx force:org:create -v devhub -s -f config/project-scratch-def.json -a ciorg -d 1
+
+    - name: Deploy source dev-app-pre
+      run: sf project deploy start -d dev-app-pre -o ciorg 
+
+    - name: Deploy source force-app
+      run: sf project deploy start -d force-app -o ciorg 
+
+    - name: Deploy source default objects
+      run: sf project deploy start -d force-app/main/default/objects -o ciorg -w 15
+
+    - name: Deploy source default queues
+      run:  sf project deploy start -d force-app/main/default/queues -o ciorg -w 15
+
+    - name: Deploy source default dev-app-post
+      run: sf project deploy start -d dev-app-post -o ciorg -c
+      # The changes were made in accordance with Salesforce recommendations to move from sfdx commands to sf-style commands 
+      # sfdx force:source:push -u ciorg
+
+    - name: Assign permission set and set user role
+      run: |
+          sf force:user:permset:assign -o ciorg -n SA_Administrator
+          sf force:user:permset:assign -o ciorg -n HealthCloudFoundation
+          sf force:apex:execute -o ciorg -f scripts/apex/scratchorg-set-current-user.apex
+        # sfdx force:user:permset:assign -u ciorg -n SA_Administrator
+        # sfdx force:apex:execute -u ciorg -f scripts/apex/scratchorg-set-current-user.apex
+        
+    - name: Run Apex test
+      run: sfdx force:apex:test:run -c -r human
+
+    - name: Delete scratch org
+      if: ${{ always() }}
+      run: sf org delete scratch -o ciorg -p
+      # sfdx force:org:delete -u ciorg -p
diff --git a/force-app/main/default/reportTypes/Cases_with_Case_Comments_for_Account.reportType-meta.xml b/force-app/main/default/reportTypes/Cases_with_Case_Comments_for_Account.reportType-meta.xml
@@ -259,41 +259,11 @@
             <field>AccountSource</field>
             <table>Account</table>
         </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>DunsNumber</field>
-            <table>Account</table>
-        </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>Tradestyle</field>
-            <table>Account</table>
-        </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>NaicsCode</field>
-            <table>Account</table>
-        </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>NaicsDesc</field>
-            <table>Account</table>
-        </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>YearStarted</field>
-            <table>Account</table>
-        </columns>
         <columns>
             <checkedByDefault>false</checkedByDefault>
             <field>SicDesc</field>
             <table>Account</table>
         </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>DandbCompany</field>
-            <table>Account</table>
-        </columns>
         <columns>
             <checkedByDefault>false</checkedByDefault>
             <field>OperatingHours</field>
@@ -477,11 +447,6 @@
             <field>LastModifiedBy</field>
             <table>Account.Cases</table>
         </columns>
-        <columns>
-            <checkedByDefault>false</checkedByDefault>
-            <field>AssetWarranty</field>
-            <table>Account.Cases</table>
-        </columns>
         <columns>
             <checkedByDefault>false</checkedByDefault>
             <field>ServiceContract</field>

diff --git a/sfdx-project.json b/sfdx-project.json
@@ -489,6 +489,7 @@
     "Special Authority [email protected]": "04tOG00000006QPYAY",
     "Special Authority [email protected]": "04tOG00000009uXYAQ",
     "Special Authority [email protected]": "04tOG0000000A2bYAE",
-    "Special Authority [email protected]": "04tOG0000000BDBYA2"
+    "Special Authority [email protected]": "04tOG0000000BDBYA2",
+    "Special Authority [email protected]": "04tOG0000000BebYAE"
   }
 }