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

✨ Introducing ActionsColumn Component in Assessment Table #1314

Merged
merged 1 commit into from
Aug 29, 2023
Merged

✨ Introducing ActionsColumn Component in Assessment Table #1314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
249 changes: 105 additions & 144 deletions ...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import {
Tbody,
Td,
TableText,
ActionsColumn,
CustomActionsToggleProps,
} from "@patternfly/react-table";

// @app components and utilities
Expand Down Expand Up @@ -632,153 +634,112 @@ export const ApplicationsTable: React.FC = () => {
}
numRenderedColumns={numRenderedColumns}
>
<Tbody>
{currentPageItems?.map((application, rowIndex) => {
return (
<Tr
style={{ cursor: "pointer" }}
key={application.name}
{...getClickableTrProps({ item: application })}
{currentPageItems?.map((application, rowIndex) => {
return (
<Tr
style={{ cursor: "pointer" }}
key={application.name}
{...getClickableTrProps({ item: application })}
>
<TableRowContentWithControls
{...tableControls}
item={application}
rowIndex={rowIndex}
>
<TableRowContentWithControls
{...tableControls}
item={application}
rowIndex={rowIndex}
<Td
width={20}
{...getTdProps({ columnKey: "name" })}
modifier="truncate"
>
<Td
width={20}
{...getTdProps({ columnKey: "name" })}
modifier="truncate"
>
{application.name}
</Td>
<Td
width={25}
{...getTdProps({ columnKey: "description" })}
modifier="truncate"
>
{application.description}
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "businessService" })}
>
{application.businessService && (
<ApplicationBusinessService
id={application.businessService.id}
/>
)}
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "assessment" })}
>
<ApplicationAssessmentStatus
assessment={getApplicationAssessment(application.id!)}
isLoading={isLoadingApplicationAssessment(
application.id!
)}
fetchError={fetchErrorApplicationAssessment(
application.id!
)}
/>
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "review" })}
>
<IconedStatus
preset={
application.review ? "Completed" : "NotStarted"
}
{application.name}
</Td>
<Td
width={25}
{...getTdProps({ columnKey: "description" })}
modifier="truncate"
>
{application.description}
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "businessService" })}
>
{application.businessService && (
<ApplicationBusinessService
id={application.businessService.id}
/>
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "tags" })}
>
<TagIcon />
{application.tags ? application.tags.length : 0}
</Td>
<Td width={20}>
<RBAC
allowedPermissions={applicationsWriteScopes}
rbacType={RBAC_TYPE.Scope}
>
<Button
type="button"
variant="plain"
onClick={() =>
setSaveApplicationModalState(application)
}
>
<PencilAltIcon />
</Button>
</RBAC>
<Dropdown
isOpen={isKebabOpen === application.id}
onSelect={() => setIsKebabOpen(null)}
onOpenChange={(_isOpen) => setIsKebabOpen(null)}
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
aria-label="kebab dropdown toggle"
variant="plain"
onClick={() =>
isKebabOpen
? setIsKebabOpen(null)
: setIsKebabOpen(application.id)
}
isExpanded={isKebabOpen === rowIndex}
>
<EllipsisVIcon />
</MenuToggle>
)}
shouldFocusToggleOnSelect
>
<DropdownItem
key="assess"
component="button"
onClick={() => assessSelectedApp(application)}
>
{t("actions.assess")}
</DropdownItem>
<DropdownItem
key="review"
component="button"
onClick={() => reviewSelectedApp(application)}
>
{t("actions.review")}
</DropdownItem>
<DropdownItem
key="delete"
component="button"
onClick={() =>
setApplicationsToDelete([application])
}
>
{t("actions.delete")}
</DropdownItem>
<DropdownItem
key="manage-dependencies"
component="button"
onClick={() => {
setApplicationDependenciesToManage(application);
}}
>
{t("actions.manageDependencies")}
</DropdownItem>
</Dropdown>
</Td>
</TableRowContentWithControls>
</Tr>
);
})}
</Tbody>
)}
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "assessment" })}
>
<ApplicationAssessmentStatus
assessment={getApplicationAssessment(application.id!)}
isLoading={isLoadingApplicationAssessment(
application.id!
)}
fetchError={fetchErrorApplicationAssessment(
application.id!
)}
/>
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "review" })}
>
<IconedStatus
preset={application.review ? "Completed" : "NotStarted"}
/>
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "tags" })}
>
<TagIcon />
{application.tags ? application.tags.length : 0}
</Td>
<Td isActionCell>
<Button
variant="plain"
icon={<PencilAltIcon />}
onClick={() =>
setSaveApplicationModalState(application)
}
/>
</Td>
<Td isActionCell>
<ActionsColumn
items={[
{
title: t("actions.assess"),
onClick: () => assessSelectedApp(application),
},
{
title: t("actions.review"),
onClick: () => reviewSelectedApp(application),
},
{
title: t("actions.delete"),
onClick: () =>
setApplicationsToDelete([application]),
},
{
title: t("actions.manageDependencies"),
onClick: () =>
setApplicationDependenciesToManage(application),
},
]}
/>
</Td>
</TableRowContentWithControls>
</Tr>
);
})}
</ConditionalTableBody>
</Table>
<SimplePagination
Expand Down