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.

Sign up for GitHub

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

✨ Regroup the dependencies table on name only, version/sha shown in details #1536

Merged
merged 2 commits into from
Nov 15, 2023
Merged

✨ Regroup the dependencies table on name only, version/sha shown in details #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f9652e
Remove Version and SHA columns from main dependencies tables
sjd78 Nov 13, 2023
999e590
Update models.ts fields and Dependency/App table query filter
sjd78 Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions client/src/app/api/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
identity?: Ref;
createTime?: string;
createUser?: string;
id: any;

Check warning on line 212 in client/src/app/api/models.ts

View workflow job for this annotation

GitHub Actions / unit-test (18.x) 

Unexpected any. Specify a different type
enabled: boolean;
}

Expand Down Expand Up @@ -366,7 +366,7 @@

export interface TaskgroupTask {
name: string;
data: any;

Check warning on line 369 in client/src/app/api/models.ts

View workflow job for this annotation

GitHub Actions / unit-test (18.x) 

Unexpected any. Specify a different type
application: Ref;
}

Expand Down Expand Up @@ -503,13 +503,10 @@
}

export interface AnalysisDependency {
createTime: string;
name: string;
provider: string;
version: string;
sha: string;
applications: number;
name: string;
labels: string[];
applications: number;
}

export interface AnalysisAppDependency {
Expand All @@ -519,12 +516,12 @@
businessService: string;
dependency: {
id: number;
provider: string;
name: string;
version: string;
provider: string;
sha: string;
indirect: boolean;
//TODO: Glean from labels somehow
// management?: string;
labels: string[];
};
}

Expand Down
125 changes: 44 additions & 81 deletions client/src/app/pages/dependencies/dependencies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,31 +79,10 @@ export const Dependencies: React.FC = () => {
}) + "...",
getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
},
{
key: "version",
title: t("terms.version"),
type: FilterType.search,
filterGroup: "Dependency",
placeholderText:
t("actions.filterBy", {
what: t("terms.label").toLowerCase(),
}) + "...",
getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
},
{
key: "sha",
title: "SHA",
type: FilterType.search,
filterGroup: "Dependency",
placeholderText:
t("actions.filterBy", {
what: t("terms.name").toLowerCase(),
}) + "...",
getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
},
],
initialItemsPerPage: 10,
});

const {
result: { data: currentPageItems, total: totalItemCount },
isFetching,
Expand Down Expand Up @@ -179,8 +158,6 @@ export const Dependencies: React.FC = () => {
<Th {...getThProps({ columnKey: "foundIn" })} />
<Th {...getThProps({ columnKey: "provider" })} />
<Th {...getThProps({ columnKey: "labels" })} />
<Th {...getThProps({ columnKey: "version" })} />
<Th {...getThProps({ columnKey: "sha" })} />
</TableHeaderContentWithControls>
</Tr>
</Thead>
Expand All @@ -190,63 +167,49 @@ export const Dependencies: React.FC = () => {
isNoData={totalItemCount === 0}
numRenderedColumns={numRenderedColumns}
>
{currentPageItems?.map((dependency, rowIndex) => {
return (
<Tbody key={dependency.name + rowIndex}>
<Tr {...getTrProps({ item: dependency })}>
<TableRowContentWithControls
{...tableControls}
item={dependency}
rowIndex={rowIndex}
>
<Td width={25} {...getTdProps({ columnKey: "name" })}>
{dependency.name}
</Td>
<Td
width={10}
{...getTdProps({ columnKey: "foundIn" })}
>
<Button
className={spacing.pl_0}
variant="link"
onClick={(_) => {
if (activeItem && activeItem === dependency) {
clearActiveItem();
} else {
setActiveItem(dependency);
}
}}
>
{`${dependency.applications} application(s)`}
</Button>
</Td>
<Td
width={10}
{...getTdProps({ columnKey: "provider" })}
>
{dependency.provider}
</Td>
<Td width={10} {...getTdProps({ columnKey: "labels" })}>
<LabelGroup>
{dependency?.labels?.map((label) => {
return <Label>{label}</Label>;
})}
</LabelGroup>
</Td>
<Td
width={10}
{...getTdProps({ columnKey: "version" })}
<Tbody>
{currentPageItems?.map((dependency, rowIndex) => (
<Tr
key={dependency.name + rowIndex}
{...getTrProps({ item: dependency })}
>
<TableRowContentWithControls
{...tableControls}
item={dependency}
rowIndex={rowIndex}
>
<Td width={25} {...getTdProps({ columnKey: "name" })}>
{dependency.name}
</Td>
<Td width={10} {...getTdProps({ columnKey: "foundIn" })}>
<Button
className={spacing.pl_0}
variant="link"
onClick={(_) => {
if (activeItem && activeItem === dependency) {
clearActiveItem();
} else {
setActiveItem(dependency);
}
}}
>
{dependency.version}
</Td>
<Td width={10} {...getTdProps({ columnKey: "sha" })}>
{dependency.sha}
</Td>
</TableRowContentWithControls>
</Tr>
</Tbody>
);
})}
{`${dependency.applications} application(s)`}
</Button>
</Td>
<Td width={10} {...getTdProps({ columnKey: "provider" })}>
{dependency.provider}
</Td>
<Td width={10} {...getTdProps({ columnKey: "labels" })}>
<LabelGroup>
{dependency?.labels?.map((label, index) => (
<Label key={index}>{label}</Label>
))}
</LabelGroup>
</Td>
</TableRowContentWithControls>
</Tr>
))}
</Tbody>
</ConditionalTableBody>
</Table>
<SimplePagination
Expand All @@ -259,7 +222,7 @@ export const Dependencies: React.FC = () => {
<DependencyAppsDetailDrawer
dependency={activeItem || null}
onCloseClick={() => setActiveItem(null)}
></DependencyAppsDetailDrawer>
/>
</>
);
};
2 changes: 0 additions & 2 deletions client/src/app/pages/dependencies/dependency-apps-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
},
implicitFilters: [
{ field: "dep.name", operator: "=", value: dependency.name },
{ field: "dep.version", operator: "=", value: dependency.version },
{ field: "dep.sha", operator: "=", value: dependency.sha },
],
})
);
Expand Down
Loading