Merge branch 'develop' into issues/6006/removeLodash

.github/workflows/thank-you.yml

@@ -18,26 +18,20 @@ jobs:
         uses: actions/[email protected]
         with:
           script: |
-            const thankyouNote = 'Your efforts have helped advance digital healthcare and TeleICU systems. :rocket: Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! :raised_hands:'
+            const thankyouNote = 'Your efforts have helped advance digital healthcare and TeleICU systems. :rocket: Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! :raised_hands:';
             const options = {
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-            }
+            };
 
-            const result = await github.rest.issues.get({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-
-            const { assignees, user } = result.data
+            const { data : { assignees, user } } = await github.rest.issues.get(options);
 
-            const assignees_tagged = assignees.map((user) => '@' + user.login).join(' ')
-            const owner_tagged = '@' + user.login
+            const taggedUsers = [...new Set(
+              assignees.map(u => "@"+u.login).concat("@"+user.login)  
+            )].join(" ")
 
-            if (assignees.length == 0) {
-              await github.rest.issues.createComment({ ...options, body: `${owner_tagged} ${thankyouNote}` })
-            } else {
-              await github.rest.issues.createComment({ ...options, body: `${assignees_tagged} ${owner_tagged} ${thankyouNote}` })
-            }
+            await github.rest.issues.createComment({ 
+              ...options, 
+              body: `${taggedUsers} ${thankyouNote}` 
+            });

crowdin.yml

@@ -1,5 +1,6 @@
 files:
-  - source: /src/Locale/en/*.json
-    translation: /src/Locale/%two_letters_code%/%original_file_name%
+  - source: /public/locale/{{lang}}.json
+    translation: /public/locale/%two_letters_code%/%original_file_name%
 bundles:
   - 2
+

src/components/Facility/ConsultationDetails/index.tsx

@@ -213,6 +213,10 @@ export const ConsultationDetails = (props: any) => {
             crumbsReplacements={{
               [facilityId]: { name: patientData?.facility_object?.name },
               [patientId]: { name: patientData?.name },
+              consultation: {
+                name: "Consultation",
+                uri: `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/update`,
+              },
               [consultationId]: {
                 name:
                   consultationData.suggestion === "A"

src/components/Patient/PatientConsentRecords.tsx

@@ -112,6 +112,10 @@ export default function PatientConsentRecords(props: {
       crumbsReplacements={{
         [facilityId]: { name: patient?.facility_object?.name },
         [patientId]: { name: patient?.name },
+        consultation: {
+          name: "Consultation",
+          uri: `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/update`,
+        },
         [consultationId]: {
           name:
             patient?.last_consultation?.suggestion === "A"
@@ -121,7 +125,7 @@ export default function PatientConsentRecords(props: {
               : patient?.last_consultation?.suggestion_text,
         },
       }}
-      backUrl={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/`}
+      backUrl={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/update`}
     >
       {fileUpload.Dialogues}
       {fileManager.Dialogues}