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

Jump to bottom

Update card headers for landing pages #2277

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Update card headers for landing pages #2277

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
ddf1281
Update card headers for landing pages
milan-deepfence Jul 29, 2024
1491639
remove affected resource column from secret and malware
milan-deepfence Jul 30, 2024
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
19 changes: 11 additions & 8 deletions deepfence_frontend/apps/dashboard/src/features/dashboard/components/CardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,20 @@ export const CardHeader = ({
const Wrapper = ({ children }: { children: ReactNode }) => {
if (link?.length) {
return (
<DFLink
to={link}
unstyled
className="p-3 flex items-center text-text-text-and-icon hover:text-accent-accent border-b dark:border-df-gray-900 border-bg-grid-border"
<div
className="p-3 flex items-center text-text-text-and-icon border-b dark:border-df-gray-900 border-bg-grid-border"
data-testid={`${title}Id`}
>
<span className="flex-1 truncate flex items-center gap-2">{children}</span>
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end">
<CaretDown />
</div>
</DFLink>
<DFLink to={link}>
<div className="text-p4 leading-0 flex gap-x-1 items-center">
More
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end -mr-1 hover:underline">
<CaretDown />
</div>
</div>
</DFLink>
</div>
);
}
return (
Expand Down
13 changes: 1 addition & 12 deletions deepfence_frontend/apps/dashboard/src/features/malwares/pages/MalwareScanResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,17 +1538,6 @@ const MalwareTable = ({
size: 160,
maxSize: 165,
}),
columnHelper.accessor('resources', {
enableSorting: false,
enableResizing: true,
cell: (info) => {
return <TruncatedText text={info.getValue()?.join(', ') ?? ''} />;
},
header: () => <TruncatedText text="Affected resources" />,
minSize: 180,
size: 180,
maxSize: 190,
}),
columnHelper.accessor('summary', {
enableSorting: false,
enableResizing: true,
Expand Down Expand Up @@ -1780,7 +1769,7 @@ const ScanResults = () => {
</div>
{filtersExpanded ? <Filters /> : null}
<div className="dark:shadow-none shadow-md">
<Suspense fallback={<TableSkeleton columns={7} rows={10} />}>
<Suspense fallback={<TableSkeleton columns={8} rows={10} />}>
<MalwareTable
onTableAction={onTableAction}
setShowDeleteDialog={setShowDeleteDialog}
Expand Down
22 changes: 12 additions & 10 deletions deepfence_frontend/apps/dashboard/src/features/malwares/pages/landing/CardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ReactNode } from 'react';

import { DFLink } from '@/components/DFLink';
import { CaretDown } from '@/components/icons/common/CaretDown';
import { TruncatedText } from '@/components/TruncatedText';

export const CardHeader = ({
icon,
Expand All @@ -13,16 +14,17 @@ export const CardHeader = ({
path: string;
}) => {
return (
<DFLink to={path} unstyled>
<div className="flex items-center gap-2 text-text-text-and-icon hover:text-accent-accent border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<span className="text-t2 uppercase truncate flex-1" title={title}>
{title}
</span>
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end">
<CaretDown />
<div className="flex items-center gap-2 text-text-text-and-icon border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<TruncatedText className="text-t2 uppercase truncate flex-1" text={title} />
<DFLink to={path}>
<div className="text-p4 leading-0 flex gap-x-1 items-center">
More
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end -mr-1 hover:underline">
<CaretDown />
</div>
</div>
</div>
</DFLink>
</DFLink>
</div>
);
};
22 changes: 12 additions & 10 deletions deepfence_frontend/apps/dashboard/src/features/secrets/components/landing/CardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ReactNode } from 'react';

import { DFLink } from '@/components/DFLink';
import { CaretDown } from '@/components/icons/common/CaretDown';
import { TruncatedText } from '@/components/TruncatedText';

export const CardHeader = ({
icon,
Expand All @@ -13,16 +14,17 @@ export const CardHeader = ({
path: string;
}) => {
return (
<DFLink to={path} unstyled>
<div className="flex items-center gap-2 text-text-text-and-icon hover:text-accent-accent border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<span className="text-t2 uppercase truncate flex-1" title={title}>
{title}
</span>
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end">
<CaretDown />
<div className="flex items-center gap-2 text-text-text-and-icon border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<TruncatedText className="text-t2 uppercase truncate flex-1" text={title} />
<DFLink to={path}>
<div className="text-p4 leading-0 flex gap-x-1 items-center">
More
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end -mr-1 hover:underline">
<CaretDown />
</div>
</div>
</div>
</DFLink>
</DFLink>
</div>
);
};
29 changes: 9 additions & 20 deletions deepfence_frontend/apps/dashboard/src/features/secrets/pages/SecretScanResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,23 +1489,23 @@ const SecretTable = ({
</DFLink>
),
header: () => 'Name',
minSize: 80,
size: 100,
maxSize: 130,
minSize: 100,
size: 120,
maxSize: 150,
}),
columnHelper.accessor('full_filename', {
cell: (info) => <TruncatedText text={info.getValue()} />,
header: () => <TruncatedText text="File name" />,
minSize: 100,
size: 110,
size: 120,
maxSize: 140,
}),
columnHelper.accessor('matched_content', {
cell: (info) => <TruncatedText text={info.getValue()} />,
header: () => 'Matched content',
minSize: 130,
size: 140,
maxSize: 165,
size: 150,
maxSize: 170,
}),
columnHelper.accessor('level', {
cell: (info) => (
Expand All @@ -1518,20 +1518,9 @@ const SecretTable = ({
</div>
),
header: () => 'Severity',
minSize: 30,
size: 50,
maxSize: 70,
}),
columnHelper.accessor('resources', {
enableSorting: false,
enableResizing: true,
cell: (info) => {
return <TruncatedText text={info.getValue()?.join(', ') ?? ''} />;
},
header: () => <TruncatedText text="Affected resources" />,
minSize: 100,
size: 120,
maxSize: 190,
minSize: 60,
size: 80,
maxSize: 100,
}),
];

Expand Down
22 changes: 12 additions & 10 deletions ...ce_frontend/apps/dashboard/src/features/vulnerabilities/components/landing/CardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ReactNode } from 'react';

import { DFLink } from '@/components/DFLink';
import { CaretDown } from '@/components/icons/common/CaretDown';
import { TruncatedText } from '@/components/TruncatedText';

export const CardHeader = ({
icon,
Expand All @@ -13,16 +14,17 @@ export const CardHeader = ({
path: string;
}) => {
return (
<DFLink to={path} unstyled>
<div className="flex items-center gap-2 text-text-text-and-icon hover:text-accent-accent border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<span className="text-t2 uppercase truncate flex-1" title={title}>
{title}
</span>
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end">
<CaretDown />
<div className="flex items-center gap-2 text-text-text-and-icon border-b dark:border-df-gray-900 border-bg-grid-border px-2 py-3">
<span className="h-4 w-4 shrink-0">{icon}</span>
<TruncatedText className="text-t2 uppercase truncate flex-1" text={title} />
<DFLink to={path}>
<div className="text-p4 leading-0 flex gap-x-1 items-center">
More
<div className="h-4 w-4 shrink-0 -rotate-90 justify-self-end -mr-1 hover:underline">
<CaretDown />
</div>
</div>
</div>
</DFLink>
</DFLink>
</div>
);
};
Loading