From bd2e804dc831028549d9100a2cd365e0ccab6409 Mon Sep 17 00:00:00 2001
From: rashmi73 <rashmiseta73@gmail.com>
Date: Wed, 16 Sep 2020 02:07:05 +0530
Subject: [PATCH 1/4] f2f submissionidlegacyid

---
 .../__snapshots__/Submission.jsx.snap                 | 11 +++++++++--
 .../SubmissionManagement/Submission/index.jsx         |  2 ++
 .../SubmissionManagement/Submission/styles.scss       |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
index b383854c98..90c1a3249c 100644
--- a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
+++ b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
@@ -6,7 +6,11 @@ exports[`Snapshot match 1`] = `
 >
   <td
     className="src-shared-components-SubmissionManagement-Submission-___styles__id-col___zC6Hi"
-  />
+  >
+    <div
+      className="src-shared-components-SubmissionManagement-Submission-___styles__legacy-id___3T2Ay"
+    />
+  </td>
   <td />
   <td
     className="src-shared-components-SubmissionManagement-Submission-___styles__date-col___3XOxK"
@@ -63,6 +67,9 @@ exports[`Snapshot match 2`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__id-col___zC6Hi"
   >
     12345
+    <div
+      className="src-shared-components-SubmissionManagement-Submission-___styles__legacy-id___3T2Ay"
+    />
   </td>
   <td />
   <td
@@ -110,4 +117,4 @@ exports[`Snapshot match 2`] = `
     </div>
   </td>
 </tr>
-`;
+`;
\ No newline at end of file
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index c2f6c8816e..02b761ab83 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -42,6 +42,7 @@ export default function Submission(props) {
     <tr styleName="submission-row">
       <td styleName="id-col">
         {submissionObject.id}
+        <div styleName="legacy-id">{submissionObject.legacyId}</div>
       </td>
       <td>
         {submissionObject.type}
@@ -118,6 +119,7 @@ Submission.defaultProps = {
 Submission.propTypes = {
   submissionObject: PT.shape({
     id: PT.string,
+    legacyId: PT.string,
     warpreviewnings: PT.string,
     screening: PT.shape({
       status: PT.string,
diff --git a/src/shared/components/SubmissionManagement/Submission/styles.scss b/src/shared/components/SubmissionManagement/Submission/styles.scss
index 981c203383..07ffd7f033 100644
--- a/src/shared/components/SubmissionManagement/Submission/styles.scss
+++ b/src/shared/components/SubmissionManagement/Submission/styles.scss
@@ -77,6 +77,10 @@ $submission-space-50: $base-unit * 10;
     }
   }
 
+  .legacy-id {
+    color: $tc-gray-50;
+  }
+
   .status-col {
     text-align: center;
 

From 7559bd111c30246dd4af202dfa7f6c61a9e7d02d Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Wed, 16 Sep 2020 14:51:17 -0300
Subject: [PATCH 2/4] ci: Deploy submissionId-hotfix to Dev an Stag

Issue: #4858
---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6180803b84..9e2120e5c8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,7 @@ workflows:
           filters:
             branches:
               only:
-                - milestone-20200917
+                - submissionId-hotfix
                 - develop
       # This is alternate dev env for parallel testing
       - "build-test":
@@ -260,6 +260,7 @@ workflows:
           filters:
             branches:
               only:
+                - submissionId-hotfix
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

From 88f6875bd44fabe492d6fbb8e931729f470f2ea3 Mon Sep 17 00:00:00 2001
From: rashmi73 <41687423+rashmi73@users.noreply.github.com>
Date: Thu, 17 Sep 2020 01:58:24 +0530
Subject: [PATCH 3/4] Update index.jsx

---
 .../components/SubmissionManagement/Submission/index.jsx      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 02b761ab83..3c82660f7f 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -42,7 +42,7 @@ export default function Submission(props) {
     <tr styleName="submission-row">
       <td styleName="id-col">
         {submissionObject.id}
-        <div styleName="legacy-id">{submissionObject.legacyId}</div>
+        <div styleName="legacy-id">{submissionObject.legacySubmissionId}</div>
       </td>
       <td>
         {submissionObject.type}
@@ -119,7 +119,7 @@ Submission.defaultProps = {
 Submission.propTypes = {
   submissionObject: PT.shape({
     id: PT.string,
-    legacyId: PT.string,
+    legacySubmissionId: PT.string,
     warpreviewnings: PT.string,
     screening: PT.shape({
       status: PT.string,

From b5c36b4754939b8660299fb408215d010eff1ea7 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Thu, 17 Sep 2020 04:34:43 -0300
Subject: [PATCH 4/4] ci: remove submissionId-hotfix from Stag

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd7a312d63..ac5bb66a4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,7 +260,6 @@ workflows:
           filters:
             branches:
               only:
-                - submissionId-hotfix
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master