From 60ffd9a56325acd57f58e1c0ba77ae5870bfcaf8 Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 19 Mar 2019 06:55:16 +0530
Subject: [PATCH 1/5] fix #1813

---
 .../Services/Data/TableRelationships/Relationships.js           | 2 +-
 .../Services/Data/TableRelationships/RelationshipsView.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index 82a0ce4b25f1e..7f5f487c08931 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -439,7 +439,7 @@ class Relationships extends Component {
                     <td />
                   );
                   return (
-                    <tr key={i}>
+                    <tr key={rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name}>
                       {column1}
                       {column2}
                     </tr>
diff --git a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
index e5049109fff19..4eeca8504c869 100644
--- a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
+++ b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
@@ -169,7 +169,7 @@ class RelationshipsView extends Component {
                     <td />
                   );
                   return (
-                    <tr key={i}>
+                    <tr key={rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name}>
                       {column1}
                       {column2}
                     </tr>

From 0581e1f7436f109a99921b336764eda10da7f8e9 Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 19 Mar 2019 07:00:54 +0530
Subject: [PATCH 2/5] avoid ternary in jsx

---
 .../Services/Data/TableRelationships/Relationships.js          | 3 ++-
 .../Services/Data/TableRelationships/RelationshipsView.js      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index 7f5f487c08931..5f0a1ef5db514 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -404,6 +404,7 @@ class Relationships extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
+                  const relationshipName = rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor
                       dispatch={dispatch}
@@ -439,7 +440,7 @@ class Relationships extends Component {
                     <td />
                   );
                   return (
-                    <tr key={rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name}>
+                    <tr key={relationshipName}>
                       {column1}
                       {column2}
                     </tr>
diff --git a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
index 4eeca8504c869..c20cb160bc6be 100644
--- a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
+++ b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
@@ -134,6 +134,7 @@ class RelationshipsView extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
+                  const relationshipName = rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor
                       dispatch={dispatch}
@@ -169,7 +170,7 @@ class RelationshipsView extends Component {
                     <td />
                   );
                   return (
-                    <tr key={rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name}>
+                    <tr key={relationshipName}>
                       {column1}
                       {column2}
                     </tr>

From 047b4b694c2539063516b5defe10b09d66caa40c Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 19 Mar 2019 12:09:25 +0530
Subject: [PATCH 3/5] move key from tr to div

---
 .../Services/Data/TableRelationships/Relationships.js      | 7 +++++--
 .../Services/Data/TableRelationships/RelationshipsView.js  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index 5f0a1ef5db514..97bfb84919f1f 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -404,11 +404,13 @@ class Relationships extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
-                  const relationshipName = rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name;
+                  console.log(rel);
+                  const relationshipRowKey = rel.arrRel ? `array_${rel.arrRel.rel_name}` : `obj_${rel.objRel.rel_name}`;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor
                       dispatch={dispatch}
                       tableName={tableName}
+                      key={rel.objRel.rel_name}
                       relName={rel.objRel.rel_name}
                       relConfig={findAllFromRel(
                         allSchemas,
@@ -424,6 +426,7 @@ class Relationships extends Component {
                   );
                   const column2 = rel.arrRel ? (
                     <RelationshipEditor
+                      key={rel.arrRel.rel_name}
                       dispatch={dispatch}
                       tableName={tableName}
                       relName={rel.arrRel.rel_name}
@@ -440,7 +443,7 @@ class Relationships extends Component {
                     <td />
                   );
                   return (
-                    <tr key={relationshipName}>
+                    <tr>
                       {column1}
                       {column2}
                     </tr>
diff --git a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
index c20cb160bc6be..f641f056fc807 100644
--- a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
+++ b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
@@ -140,6 +140,7 @@ class RelationshipsView extends Component {
                       dispatch={dispatch}
                       tableName={tableName}
                       relName={rel.objRel.rel_name}
+                      key={rel.objRel.rel_name}
                       relConfig={findAllFromRel(
                         allSchemas,
                         tableSchema,
@@ -157,6 +158,7 @@ class RelationshipsView extends Component {
                       dispatch={dispatch}
                       tableName={tableName}
                       relName={rel.arrRel.rel_name}
+                      key={rel.arrRel.rel_name}
                       relConfig={findAllFromRel(
                         allSchemas,
                         tableSchema,
@@ -170,7 +172,7 @@ class RelationshipsView extends Component {
                     <td />
                   );
                   return (
-                    <tr key={relationshipName}>
+                    <tr>
                       {column1}
                       {column2}
                     </tr>

From 52c783909f3b8c44b21aae4601d593427f38d47e Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 19 Mar 2019 12:11:41 +0530
Subject: [PATCH 4/5] remove an unnecessary console log

---
 .../components/Services/Data/TableRelationships/Relationships.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index 97bfb84919f1f..fd8e00d50f747 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -404,7 +404,6 @@ class Relationships extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
-                  console.log(rel);
                   const relationshipRowKey = rel.arrRel ? `array_${rel.arrRel.rel_name}` : `obj_${rel.objRel.rel_name}`;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor

From 7cf95a62c8c504002e397d880db1448aa1967db6 Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 19 Mar 2019 12:12:38 +0530
Subject: [PATCH 5/5] lint

---
 .../components/Services/Data/TableRelationships/Relationships.js | 1 -
 .../Services/Data/TableRelationships/RelationshipsView.js        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index fd8e00d50f747..bf79baca7401e 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -404,7 +404,6 @@ class Relationships extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
-                  const relationshipRowKey = rel.arrRel ? `array_${rel.arrRel.rel_name}` : `obj_${rel.objRel.rel_name}`;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor
                       dispatch={dispatch}
diff --git a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
index f641f056fc807..fba3dd5aa2192 100644
--- a/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
+++ b/console/src/components/Services/Data/TableRelationships/RelationshipsView.js
@@ -134,7 +134,6 @@ class RelationshipsView extends Component {
             <tbody>
               {getObjArrayRelationshipList(tableSchema.relationships).map(
                 (rel, i) => {
-                  const relationshipName = rel.arrRel ? rel.arrRel.rel_name : rel.objRel.rel_name;
                   const column1 = rel.objRel ? (
                     <RelationshipEditor
                       dispatch={dispatch}