fix(striker-ui-api): add info to /api/anvil

main
Tsu-ba-me 1 year ago
parent 4823b7aeb5
commit 37a096563b
  1. 23
      striker-ui-api/src/lib/request_handlers/anvil/getAnvil.ts
  2. 2
      striker-ui-api/src/types/ApiAn.d.ts

@ -12,8 +12,10 @@ export const getAnvil: RequestHandler = buildGetRequestHandler(
SELECT SELECT
anv.anvil_name, anv.anvil_name,
anv.anvil_uuid, anv.anvil_uuid,
anv.anvil_description,
hos.host_name, hos.host_name,
hos.host_uuid hos.host_uuid,
hos.host_type
FROM anvils AS anv FROM anvils AS anv
JOIN hosts AS hos JOIN hosts AS hos
ON hos.host_uuid IN ( ON hos.host_uuid IN (
@ -31,10 +33,21 @@ export const getAnvil: RequestHandler = buildGetRequestHandler(
let rowStage: AnvilOverview | undefined; let rowStage: AnvilOverview | undefined;
results = queryStdout.reduce<AnvilOverview[]>( results = queryStdout.reduce<AnvilOverview[]>(
(reducedRows, [anvilName, anvilUUID, hostName, hostUUID]) => { (
reducedRows,
[
anvilName,
anvilUUID,
anvilDescription,
hostName,
hostUUID,
hostType,
],
) => {
if (!rowStage || anvilUUID !== rowStage.anvilUUID) { if (!rowStage || anvilUUID !== rowStage.anvilUUID) {
{ {
rowStage = { rowStage = {
anvilDescription,
anvilName, anvilName,
anvilUUID, anvilUUID,
hosts: [], hosts: [],
@ -44,7 +57,11 @@ export const getAnvil: RequestHandler = buildGetRequestHandler(
} }
} }
rowStage.hosts.push({ hostName, hostUUID }); rowStage.hosts.push({
hostName,
hostType,
hostUUID,
});
return reducedRows; return reducedRows;
}, },

@ -112,10 +112,12 @@ type AnvilDetailStoreSummary = {
}; };
type AnvilOverview = { type AnvilOverview = {
anvilDescription: string;
anvilName: string; anvilName: string;
anvilUUID: string; anvilUUID: string;
hosts: Array<{ hosts: Array<{
hostName: string; hostName: string;
hostType: string;
hostUUID: string; hostUUID: string;
}>; }>;
}; };

Loading…
Cancel
Save