mirror of
https://github.com/prowler-cloud/prowler.git
synced 2026-01-25 02:08:11 +00:00
Compare commits
2 Commits
v5.8
...
PRWLR-7524
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c282626216 | ||
|
|
e81c7a3893 |
@@ -1,7 +1,7 @@
|
||||
import { Spacer } from "@nextui-org/react";
|
||||
import { Suspense } from "react";
|
||||
|
||||
import { getProvider, getProviders } from "@/actions/providers";
|
||||
import { getProviders } from "@/actions/providers";
|
||||
import { getScans, getScansByState } from "@/actions/scans";
|
||||
import {
|
||||
AutoRefresh,
|
||||
@@ -123,25 +123,32 @@ const SSRDataTableScans = async ({
|
||||
// Extract query from filters
|
||||
const query = (filters["filter[search]"] as string) || "";
|
||||
|
||||
// Fetch scans data
|
||||
const scansData = await getScans({ query, page, sort, filters, pageSize });
|
||||
// Fetch scans data with provider information included
|
||||
const scansData = await getScans({
|
||||
query,
|
||||
page,
|
||||
sort,
|
||||
filters,
|
||||
pageSize,
|
||||
include: "provider",
|
||||
});
|
||||
|
||||
// Handle expanded scans data
|
||||
const expandedScansData = await Promise.all(
|
||||
scansData?.data?.map(async (scan: any) => {
|
||||
// Handle expanded scans data using included provider information
|
||||
const expandedScansData =
|
||||
scansData?.data?.map((scan: any) => {
|
||||
const providerId = scan.relationships?.provider?.data?.id;
|
||||
|
||||
if (!providerId) {
|
||||
return { ...scan, providerInfo: null };
|
||||
}
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append("id", providerId);
|
||||
// Find the provider data in the included array
|
||||
const providerData = scansData.included?.find(
|
||||
(item: any) => item.type === "providers" && item.id === providerId,
|
||||
);
|
||||
|
||||
const providerData = await getProvider(formData);
|
||||
|
||||
if (providerData?.data) {
|
||||
const { provider, uid, alias } = providerData.data.attributes;
|
||||
if (providerData) {
|
||||
const { provider, uid, alias } = providerData.attributes;
|
||||
return {
|
||||
...scan,
|
||||
providerInfo: { provider, uid, alias },
|
||||
@@ -149,8 +156,7 @@ const SSRDataTableScans = async ({
|
||||
}
|
||||
|
||||
return { ...scan, providerInfo: null };
|
||||
}) || [],
|
||||
);
|
||||
}) || [];
|
||||
|
||||
return (
|
||||
<DataTable
|
||||
|
||||
@@ -192,17 +192,8 @@ export const buildUpdateSecretConfig = (
|
||||
formData: FormData,
|
||||
providerType: ProviderType,
|
||||
) => {
|
||||
// Reuse the same secret building logic as add, but only return the secret
|
||||
// Reuse the same secret building logic as add
|
||||
const { secret } = buildSecretConfig(formData, providerType);
|
||||
|
||||
// Handle special case for M365 password field inconsistency
|
||||
if (providerType === "m365") {
|
||||
return {
|
||||
...secret,
|
||||
password: formData.get(ProviderCredentialFields.PASSWORD),
|
||||
};
|
||||
}
|
||||
|
||||
return secret;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user