fix 'newOwner' for old servers
This commit is contained in:
parent
f88077f63a
commit
f4e4a4b46e
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
newOwner: {
|
newOwner?: {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,6 +76,7 @@ function EnnoblementsTable({
|
||||||
label: t('table.columns.newOwner'),
|
label: t('table.columns.newOwner'),
|
||||||
sortable: false,
|
sortable: false,
|
||||||
valueFormatter: (e: Ennoblement) => {
|
valueFormatter: (e: Ennoblement) => {
|
||||||
|
if (e.newOwner) {
|
||||||
return (
|
return (
|
||||||
<PlayerProfileLink
|
<PlayerProfileLink
|
||||||
server={server}
|
server={server}
|
||||||
|
@ -83,6 +84,8 @@ function EnnoblementsTable({
|
||||||
tribe={e.newOwnerTribe}
|
tribe={e.newOwnerTribe}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
return '-';
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
|
|
|
@ -16,7 +16,7 @@ export interface Ennoblement {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
newOwner: Player;
|
newOwner?: Player;
|
||||||
newOwnerTribe?: Tribe;
|
newOwnerTribe?: Tribe;
|
||||||
oldOwner?: Player;
|
oldOwner?: Player;
|
||||||
oldOwnerTribe?: Tribe;
|
oldOwnerTribe?: Tribe;
|
||||||
|
|
|
@ -86,7 +86,6 @@ const useMarkers = <T extends HasID, VariablesT>(
|
||||||
colorByID: { [key: number]: string },
|
colorByID: { [key: number]: string },
|
||||||
indexByID: { [key: number]: number }
|
indexByID: { [key: number]: number }
|
||||||
) => {
|
) => {
|
||||||
console.log(indexByID);
|
|
||||||
return client
|
return client
|
||||||
.query<Record<string, List<T[]>>, VariablesT>({
|
.query<Record<string, List<T[]>>, VariablesT>({
|
||||||
query: opts.query,
|
query: opts.query,
|
||||||
|
|
|
@ -63,6 +63,7 @@ function Ennoblements({ t, server, playerID }: Props) {
|
||||||
sortable: false,
|
sortable: false,
|
||||||
valueFormatter: (e: Ennoblement) => {
|
valueFormatter: (e: Ennoblement) => {
|
||||||
if (
|
if (
|
||||||
|
e.newOwner &&
|
||||||
e.newOwner.id === playerID &&
|
e.newOwner.id === playerID &&
|
||||||
e.oldOwner &&
|
e.oldOwner &&
|
||||||
e.oldOwner.id === playerID
|
e.oldOwner.id === playerID
|
||||||
|
@ -117,6 +118,7 @@ function Ennoblements({ t, server, playerID }: Props) {
|
||||||
label: t('ennoblements.columns.newOwner'),
|
label: t('ennoblements.columns.newOwner'),
|
||||||
sortable: false,
|
sortable: false,
|
||||||
valueFormatter: (e: Ennoblement) => {
|
valueFormatter: (e: Ennoblement) => {
|
||||||
|
if (e.newOwner) {
|
||||||
return (
|
return (
|
||||||
<PlayerProfileLink
|
<PlayerProfileLink
|
||||||
server={server}
|
server={server}
|
||||||
|
@ -124,6 +126,8 @@ function Ennoblements({ t, server, playerID }: Props) {
|
||||||
tribe={e.newOwnerTribe}
|
tribe={e.newOwnerTribe}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
return '-';
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
newOwner: {
|
newOwner?: {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,6 +63,7 @@ function Ennoblements({ t, server, tribeID }: Props) {
|
||||||
sortable: false,
|
sortable: false,
|
||||||
valueFormatter: (e: Ennoblement) => {
|
valueFormatter: (e: Ennoblement) => {
|
||||||
if (
|
if (
|
||||||
|
e.newOwner &&
|
||||||
e.newOwner.id === tribeID &&
|
e.newOwner.id === tribeID &&
|
||||||
e.oldOwner &&
|
e.oldOwner &&
|
||||||
e.oldOwner.id === tribeID
|
e.oldOwner.id === tribeID
|
||||||
|
@ -117,6 +118,7 @@ function Ennoblements({ t, server, tribeID }: Props) {
|
||||||
label: t('ennoblements.columns.newOwner'),
|
label: t('ennoblements.columns.newOwner'),
|
||||||
sortable: false,
|
sortable: false,
|
||||||
valueFormatter: (e: Ennoblement) => {
|
valueFormatter: (e: Ennoblement) => {
|
||||||
|
if (e.newOwner) {
|
||||||
return (
|
return (
|
||||||
<PlayerProfileLink
|
<PlayerProfileLink
|
||||||
server={server}
|
server={server}
|
||||||
|
@ -124,6 +126,8 @@ function Ennoblements({ t, server, tribeID }: Props) {
|
||||||
tribe={e.newOwnerTribe}
|
tribe={e.newOwnerTribe}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
return '-';
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
newOwner: {
|
newOwner?: {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,7 +7,7 @@ export type Ennoblement = {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
newOwner: {
|
newOwner?: {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
Reference in New Issue
Block a user