feature: migrated path inputs to new component

This commit is contained in:
Sheen Capadngan
2024-04-26 18:18:23 +08:00
parent 5142e6e5f6
commit 656ec4bf16
14 changed files with 88 additions and 68 deletions

View File

@@ -43,19 +43,26 @@ export const SecretPathInput = ({
}); });
useEffect(() => { useEffect(() => {
setInputValue(propValue ?? ""); const initialValue = propValue ?? "/";
setInputValue(initialValue);
setSecretPath(initialValue);
onChange?.({ target: { value: initialValue } } as any);
}, [propValue]); }, [propValue]);
useEffect(() => { useEffect(() => {
setInputValue("/"); if (environment) {
setSecretPath("/"); setInputValue("/");
setSecretPath("/");
onChange?.({ target: { value: "/" } } as any);
}
}, [environment]); }, [environment]);
useEffect(() => { useEffect(() => {
// update secret path if input is valid // update secret path if input is valid
if ( if (
debouncedInputValue.length > 0 && (debouncedInputValue.length > 0 &&
debouncedInputValue[debouncedInputValue.length - 1] === "/" debouncedInputValue[debouncedInputValue.length - 1] === "/") ||
debouncedInputValue.length === 0
) { ) {
setSecretPath(debouncedInputValue); setSecretPath(debouncedInputValue);
} }

View File

@@ -4,16 +4,10 @@ import axios from "axios";
import queryString from "query-string"; import queryString from "query-string";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { useCreateIntegration, useGetWorkspaceById } from "@app/hooks/api"; import { useCreateIntegration, useGetWorkspaceById } from "@app/hooks/api";
import { import { Button, Card, CardTitle, FormControl, Select, SelectItem } from "../../../components/v2";
Button,
Card,
CardTitle,
FormControl,
Input,
Select,
SelectItem} from "../../../components/v2";
import { import {
useGetIntegrationAuthApps, useGetIntegrationAuthApps,
useGetIntegrationAuthById useGetIntegrationAuthById
@@ -27,7 +21,6 @@ const cloudflareEnvironments = [
export default function CloudflarePagesIntegrationPage() { export default function CloudflarePagesIntegrationPage() {
const router = useRouter(); const router = useRouter();
const { mutateAsync } = useCreateIntegration(); const { mutateAsync } = useCreateIntegration();
const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]); const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]);
const [secretPath, setSecretPath] = useState("/"); const [secretPath, setSecretPath] = useState("/");
@@ -130,9 +123,10 @@ export default function CloudflarePagesIntegrationPage() {
</Select> </Select>
</FormControl> </FormControl>
<FormControl label="Infisical Secret Path" className="mt-2 px-6"> <FormControl label="Infisical Secret Path" className="mt-2 px-6">
<Input <SecretPathInput
value={secretPath} value={secretPath}
onChange={(evt) => setSecretPath(evt.target.value)} onChange={(evt) => setSecretPath(evt.target.value)}
environment={selectedSourceEnvironment}
placeholder="Provide a path, default is /" placeholder="Provide a path, default is /"
/> />
</FormControl> </FormControl>

View File

@@ -4,17 +4,10 @@ import axios from "axios";
import queryString from "query-string"; import queryString from "query-string";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { useCreateIntegration, useGetWorkspaceById } from "@app/hooks/api"; import { useCreateIntegration, useGetWorkspaceById } from "@app/hooks/api";
import { import { Button, Card, CardTitle, FormControl, Select, SelectItem } from "../../../components/v2";
Button,
Card,
CardTitle,
FormControl,
Input,
Select,
SelectItem
} from "../../../components/v2";
import { import {
useGetIntegrationAuthApps, useGetIntegrationAuthApps,
useGetIntegrationAuthById useGetIntegrationAuthById
@@ -23,7 +16,6 @@ import {
export default function CloudflareWorkersIntegrationPage() { export default function CloudflareWorkersIntegrationPage() {
const router = useRouter(); const router = useRouter();
const { mutateAsync } = useCreateIntegration(); const { mutateAsync } = useCreateIntegration();
const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]); const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]);
const { data: workspace } = useGetWorkspaceById(localStorage.getItem("projectData.id") ?? ""); const { data: workspace } = useGetWorkspaceById(localStorage.getItem("projectData.id") ?? "");
@@ -122,9 +114,10 @@ export default function CloudflareWorkersIntegrationPage() {
</Select> </Select>
</FormControl> </FormControl>
<FormControl label="Infisical Secret Path" className="mt-2 px-6"> <FormControl label="Infisical Secret Path" className="mt-2 px-6">
<Input <SecretPathInput
value={secretPath} value={secretPath}
onChange={(evt) => setSecretPath(evt.target.value)} onChange={(evt) => setSecretPath(evt.target.value)}
environment={selectedSourceEnvironment}
placeholder="Provide a path, default is /" placeholder="Provide a path, default is /"
/> />
</FormControl> </FormControl>

View File

@@ -11,6 +11,7 @@ import { motion } from "framer-motion";
import queryString from "query-string"; import queryString from "query-string";
import * as yup from "yup"; import * as yup from "yup";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { useCreateIntegration } from "@app/hooks/api"; import { useCreateIntegration } from "@app/hooks/api";
@@ -258,7 +259,11 @@ export default function GCPSecretManagerCreateIntegrationPage() {
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="/" /> <SecretPathInput
{...field}
environment={selectedSourceEnvironment}
placeholder="/"
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -11,6 +11,7 @@ import { motion } from "framer-motion";
import queryString from "query-string"; import queryString from "query-string";
import * as yup from "yup"; import * as yup from "yup";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { useCreateIntegration } from "@app/hooks/api"; import { useCreateIntegration } from "@app/hooks/api";
@@ -268,7 +269,11 @@ export default function GitLabCreateIntegrationPage() {
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="/" /> <SecretPathInput
{...field}
placeholder="/"
environment={selectedSourceEnvironment}
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -9,15 +9,8 @@ import { yupResolver } from "@hookform/resolvers/yup";
import queryString from "query-string"; import queryString from "query-string";
import * as yup from "yup"; import * as yup from "yup";
import { import { Button, Card, CardTitle, FormControl, Select, SelectItem } from "@app/components/v2";
Button, import { SecretPathInput } from "@app/components/v2/SecretPathInput";
Card,
CardTitle,
FormControl,
Input,
Select,
SelectItem
} from "@app/components/v2";
import { useCreateIntegration } from "@app/hooks/api"; import { useCreateIntegration } from "@app/hooks/api";
import { import {
useGetIntegrationAuthApps, useGetIntegrationAuthApps,
@@ -38,6 +31,7 @@ export default function HasuraCloudCreateIntegrationPage() {
const { const {
control, control,
handleSubmit, handleSubmit,
watch,
formState: { isSubmitting } formState: { isSubmitting }
} = useForm<FormData>({ } = useForm<FormData>({
resolver: yupResolver(schema) resolver: yupResolver(schema)
@@ -51,6 +45,8 @@ export default function HasuraCloudCreateIntegrationPage() {
(integrationAuthId as string) ?? "" (integrationAuthId as string) ?? ""
); );
const selectedSourceEnvironment = watch("sourceEnvironment");
const { data: integrationAuthApps, isLoading: isIntegrationAuthAppsLoading } = const { data: integrationAuthApps, isLoading: isIntegrationAuthAppsLoading } =
useGetIntegrationAuthApps({ useGetIntegrationAuthApps({
integrationAuthId: (integrationAuthId as string) ?? "" integrationAuthId: (integrationAuthId as string) ?? ""
@@ -147,7 +143,7 @@ export default function HasuraCloudCreateIntegrationPage() {
name="secretPath" name="secretPath"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl label="Secrets Path" errorText={error?.message} isError={Boolean(error)}> <FormControl label="Secrets Path" errorText={error?.message} isError={Boolean(error)}>
<Input {...field} /> <SecretPathInput {...field} environment={selectedSourceEnvironment} />
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -17,19 +17,12 @@ import queryString from "query-string";
// import { App, Pipeline } from "@app/hooks/api/integrationAuth/types"; // import { App, Pipeline } from "@app/hooks/api/integrationAuth/types";
import * as yup from "yup"; import * as yup from "yup";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
// import { RadioGroup } from "@app/components/v2/RadioGroup"; // import { RadioGroup } from "@app/components/v2/RadioGroup";
import { useCreateIntegration } from "@app/hooks/api"; import { useCreateIntegration } from "@app/hooks/api";
import { IntegrationSyncBehavior } from "@app/hooks/api/integrations/types"; import { IntegrationSyncBehavior } from "@app/hooks/api/integrations/types";
import { import { Button, Card, CardTitle, FormControl, Select, SelectItem } from "../../../components/v2";
Button,
Card,
CardTitle,
FormControl,
Input,
Select,
SelectItem
} from "../../../components/v2";
import { import {
useGetIntegrationAuthApps, useGetIntegrationAuthApps,
useGetIntegrationAuthById useGetIntegrationAuthById
@@ -280,7 +273,11 @@ export default function HerokuCreateIntegrationPage() {
name="secretPath" name="secretPath"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl label="Secrets Path" isError={Boolean(error)} errorText={error?.message}> <FormControl label="Secrets Path" isError={Boolean(error)} errorText={error?.message}>
<Input {...field} placeholder="/" /> <SecretPathInput
{...field}
placeholder="/"
environment={selectedSourceEnvironment}
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -15,6 +15,7 @@ import { yupResolver } from "@hookform/resolvers/yup";
import queryString from "query-string"; import queryString from "query-string";
import * as yup from "yup"; import * as yup from "yup";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { useCreateIntegration } from "@app/hooks/api"; import { useCreateIntegration } from "@app/hooks/api";
import { import {
@@ -22,7 +23,6 @@ import {
Card, Card,
CardTitle, CardTitle,
FormControl, FormControl,
Input,
Select, Select,
SelectItem, SelectItem,
Switch Switch
@@ -185,7 +185,11 @@ export default function RenderCreateIntegrationPage() {
name="secretPath" name="secretPath"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl label="Secrets Path" isError={Boolean(error)} errorText={error?.message}> <FormControl label="Secrets Path" isError={Boolean(error)} errorText={error?.message}>
<Input {...field} placeholder="/" /> <SecretPathInput
{...field}
placeholder="/"
environment={selectedSourceEnvironment}
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -34,6 +34,7 @@ import {
Tag, Tag,
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { import {
ProjectPermissionActions, ProjectPermissionActions,
ProjectPermissionSub, ProjectPermissionSub,
@@ -115,6 +116,7 @@ const SpecificPrivilegeSecretForm = ({
}); });
const temporaryAccessField = privilegeForm.watch("temporaryAccess"); const temporaryAccessField = privilegeForm.watch("temporaryAccess");
const selectedEnvironmentSlug = privilegeForm.watch("environmentSlug");
const isTemporary = temporaryAccessField?.isTemporary; const isTemporary = temporaryAccessField?.isTemporary;
const isExpired = const isExpired =
temporaryAccessField.isTemporary && temporaryAccessField.isTemporary &&
@@ -220,7 +222,12 @@ const SpecificPrivilegeSecretForm = ({
name="secretPath" name="secretPath"
render={({ field }) => ( render={({ field }) => (
<FormControl label="Secret Path"> <FormControl label="Secret Path">
<Input {...field} isDisabled={isMemberEditDisabled} className="w-48" /> <SecretPathInput
{...field}
isDisabled={isMemberEditDisabled}
environment={selectedEnvironmentSlug}
containerClassName="w-48"
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -34,6 +34,7 @@ import {
Tag, Tag,
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { import {
ProjectPermissionActions, ProjectPermissionActions,
ProjectPermissionSub, ProjectPermissionSub,
@@ -107,6 +108,7 @@ const SpecificPrivilegeSecretForm = ({ privilege }: { privilege: TProjectUserPri
}); });
const temporaryAccessField = privilegeForm.watch("temporaryAccess"); const temporaryAccessField = privilegeForm.watch("temporaryAccess");
const selectedEnvironmentSlug = privilegeForm.watch("environmentSlug");
const isTemporary = temporaryAccessField?.isTemporary; const isTemporary = temporaryAccessField?.isTemporary;
const isExpired = const isExpired =
temporaryAccessField.isTemporary && temporaryAccessField.isTemporary &&
@@ -208,7 +210,12 @@ const SpecificPrivilegeSecretForm = ({ privilege }: { privilege: TProjectUserPri
name="secretPath" name="secretPath"
render={({ field }) => ( render={({ field }) => (
<FormControl label="Secret Path"> <FormControl label="Secret Path">
<Input {...field} isDisabled={isMemberEditDisabled} className="w-48" /> <SecretPathInput
{...field}
isDisabled={isMemberEditDisabled}
containerClassName="w-48"
environment={selectedEnvironmentSlug}
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -20,6 +20,7 @@ import {
Select, Select,
SelectItem SelectItem
} from "@app/components/v2"; } from "@app/components/v2";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { useWorkspace } from "@app/context"; import { useWorkspace } from "@app/context";
import { useCreateSecretApprovalPolicy, useUpdateSecretApprovalPolicy } from "@app/hooks/api"; import { useCreateSecretApprovalPolicy, useUpdateSecretApprovalPolicy } from "@app/hooks/api";
import { TSecretApprovalPolicy } from "@app/hooks/api/types"; import { TSecretApprovalPolicy } from "@app/hooks/api/types";
@@ -59,13 +60,14 @@ export const SecretPolicyForm = ({
control, control,
handleSubmit, handleSubmit,
reset, reset,
watch,
formState: { isSubmitting } formState: { isSubmitting }
} = useForm<TFormSchema>({ } = useForm<TFormSchema>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),
values: editValues ? { ...editValues, environment: editValues.environment.slug } : undefined values: editValues ? { ...editValues, environment: editValues.environment.slug } : undefined
}); });
const { currentWorkspace } = useWorkspace(); const { currentWorkspace } = useWorkspace();
const selectedEnvironment = watch("environment");
const environments = currentWorkspace?.environments || []; const environments = currentWorkspace?.environments || [];
useEffect(() => { useEffect(() => {
@@ -174,7 +176,11 @@ export const SecretPolicyForm = ({
name="secretPath" name="secretPath"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}> <FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}>
<Input {...field} value={field.value || ""} /> <SecretPathInput
{...field}
value={field.value || ""}
environment={selectedEnvironment}
/>
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -4,15 +4,8 @@ import { AxiosError } from "axios";
import { z } from "zod"; import { z } from "zod";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
Button, import { SecretPathInput } from "@app/components/v2/SecretPathInput";
FormControl,
Input,
Modal,
ModalContent,
Select,
SelectItem
} from "@app/components/v2";
import { useWorkspace } from "@app/context"; import { useWorkspace } from "@app/context";
import { useCreateSecretImport } from "@app/hooks/api"; import { useCreateSecretImport } from "@app/hooks/api";
@@ -50,12 +43,12 @@ export const CreateSecretImportForm = ({
handleSubmit, handleSubmit,
control, control,
reset, reset,
watch,
formState: { isSubmitting } formState: { isSubmitting }
} = useForm<TFormSchema>({ resolver: zodResolver(typeSchema) }); } = useForm<TFormSchema>({ resolver: zodResolver(typeSchema) });
const { currentWorkspace } = useWorkspace(); const { currentWorkspace } = useWorkspace();
const environments = currentWorkspace?.environments || []; const environments = currentWorkspace?.environments || [];
const selectedEnvironment = watch("environment");
const { mutateAsync: createSecretImport } = useCreateSecretImport(); const { mutateAsync: createSecretImport } = useCreateSecretImport();
@@ -130,7 +123,7 @@ export const CreateSecretImportForm = ({
defaultValue="/" defaultValue="/"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}> <FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}>
<Input {...field} /> <SecretPathInput {...field} environment={selectedEnvironment} />
</FormControl> </FormControl>
)} )}
/> />

View File

@@ -28,6 +28,7 @@ import {
Skeleton, Skeleton,
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context"; import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
import { useDebounce } from "@app/hooks"; import { useDebounce } from "@app/hooks";
import { useGetProjectSecrets } from "@app/hooks/api"; import { useGetProjectSecrets } from "@app/hooks/api";
@@ -193,7 +194,11 @@ export const CopySecretsFromBoard = ({
)} )}
/> />
<FormControl label="Secret Path" className="flex-grow" isRequired> <FormControl label="Secret Path" className="flex-grow" isRequired>
<Input {...register("secretPath")} placeholder="Provide a path, default is /" /> <SecretPathInput
{...register("secretPath")}
placeholder="Provide a path, default is /"
environment={selectedEnvSlug}
/>
</FormControl> </FormControl>
</div> </div>
<div className="border-t border-mineshaft-600 pt-4"> <div className="border-t border-mineshaft-600 pt-4">

View File

@@ -3,6 +3,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod"; import { z } from "zod";
import { Button, FormControl, Input, Select, SelectItem, Spinner } from "@app/components/v2"; import { Button, FormControl, Input, Select, SelectItem, Spinner } from "@app/components/v2";
import { SecretPathInput } from "@app/components/v2/SecretPathInput";
import { useWorkspace } from "@app/context"; import { useWorkspace } from "@app/context";
import { useGetProjectSecrets, useGetUserWsKey } from "@app/hooks/api"; import { useGetProjectSecrets, useGetUserWsKey } from "@app/hooks/api";
@@ -78,7 +79,7 @@ export const RotationOutputForm = ({ onSubmit, onCancel, outputSchema = {} }: Pr
defaultValue="/" defaultValue="/"
render={({ field }) => ( render={({ field }) => (
<FormControl className="capitalize" label="Secret path"> <FormControl className="capitalize" label="Secret path">
<Input {...field} /> <SecretPathInput {...field} environment={environment} />
</FormControl> </FormControl>
)} )}
/> />