Merge pull request #3177 from Infisical/improve-secret-scanning-setup

Improvement: Clear Secret Scanning Query Params after Setup
This commit is contained in:
Daniel Hougaard
2025-03-05 04:05:38 +04:00
committed by GitHub
@@ -2,7 +2,7 @@ import { useEffect } from "react";
import { Helmet } from "react-helmet"; import { Helmet } from "react-helmet";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { useSearch } from "@tanstack/react-router"; import { useNavigate, useSearch } from "@tanstack/react-router";
import { OrgPermissionCan } from "@app/components/permissions"; import { OrgPermissionCan } from "@app/components/permissions";
import { Button, NoticeBanner, PageHeader, Pagination } from "@app/components/v2"; import { Button, NoticeBanner, PageHeader, Pagination } from "@app/components/v2";
@@ -36,6 +36,8 @@ export const SecretScanningPage = withPermission(
from: ROUTE_PATHS.Organization.SecretScanning.id from: ROUTE_PATHS.Organization.SecretScanning.id
}); });
const navigate = useNavigate();
const { control, watch } = useForm<SecretScanningFilterFormData>({ const { control, watch } = useForm<SecretScanningFilterFormData>({
resolver: zodResolver(secretScanningFilterFormSchema), resolver: zodResolver(secretScanningFilterFormSchema),
defaultValues: {} defaultValues: {}
@@ -70,8 +72,11 @@ export const SecretScanningPage = withPermission(
const { mutateAsync: linkGitAppInstallationWithOrganization } = const { mutateAsync: linkGitAppInstallationWithOrganization } =
useLinkGitAppInstallationWithOrg(); useLinkGitAppInstallationWithOrg();
const { mutateAsync: createNewIntegrationSession } = useCreateNewInstallationSession(); const { mutateAsync: createNewIntegrationSession } = useCreateNewInstallationSession();
const { data: installationStatus, isPending: isSecretScanningInstatllationStatusLoading } = const {
useGetSecretScanningInstallationStatus(organizationId); data: installationStatus,
isPending: isSecretScanningInstatllationStatusLoading,
refetch: refetchSecretScanningInstallationStatus
} = useGetSecretScanningInstallationStatus(organizationId);
const integrationEnabled = const integrationEnabled =
!isSecretScanningInstatllationStatusLoading && installationStatus?.appInstallationCompleted; !isSecretScanningInstatllationStatusLoading && installationStatus?.appInstallationCompleted;
@@ -86,7 +91,10 @@ export const SecretScanningPage = withPermission(
sessionId: String(queryParams.state) sessionId: String(queryParams.state)
}); });
if (isLinked) { if (isLinked) {
window.location.reload(); await navigate({
to: "/organization/secret-scanning"
});
refetchSecretScanningInstallationStatus();
} }
console.log("installation verification complete"); console.log("installation verification complete");