Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1869998: Fix broken BMN list page due to name filter #6369

Merged
merged 1 commit into from Aug 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -47,7 +47,7 @@ const flattenResources = (resources: {
const status = bareMetalNodeStatus({ node, nodeMaintenance, csr });
// TODO(jtomasek): name is needed to make 'name' textFilter work.
// Remove it when it is possible to pass custom textFilter as a function
return { name: nodeName, host, machine, node, nodeMaintenance, status, csr };
return { metadata: { name: nodeName }, host, machine, node, nodeMaintenance, status, csr };
});
const csrBundle = getNodeClientCSRs(csrs.data);
return [...csrBundle, ...nodeBundle];
Expand Down
Expand Up @@ -74,7 +74,7 @@ const CSRTableRow: React.FC<BareMetalNodesTableRowProps<CSRBundle>> = ({
}) => {
return (
<TableRow id={obj.csr.metadata.uid} index={index} trKey={rowKey} style={style}>
<TableData className={tableColumnClasses.name}>{obj.name}</TableData>
<TableData className={tableColumnClasses.name}>{obj.metadata.name}</TableData>
<TableData className={tableColumnClasses.status}>
<CSRStatus csr={obj.csr} title={obj.status.status} />
</TableData>
Expand Down
8 changes: 6 additions & 2 deletions frontend/packages/metal3-plugin/src/components/types.ts
Expand Up @@ -29,13 +29,17 @@ export type BareMetalHostBundle = {
};

export type CSRBundle = {
name: string;
metadata: {
name: string;
};
status: StatusProps;
csr: CertificateSigningRequestKind;
};

export type BareMetalNodeBundle = {
name: string;
metadata: {
name: string;
};
node: NodeKind;
machine: MachineKind;
host: BareMetalHostKind;
Expand Down
8 changes: 5 additions & 3 deletions frontend/packages/metal3-plugin/src/selectors/csr.ts
Expand Up @@ -37,18 +37,20 @@ export const getNodeClientCSRs = (csrs: CertificateSigningRequestKind[] = []): C
// '2.5.4.3' is commonName code
const commonName = pkcs10.subject.typesAndValues.find(({ type }) => type === '2.5.4.3');
return {
name: commonName.value.valueBlock.value.replace('system:node:', ''),
metadata: {
name: commonName.value.valueBlock.value.replace('system:node:', ''),
},
csr,
status: { status: 'Discovered' },
};
});

const groupped = _.groupBy<CSRBundle>(nodeCSRs, (csr) => csr.name);
const groupped = _.groupBy<CSRBundle>(nodeCSRs, (csr) => csr.metadata.name);

return Object.keys(groupped).map((key) => {
const { csr, status } = groupped[key][0];
return {
name: key,
metadata: { name: key },
status,
csr,
};
Expand Down