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

🐛 Analysis details and cancelation are conditional #1360

Merged
merged 2 commits into from
Sep 15, 2023
Merged

🐛 Analysis details and cancelation are conditional #1360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838f149
Analysis details and cancelation are conditional
gildub Sep 14, 2023
328f4c9
Use popperProps to position dropdown
gildub Sep 14, 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
153 changes: 102 additions & 51 deletions client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@ import {
MenuToggle,
MenuToggleElement,
Modal,
DropdownList,
} from "@patternfly/react-core";
import {
PencilAltIcon,
TagIcon,
EllipsisVIcon,
WarningTriangleIcon,
} from "@patternfly/react-icons";
import {
Table,
Thead,
Tr,
Th,
Td,
ActionsColumn,
} from "@patternfly/react-table";
import { Table, Thead, Tr, Th, Td, Tbody } from "@patternfly/react-table";

// @app components and utilities
import { AppPlaceholder } from "@app/components/AppPlaceholder";
Expand Down Expand Up @@ -100,6 +94,9 @@ export const ApplicationsTableAnalyze: React.FC = () => {

const [isToolbarKebabOpen, setIsToolbarKebabOpen] =
React.useState<boolean>(false);
const [isRowDropdownOpen, setIsRowDropdownOpen] = React.useState<
number | null
>(null);

const [saveApplicationModalState, setSaveApplicationModalState] =
React.useState<"create" | Application | null>(null);
Expand Down Expand Up @@ -581,47 +578,10 @@ export const ApplicationsTableAnalyze: React.FC = () => {
}
numRenderedColumns={numRenderedColumns}
>
{currentPageItems?.map((application, rowIndex) => {
const actionItems = [];

if (applicationWriteAccess) {
actionItems.push(
{
title: "Manage credentials",
onClick: () =>
setSaveApplicationsCredentialsModalState([application]),
},
{
title: t("actions.delete"),
onClick: () => setApplicationsToDelete([application]),
}
);
}

if (tasksReadAccess) {
actionItems.push({
title: t("actions.analysisDetails"),
"aria-disabled": !getTask(application),
onClick: () => {
const task = getTask(application);
if (task)
setTaskToView({ name: application.name, task: task.id });
},
});
}

if (tasksWriteAccess) {
actionItems.push({
title: "Cancel analysis",
"aria-disabled": !isTaskCancellable(application),
onClick: () => cancelAnalysis(application),
});
}

return (
<Tbody style={{ cursor: "pointer" }}>
{currentPageItems.map((application, rowIndex) => (
<Tr
style={{ cursor: "pointer" }}
key={application.name}
key={application.id}
{...getClickableTrProps({ item: application })}
>
<TableRowContentWithControls
Expand Down Expand Up @@ -681,12 +641,103 @@ export const ApplicationsTableAnalyze: React.FC = () => {
/>
</Td>
<Td isActionCell>
<ActionsColumn items={actionItems} />
<Dropdown
isOpen={isRowDropdownOpen === application.id}
onSelect={() => setIsRowDropdownOpen(null)}
onOpenChange={(_isOpen) => setIsRowDropdownOpen(null)}
popperProps={{ position: "right" }}
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
aria-label="row actions dropdown toggle"
variant="plain"
onClick={() => {
isRowDropdownOpen
? setIsRowDropdownOpen(null)
: setIsRowDropdownOpen(application.id);
}}
isExpanded={isRowDropdownOpen === rowIndex}
>
<EllipsisVIcon />
</MenuToggle>
)}
shouldFocusToggleOnSelect
>
<DropdownList>
{applicationWriteAccess && (
<>
<DropdownItem
key="manage-creditentials"
component="button"
onClick={() => {
setSaveApplicationsCredentialsModalState([
application,
]);
}}
>
Manage credentials
</DropdownItem>
<DropdownItem
key="delete"
component="button"
onClick={() =>
setApplicationsToDelete([application])
}
>
{t("actions.delete")}
</DropdownItem>
</>
)}

{tasksReadAccess && (
<ConditionalTooltip
key="analysis-details"
isTooltipEnabled={!getTask(application)}
content={
"There is no analysis details available."
}
>
<DropdownItem
key="analysis-details"
isAriaDisabled={!getTask(application)}
onClick={() => {
const task = getTask(application);
if (task)
setTaskToView({
name: application.name,
task: task.id,
});
}}
>
{t("actions.analysisDetails")}
</DropdownItem>
</ConditionalTooltip>
)}

{tasksWriteAccess && (
<ConditionalTooltip
key="cancel-analysis"
isTooltipEnabled={!isTaskCancellable(application)}
content={
"There is no analysis in progress to cancel."
}
>
<DropdownItem
key="cancel-analysis"
isAriaDisabled={!isTaskCancellable(application)}
onClick={() => cancelAnalysis(application)}
>
Cancel analysis
</DropdownItem>
</ConditionalTooltip>
)}
</DropdownList>
</Dropdown>
</Td>
</TableRowContentWithControls>
</Tr>
);
})}
))}
</Tbody>
</ConditionalTableBody>
</Table>
<SimplePagination
Expand Down