From f4e4a4b46e0cfeeb47781094763035cd3f6c7d6d Mon Sep 17 00:00:00 2001
From: Kichiyaki <dawidwysokinski000@gmail.com>
Date: Wed, 30 Dec 2020 09:45:02 +0100
Subject: [PATCH] fix 'newOwner' for old servers

---
 .../LatestSavedEnnoblements/types.ts           |  2 +-
 .../components/Table/Table.tsx                 | 17 ++++++++++-------
 .../EnnoblementsPage/components/Table/types.ts |  2 +-
 .../ServerPage/features/MapPage/useMarkers.ts  |  1 -
 .../components/Ennoblements/Ennoblements.tsx   | 18 +++++++++++-------
 .../components/Ennoblements/types.ts           |  2 +-
 .../components/Ennoblements/Ennoblements.tsx   | 18 +++++++++++-------
 .../components/Ennoblements/types.ts           |  2 +-
 .../components/Ennoblements/types.ts           |  2 +-
 9 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/features/ServerPage/features/EnnoblementsPage/components/LatestSavedEnnoblements/types.ts b/src/features/ServerPage/features/EnnoblementsPage/components/LatestSavedEnnoblements/types.ts
index 2b2440d..658dc9b 100644
--- a/src/features/ServerPage/features/EnnoblementsPage/components/LatestSavedEnnoblements/types.ts
+++ b/src/features/ServerPage/features/EnnoblementsPage/components/LatestSavedEnnoblements/types.ts
@@ -7,7 +7,7 @@ export type Ennoblement = {
     x: number;
     y: number;
   };
-  newOwner: {
+  newOwner?: {
     id: number;
     name: string;
   };
diff --git a/src/features/ServerPage/features/EnnoblementsPage/components/Table/Table.tsx b/src/features/ServerPage/features/EnnoblementsPage/components/Table/Table.tsx
index 631101c..6c61a81 100644
--- a/src/features/ServerPage/features/EnnoblementsPage/components/Table/Table.tsx
+++ b/src/features/ServerPage/features/EnnoblementsPage/components/Table/Table.tsx
@@ -76,13 +76,16 @@ function EnnoblementsTable({
           label: t('table.columns.newOwner'),
           sortable: false,
           valueFormatter: (e: Ennoblement) => {
-            return (
-              <PlayerProfileLink
-                server={server}
-                player={e.newOwner}
-                tribe={e.newOwnerTribe}
-              />
-            );
+            if (e.newOwner) {
+              return (
+                <PlayerProfileLink
+                  server={server}
+                  player={e.newOwner}
+                  tribe={e.newOwnerTribe}
+                />
+              );
+            }
+            return '-';
           },
         },
       ]}
diff --git a/src/features/ServerPage/features/EnnoblementsPage/components/Table/types.ts b/src/features/ServerPage/features/EnnoblementsPage/components/Table/types.ts
index 5145f2f..486a529 100644
--- a/src/features/ServerPage/features/EnnoblementsPage/components/Table/types.ts
+++ b/src/features/ServerPage/features/EnnoblementsPage/components/Table/types.ts
@@ -16,7 +16,7 @@ export interface Ennoblement {
     x: number;
     y: number;
   };
-  newOwner: Player;
+  newOwner?: Player;
   newOwnerTribe?: Tribe;
   oldOwner?: Player;
   oldOwnerTribe?: Tribe;
diff --git a/src/features/ServerPage/features/MapPage/useMarkers.ts b/src/features/ServerPage/features/MapPage/useMarkers.ts
index bddec8e..805b2fd 100644
--- a/src/features/ServerPage/features/MapPage/useMarkers.ts
+++ b/src/features/ServerPage/features/MapPage/useMarkers.ts
@@ -86,7 +86,6 @@ const useMarkers = <T extends HasID, VariablesT>(
     colorByID: { [key: number]: string },
     indexByID: { [key: number]: number }
   ) => {
-    console.log(indexByID);
     return client
       .query<Record<string, List<T[]>>, VariablesT>({
         query: opts.query,
diff --git a/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx b/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
index f377ce3..a4c783e 100644
--- a/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
+++ b/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
@@ -63,6 +63,7 @@ function Ennoblements({ t, server, playerID }: Props) {
             sortable: false,
             valueFormatter: (e: Ennoblement) => {
               if (
+                e.newOwner &&
                 e.newOwner.id === playerID &&
                 e.oldOwner &&
                 e.oldOwner.id === playerID
@@ -117,13 +118,16 @@ function Ennoblements({ t, server, playerID }: Props) {
             label: t('ennoblements.columns.newOwner'),
             sortable: false,
             valueFormatter: (e: Ennoblement) => {
-              return (
-                <PlayerProfileLink
-                  server={server}
-                  player={e.newOwner}
-                  tribe={e.newOwnerTribe}
-                />
-              );
+              if (e.newOwner) {
+                return (
+                  <PlayerProfileLink
+                    server={server}
+                    player={e.newOwner}
+                    tribe={e.newOwnerTribe}
+                  />
+                );
+              }
+              return '-';
             },
           },
         ]}
diff --git a/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/types.ts b/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/types.ts
index 2b2440d..658dc9b 100644
--- a/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/types.ts
+++ b/src/features/ServerPage/features/PlayerPage/features/EnnoblementsPage/components/Ennoblements/types.ts
@@ -7,7 +7,7 @@ export type Ennoblement = {
     x: number;
     y: number;
   };
-  newOwner: {
+  newOwner?: {
     id: number;
     name: string;
   };
diff --git a/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx b/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
index 56cb9e8..3b06dca 100644
--- a/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
+++ b/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/Ennoblements.tsx
@@ -63,6 +63,7 @@ function Ennoblements({ t, server, tribeID }: Props) {
             sortable: false,
             valueFormatter: (e: Ennoblement) => {
               if (
+                e.newOwner &&
                 e.newOwner.id === tribeID &&
                 e.oldOwner &&
                 e.oldOwner.id === tribeID
@@ -117,13 +118,16 @@ function Ennoblements({ t, server, tribeID }: Props) {
             label: t('ennoblements.columns.newOwner'),
             sortable: false,
             valueFormatter: (e: Ennoblement) => {
-              return (
-                <PlayerProfileLink
-                  server={server}
-                  player={e.newOwner}
-                  tribe={e.newOwnerTribe}
-                />
-              );
+              if (e.newOwner) {
+                return (
+                  <PlayerProfileLink
+                    server={server}
+                    player={e.newOwner}
+                    tribe={e.newOwnerTribe}
+                  />
+                );
+              }
+              return '-';
             },
           },
         ]}
diff --git a/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/types.ts b/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/types.ts
index 2b2440d..658dc9b 100644
--- a/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/types.ts
+++ b/src/features/ServerPage/features/TribePage/features/EnnoblementsPage/components/Ennoblements/types.ts
@@ -7,7 +7,7 @@ export type Ennoblement = {
     x: number;
     y: number;
   };
-  newOwner: {
+  newOwner?: {
     id: number;
     name: string;
   };
diff --git a/src/features/ServerPage/features/VillagePage/components/Ennoblements/types.ts b/src/features/ServerPage/features/VillagePage/components/Ennoblements/types.ts
index 2b2440d..658dc9b 100644
--- a/src/features/ServerPage/features/VillagePage/components/Ennoblements/types.ts
+++ b/src/features/ServerPage/features/VillagePage/components/Ennoblements/types.ts
@@ -7,7 +7,7 @@ export type Ennoblement = {
     x: number;
     y: number;
   };
-  newOwner: {
+  newOwner?: {
     id: number;
     name: string;
   };