fix 'newOwner' for old servers
This commit is contained in:
parent
f88077f63a
commit
f4e4a4b46e
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
|||
x: number;
|
||||
y: number;
|
||||
};
|
||||
newOwner: {
|
||||
newOwner?: {
|
||||
id: number;
|
||||
name: string;
|
||||
};
|
||||
|
|
|
@ -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 '-';
|
||||
},
|
||||
},
|
||||
]}
|
||||
|
|
|
@ -16,7 +16,7 @@ export interface Ennoblement {
|
|||
x: number;
|
||||
y: number;
|
||||
};
|
||||
newOwner: Player;
|
||||
newOwner?: Player;
|
||||
newOwnerTribe?: Tribe;
|
||||
oldOwner?: Player;
|
||||
oldOwnerTribe?: Tribe;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 '-';
|
||||
},
|
||||
},
|
||||
]}
|
||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
|||
x: number;
|
||||
y: number;
|
||||
};
|
||||
newOwner: {
|
||||
newOwner?: {
|
||||
id: number;
|
||||
name: string;
|
||||
};
|
||||
|
|
|
@ -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 '-';
|
||||
},
|
||||
},
|
||||
]}
|
||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
|||
x: number;
|
||||
y: number;
|
||||
};
|
||||
newOwner: {
|
||||
newOwner?: {
|
||||
id: number;
|
||||
name: string;
|
||||
};
|
||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
|||
x: number;
|
||||
y: number;
|
||||
};
|
||||
newOwner: {
|
||||
newOwner?: {
|
||||
id: number;
|
||||
name: string;
|
||||
};
|
||||
|
|
Reference in New Issue
Block a user