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

🐛 Fix inconsistent styles between app inventory tables, fix wrong drawer component being used on analysis table, remove stray character #1397

Merged
merged 1 commit into from
Sep 25, 2023
Merged

🐛 Fix inconsistent styles between app inventory tables, fix wrong drawer component being used on analysis table, remove stray character #1397

Show file tree
Hide file tree
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
11 changes: 6 additions & 5 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 @@ -74,7 +74,7 @@ import { useFetchTagCategories } from "@app/queries/tags";

// Relative components
import { ApplicationBusinessService } from "../components/application-business-service";
import { ApplicationDetailDrawerAssessment } from "../components/application-detail-drawer";
import { ApplicationDetailDrawerAnalysis } from "../components/application-detail-drawer";
import { ApplicationForm } from "../components/application-form";
import { ApplicationIdentityForm } from "../components/application-identity-form/application-identity-form";
import { ImportApplicationsForm } from "../components/import-applications-form";
Expand Down Expand Up @@ -550,7 +550,7 @@ export const ApplicationsTableAnalyze: React.FC = () => {

<ToolbarItem {...paginationToolbarItemProps}>
<SimplePagination
idPrefix="s-table"
idPrefix="app-analysis-table"
isTop
paginationProps={paginationProps}
/>
Expand Down Expand Up @@ -585,7 +585,7 @@ export const ApplicationsTableAnalyze: React.FC = () => {
}
numRenderedColumns={numRenderedColumns}
>
<Tbody style={{ cursor: "pointer" }}>
<Tbody>
{currentPageItems.map((application, rowIndex) => (
<Tr
key={application.id}
Expand Down Expand Up @@ -748,12 +748,13 @@ export const ApplicationsTableAnalyze: React.FC = () => {
</ConditionalTableBody>
</Table>
<SimplePagination
idPrefix="app-assessments-table"
idPrefix="app-analysis-table"
isTop={false}
paginationProps={paginationProps}
/>
<ApplicationDetailDrawerAssessment
<ApplicationDetailDrawerAnalysis
application={activeRowItem}
applications={applications}
onCloseClick={clearActiveRow}
task={activeRowItem ? getTask(activeRowItem) : null}
/>
Expand Down
220 changes: 113 additions & 107 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 @@ -26,6 +26,7 @@ import {
Th,
Td,
ActionsColumn,
Tbody,
} from "@patternfly/react-table";

// @app components and utilities
Expand Down Expand Up @@ -575,7 +576,7 @@ export const ApplicationsTable: React.FC = () => {

<ToolbarItem {...paginationToolbarItemProps}>
<SimplePagination
idPrefix="s-table"
idPrefix="app-assessments-table"
isTop
paginationProps={paginationProps}
/>
Expand Down Expand Up @@ -611,115 +612,120 @@ export const ApplicationsTable: React.FC = () => {
}
numRenderedColumns={numRenderedColumns}
>
{currentPageItems?.map((application, rowIndex) => {
return (
<Tr
style={{ cursor: "pointer" }}
key={application.name}
{...getClickableTrProps({ item: application })}
>
<TableRowContentWithControls
{...tableControls}
item={application}
rowIndex={rowIndex}
<Tbody>
{currentPageItems?.map((application, rowIndex) => {
return (
<Tr
key={application.name}
{...getClickableTrProps({ item: application })}
>
<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" })}
<TableRowContentWithControls
{...tableControls}
item={application}
rowIndex={rowIndex}
>
{application.businessService && (
<ApplicationBusinessService
id={application.businessService.id}
<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
assessments={application.assessments}
/>
)}
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "assessment" })}
>
<ApplicationAssessmentStatus
assessments={application.assessments}
/>
</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 id="pencil-action">
<Button
variant="plain"
icon={<PencilAltIcon />}
onClick={() =>
setSaveApplicationModalState(application)
}
/>
</Td>
<Td isActionCell id="row-actions">
<ActionsColumn
items={[
{
title: t("actions.assess"),
onClick: () => assessSelectedApp(application),
},
{
title: t("actions.review"),
onClick: () => reviewSelectedApp(application),
},
...(application?.review
? [
{
title: t("actions.discardAssessment"),
onClick: () =>
setAssessmentOrReviewToDiscard(application),
},
]
: []),
{
title: t("actions.delete"),
onClick: () =>
setApplicationsToDelete([application]),
},
{
title: t("actions.manageDependencies"),
onClick: () =>
setApplicationDependenciesToManage(application),
},
]}
/>
</Td>
</TableRowContentWithControls>
</Tr>
);
})}
</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 id="pencil-action">
<Button
variant="plain"
icon={<PencilAltIcon />}
onClick={() =>
setSaveApplicationModalState(application)
}
/>
</Td>
<Td isActionCell id="row-actions">
<ActionsColumn
items={[
{
title: t("actions.assess"),
onClick: () => assessSelectedApp(application),
},
{
title: t("actions.review"),
onClick: () => reviewSelectedApp(application),
},
...(application?.review
? [
{
title: t("actions.discardAssessment"),
onClick: () =>
setAssessmentOrReviewToDiscard(
application
),
},
]
: []),
{
title: t("actions.delete"),
onClick: () =>
setApplicationsToDelete([application]),
},
{
title: t("actions.manageDependencies"),
onClick: () =>
setApplicationDependenciesToManage(application),
},
]}
/>
</Td>
</TableRowContentWithControls>
</Tr>
);
})}
</Tbody>
</ConditionalTableBody>
</Table>
<SimplePagination
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ApplicationRisk: React.FC<IApplicationRiskProps> = ({
if (!assessments || assessments.length === 0) {
return (
<>
<RiskLabel risk={"unknown"} />;
<RiskLabel risk={"unknown"} />
{isFetchingAssessmentsById && <Spinner />}
</>
);
Expand Down