From 657b5771fbc0123d9905e86defdd12c145ce2a37 Mon Sep 17 00:00:00 2001 From: jain-naman-sf Date: Wed, 1 Nov 2023 12:44:42 +0530 Subject: [PATCH 1/2] Fixed Generation of Incorrect dif links for out of date orgs --- locales_dev/en/translation.json | 3 --- src/js/components/orgs/cards/orgInfo.tsx | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/locales_dev/en/translation.json b/locales_dev/en/translation.json index c47eb20ae..a26806896 100644 --- a/locales_dev/en/translation.json +++ b/locales_dev/en/translation.json @@ -59,7 +59,6 @@ "Complete a Task": "Complete a Task", "Completed item": "Completed item", "Confirm": "Confirm", - "Confirm Changing Developer and Deleting Dev Org": "Confirm Changing Developer and Deleting Dev Org", "Confirm Deleting Account": "Confirm Deleting Account", "Confirm Deleting Epic": "Confirm Deleting Epic", "Confirm Deleting Org With Unretrieved Changes": "Confirm Deleting Org With Unretrieved Changes", @@ -174,7 +173,6 @@ "GitHub Repository Name": "GitHub Repository Name", "Go Back": "Go Back", "Heading": "Heading", - "Health Check": "Health Check", "Hello! What can Metecho help you do today?": "Hello! What can Metecho help you do today?", "Help Walkthrough": "Help Walkthrough", "Home": "Home", @@ -397,7 +395,6 @@ "Tester": "Tester", "Tester & Test Org": "Tester & Test Org", "The current scratch org cannot be transferred to the selected GitHub user. Remove the scratch org before transferring this task or correct the following issues: {{issueDescription}}": "The current scratch org cannot be transferred to the selected GitHub user. Remove the scratch org before transferring this task or correct the following issues: {{issueDescription}}", - "The existing Dev Org for this Task has unretrieved changes. Changing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?": "The existing Dev Org for this Task has unretrieved changes. Changing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?", "The existing Dev Org for this Task has unretrieved changes. Removing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?": "The existing Dev Org for this Task has unretrieved changes. Removing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?", "The last line of the log is “{{message}}” If you need support, your scratch org id is {{orgId}}.": "The last line of the log is “{{message}}” If you need support, your scratch org id is {{orgId}}.", "There are no available Epic Collaborators.": "There are no available Epic Collaborators.", diff --git a/src/js/components/orgs/cards/orgInfo.tsx b/src/js/components/orgs/cards/orgInfo.tsx index 03650080a..64d8a8a2f 100644 --- a/src/js/components/orgs/cards/orgInfo.tsx +++ b/src/js/components/orgs/cards/orgInfo.tsx @@ -87,7 +87,7 @@ const OrgInfo = ({ // synced status for orgs if (baseCommit) { // eslint-disable-next-line max-len - compareChangesUrl = `${repoUrl}/compare/${org.latest_commit}...${baseCommit}`; + compareChangesUrl = `${repoUrl}/compare/${baseCommit}...${org.latest_commit}`; } outOfDateMsg = (
  • From e50747b108b7da97086075a651c6cee4dafbb3d5 Mon Sep 17 00:00:00 2001 From: jain-naman-sf Date: Sat, 4 Nov 2023 09:41:10 +0530 Subject: [PATCH 2/2] Reverting Translation.json --- locales_dev/en/translation.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales_dev/en/translation.json b/locales_dev/en/translation.json index a26806896..c47eb20ae 100644 --- a/locales_dev/en/translation.json +++ b/locales_dev/en/translation.json @@ -59,6 +59,7 @@ "Complete a Task": "Complete a Task", "Completed item": "Completed item", "Confirm": "Confirm", + "Confirm Changing Developer and Deleting Dev Org": "Confirm Changing Developer and Deleting Dev Org", "Confirm Deleting Account": "Confirm Deleting Account", "Confirm Deleting Epic": "Confirm Deleting Epic", "Confirm Deleting Org With Unretrieved Changes": "Confirm Deleting Org With Unretrieved Changes", @@ -173,6 +174,7 @@ "GitHub Repository Name": "GitHub Repository Name", "Go Back": "Go Back", "Heading": "Heading", + "Health Check": "Health Check", "Hello! What can Metecho help you do today?": "Hello! What can Metecho help you do today?", "Help Walkthrough": "Help Walkthrough", "Home": "Home", @@ -395,6 +397,7 @@ "Tester": "Tester", "Tester & Test Org": "Tester & Test Org", "The current scratch org cannot be transferred to the selected GitHub user. Remove the scratch org before transferring this task or correct the following issues: {{issueDescription}}": "The current scratch org cannot be transferred to the selected GitHub user. Remove the scratch org before transferring this task or correct the following issues: {{issueDescription}}", + "The existing Dev Org for this Task has unretrieved changes. Changing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?": "The existing Dev Org for this Task has unretrieved changes. Changing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?", "The existing Dev Org for this Task has unretrieved changes. Removing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?": "The existing Dev Org for this Task has unretrieved changes. Removing the assigned Developer will also delete the Org, and any changes will be lost. Are you sure you want to do that?", "The last line of the log is “{{message}}” If you need support, your scratch org id is {{orgId}}.": "The last line of the log is “{{message}}” If you need support, your scratch org id is {{orgId}}.", "There are no available Epic Collaborators.": "There are no available Epic Collaborators.",