Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

improvement(ui): migrate secret scanning connection selection to v3 (#8430)

Andrew Huang4ec8d17fb1b5
diff --git a/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceModal.tsx b/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceModal.tsx
index 1b8352ce76..bc9a981c22 100644
--- a/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceModal.tsx
+++ b/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceModal.tsx
@@ -11,6 +11,10 @@ import {
import { SecretScanningDataSourceForm } from "./forms";
import { SecretScanningDataSourceModalHeader } from "./SecretScanningDataSourceModalHeader";
+import {
+ SecretScanningDataSourcePopupContext,
+ useSecretScanningDataSourcePopupRegistry
+} from "./SecretScanningDataSourcePopupContext";
import { SecretScanningDataSourceSelect } from "./SecretScanningDataSourceSelect";
type Props = {
@@ -42,6 +46,7 @@ const Content = ({
};
export const CreateSecretScanningDataSourceModal = ({ onOpenChange, isOpen, ...props }: Props) => {
+ const popupRegistry = useSecretScanningDataSourcePopupRegistry();
const [selectedDataSource, setSelectedDataSource] = useState<SecretScanningDataSource | null>(
null
);
@@ -106,6 +111,7 @@ export const CreateSecretScanningDataSourceModal = ({ onOpenChange, isOpen, ...p
menus (all z-50, portaled later) stack above this modal instead of being buried behind it,
while the backdrop still covers page chrome up to z-50 by portal order. */}
<ModalContent
+ onEscapeKeyDown={popupRegistry.onEscapeKeyDown}
overlayClassName="z-50"
title={
selectedDataSource ? (
@@ -123,17 +129,19 @@ export const CreateSecretScanningDataSourceModal = ({ onOpenChange, isOpen, ...p
}
bodyClassName="overflow-visible"
>
- <Content
- onComplete={() => {
- resetModal();
- onOpenChange(false);
- }}
- onCancel={resetModal}
- selectedDataSource={selectedDataSource}
- setSelectedDataSource={setSelectedDataSource}
- initialFormData={initialFormData}
- {...props}
- />
+ <SecretScanningDataSourcePopupContext.Provider value={popupRegistry.onPopupOpenChange}>
+ <Content
+ onComplete={() => {
+ resetModal();
+ onOpenChange(false);
+ }}
+ onCancel={resetModal}
+ selectedDataSource={selectedDataSource}
+ setSelectedDataSource={setSelectedDataSource}
+ initialFormData={initialFormData}
+ {...props}
+ />
+ </SecretScanningDataSourcePopupContext.Provider>
</ModalContent>
</Modal>
);
diff --git a/frontend/src/components/secret-scanning/EditSecretScanningDataSourceModal.tsx b/frontend/src/components/secret-scanning/EditSecretScanningDataSourceModal.tsx
index 318a96bed4..e5f32b738f 100644
--- a/frontend/src/components/secret-scanning/EditSecretScanningDataSourceModal.tsx
+++ b/frontend/src/components/secret-scanning/EditSecretScanningDataSourceModal.tsx
@@ -3,6 +3,10 @@ import { TSecretScanningDataSource } from "@app/hooks/api/secretScanningV2";
import { SecretScanningDataSourceForm } from "./forms";
import { SecretScanningDataSourceModalHeader } from "./SecretScanningDataSourceModalHeader";
+import {
+ SecretScanningDataSourcePopupContext,
+ useSecretScanningDataSourcePopupRegistry
+} from "./SecretScanningDataSourcePopupContext";
type Props = {
isOpen: boolean;
@@ -15,21 +19,25 @@ export const EditSecretScanningDataSourceModal = ({
onOpenChange,
...props
}: Props) => {
+ const popupRegistry = useSecretScanningDataSourcePopupRegistry();
if (!dataSource) return null;
return (
<Modal {...props} onOpenChange={onOpenChange}>
<ModalContent
+ onEscapeKeyDown={popupRegistry.onEscapeKeyDown}
title={<SecretScanningDataSourceModalHeader isConfigured type={dataSource.type} />}
className="max-w-2xl"
bodyClassName="overflow-visible"
>
- <SecretScanningDataSourceForm
- onComplete={() => onOpenChange(false)}
- onCancel={() => onOpenChange(false)}
- dataSource={dataSource}
- type={dataSource.type}
- />
+ <SecretScanningDataSourcePopupContext.Provider value={popupRegistry.onPopupOpenChange}>
+ <SecretScanningDataSourceForm
+ onComplete={() => onOpenChange(false)}
+ onCancel={() => onOpenChange(false)}
+ dataSource={dataSource}
+ type={dataSource.type}
+ />
+ </SecretScanningDataSourcePopupContext.Provider>
</ModalContent>
</Modal>
);
diff --git a/frontend/src/components/secret-scanning/SecretScanningDataSourcePopupContext.ts b/frontend/src/components/secret-scanning/SecretScanningDataSourcePopupContext.ts
new file mode 100644
index 0000000000..994683e061
--- /dev/null
+++ b/frontend/src/components/secret-scanning/SecretScanningDataSourcePopupContext.ts
@@ -0,0 +1,23 @@
+import { createContext, useCallback, useRef } from "react";
+
+export const SecretScanningDataSourcePopupContext = createContext<
+ ((id: string, open: boolean) => void) | null
+>(null);
+
+export const useSecretScanningDataSourcePopupRegistry = () => {
+ const openPopups = useRef(new Set<string>());
+
+ const onPopupOpenChange = useCallback((id: string, open: boolean) => {
+ if (open) {
+ openPopups.current.add(id);
+ } else {
+ openPopups.current.delete(id);
+ }
+ }, []);
+
+ const onEscapeKeyDown = useCallback((event: KeyboardEvent) => {
+ if (openPopups.current.size) event.preventDefault();
+ }, []);
+
+ return { onPopupOpenChange, onEscapeKeyDown };
+};
diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx
index 9304274366..efdf527b73 100644
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx
@@ -1,10 +1,19 @@
+import { useCallback, useContext, useId } from "react";
import { Controller, useFormContext } from "react-hook-form";
-import { SingleValue } from "react-select";
-import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { InfoIcon } from "lucide-react";
-import { AppConnectionOption } from "@app/components/app-connections";
-import { FilterableSelect, FormControl } from "@app/components/v2";
+import { AppConnectionOptionContent } from "@app/components/app-connections";
+import {
+ Combobox,
+ Field,
+ FieldDescription,
+ FieldError,
+ FieldLabel,
+ IconButton,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger
+} from "@app/components/v3";
import { ProjectPermissionSub, useProject, useProjectPermission } from "@app/context";
import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
@@ -13,6 +22,7 @@ import { usePopUp } from "@app/hooks";
import { useListAvailableAppConnections } from "@app/hooks/api/appConnections";
import { AddAppConnectionModal } from "@app/pages/organization/AppConnections/AppConnectionsPage/components";
+import { SecretScanningDataSourcePopupContext } from "../SecretScanningDataSourcePopupContext";
import { TSecretScanningDataSourceForm } from "./schemas";
type Props = {
@@ -24,6 +34,12 @@ export const SecretScanningDataSourceConnectionField = ({
onChange: callback,
isUpdate
}: Props) => {
+ const reportPopupOpen = useContext(SecretScanningDataSourcePopupContext);
+ const popupId = useId();
+ const onPopupOpenChange = useCallback(
+ (open: boolean) => reportPopupOpen?.(popupId, open),
+ [popupId, reportPopupOpen]
+ );
const { permission } = useProjectPermission();
const { control, watch, setValue } = useFormContext<TSecretScanningDataSourceForm>();
@@ -49,35 +65,38 @@ export const SecretScanningDataSourceConnectionField = ({
return (
<>
<Controller
- render={({ field: { value, onChange }, fieldState: { error } }) => (
- <FormControl
- tooltipText="App Connections can be created from the Organization Settings page."
- isError={Boolean(error)}
- errorText={error?.message}
- label={`${connectionName} Connection`}
- helperText={
- isUpdate ? (
- "Cannot be updated"
- ) : (
- <p>
- Check out{" "}
- <a
- href={`https://infisical.com/docs/integrations/app-connections/${app}`}
- target="_blank"
- className="underline"
- rel="noopener noreferrer"
+ render={({ field: { value, onChange, onBlur, name }, fieldState: { error } }) => (
+ <Field className="mb-4" data-invalid={Boolean(error)} data-disabled={isUpdate}>
+ <div className="flex items-center gap-1">
+ <FieldLabel htmlFor="secret-scanning-data-source-connection">
+ {connectionName} Connection
+ </FieldLabel>
+ <Tooltip hoverable delayDuration={50}>
+ <TooltipTrigger asChild>
+ <IconButton
+ type="button"
+ variant="ghost-muted"
+ size="2xs"
+ aria-label="About app connections"
>
- our docs
- </a>{" "}
- to ensure your connection has the required permissions for secret scanning.
- </p>
- )
- }
- >
- <FilterableSelect
+ <InfoIcon />
+ </IconButton>
+ </TooltipTrigger>
+ <TooltipContent sideOffset={5}>
+ App Connections can be created from the Organization Settings page.
+ </TooltipContent>
+ </Tooltip>
+ </div>
+ <Combobox<{ id: string; name: string; projectId?: string | null }>
+ id="secret-scanning-data-source-connection"
+ name={name}
+ onBlur={onBlur}
value={value}
- onChange={(newValue) => {
- if ((newValue as SingleValue<{ id: string; name: string }>)?.id === "_create") {
+ modal
+ onPopupOpenChange={onPopupOpenChange}
+ isClearable={false}
+ onValueChange={(newValue) => {
+ if (newValue.id === "_create") {
handlePopUpOpen("addConnection");
onChange(null);
// store for oauth callback connections
@@ -95,19 +114,48 @@ export const SecretScanningDataSourceConnectionField = ({
...(availableConnections ?? [])
]}
isDisabled={isUpdate}
+ isError={Boolean(error)}
+ aria-describedby={`secret-scanning-data-source-connection-help${error ? " secret-scanning-data-source-connection-error" : ""}`}
placeholder="Select connection..."
+ searchAriaLabel={`Search ${connectionName} connections`}
+ loadingMessage={`Loading ${connectionName} connections...`}
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.id}
- components={{ Option: AppConnectionOption }}
+ renderOption={(option) => (
+ <AppConnectionOptionContent
+ data={option}
+ isOnlyOption={option.id === "_create" && !availableConnections?.length}
+ />
+ )}
/>
- </FormControl>
+ <FieldDescription id="secret-scanning-data-source-connection-help">
+ {isUpdate ? (
+ "Cannot be updated"
+ ) : (
+ <>
+ Check out{" "}
+ <a
+ href={`https://infisical.com/docs/integrations/app-connections/${app}`}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ our docs
+ </a>{" "}
+ to ensure your connection has the required permissions for secret scanning.
+ </>
+ )}
+ </FieldDescription>
+ <FieldError id="secret-scanning-data-source-connection-error">
+ {error?.message}
+ </FieldError>
+ </Field>
)}
control={control}
name="connection"
/>
{!isUpdate && !isPending && !availableConnections?.length && !canCreateConnection && (
<p className="-mt-2.5 mb-2.5 text-xs text-warning">
- <FontAwesomeIcon className="mr-1" size="xs" icon={faInfoCircle} />
+ <InfoIcon className="mr-1 inline size-3" />
You do not have access to any {connectionName} Connections. Contact an admin to create
one.
</p>