improvement: minor layout adjustments

This commit is contained in:
Scott Wilson
2025-06-30 14:38:23 -07:00
parent d3833c33b3
commit 54ac450b63
@@ -400,7 +400,7 @@ const Form = ({
isError={Boolean(error)} isError={Boolean(error)}
tooltipText="Change policies govern secret changes within a given environment and secret path. Access policies allow underprivileged user to request access to environment/secret path." tooltipText="Change policies govern secret changes within a given environment and secret path. Access policies allow underprivileged user to request access to environment/secret path."
errorText={error?.message} errorText={error?.message}
className="flex-grow" className="flex-1"
> >
<Select <Select
isDisabled={isEditMode} isDisabled={isEditMode}
@@ -419,6 +419,20 @@ const Form = ({
</FormControl> </FormControl>
)} )}
/> />
<Controller
control={control}
name="name"
render={({ field, fieldState: { error } }) => (
<FormControl
label="Policy Name"
isError={Boolean(error)}
errorText={error?.message}
className="flex-1"
>
<Input {...field} value={field.value || ""} />
</FormControl>
)}
/>
{!isAccessPolicyType && ( {!isAccessPolicyType && (
<Controller <Controller
control={control} control={control}
@@ -429,7 +443,7 @@ const Form = ({
label="Min. Approvals Required" label="Min. Approvals Required"
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
className="flex-grow" className="flex-shrink"
> >
<Input <Input
{...field} {...field}
@@ -443,20 +457,6 @@ const Form = ({
)} )}
</div> </div>
<div className="flex items-center gap-x-3"> <div className="flex items-center gap-x-3">
<Controller
control={control}
name="name"
render={({ field, fieldState: { error } }) => (
<FormControl
label="Policy Name"
isError={Boolean(error)}
errorText={error?.message}
className="flex-grow"
>
<Input {...field} value={field.value || ""} />
</FormControl>
)}
/>
<Controller <Controller
control={control} control={control}
name="secretPath" name="secretPath"
@@ -467,13 +467,12 @@ const Form = ({
label="Secret Path" label="Secret Path"
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
className="flex-grow" className="flex-1"
> >
<Input {...field} value={field.value || ""} /> <Input {...field} value={field.value || ""} />
</FormControl> </FormControl>
)} )}
/> />
</div>
<Controller <Controller
control={control} control={control}
name="environment" name="environment"
@@ -483,6 +482,7 @@ const Form = ({
isRequired isRequired
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
className="flex-1"
> >
<FilterableSelect <FilterableSelect
isDisabled={isEditMode} isDisabled={isEditMode}
@@ -496,6 +496,7 @@ const Form = ({
</FormControl> </FormControl>
)} )}
/> />
</div>
<div className="mb-2"> <div className="mb-2">
<p>Approvers</p> <p>Approvers</p>
<p className="font-inter text-xs text-mineshaft-300 opacity-90"> <p className="font-inter text-xs text-mineshaft-300 opacity-90">
@@ -504,11 +505,11 @@ const Form = ({
</div> </div>
{isAccessPolicyType ? ( {isAccessPolicyType ? (
<> <>
<div className="thin-scrollbar max-h-64 space-y-2 overflow-y-auto rounded"> <div className="thin-scrollbar max-h-64 space-y-2 overflow-y-auto rounded border border-mineshaft-600 bg-mineshaft-900 p-2">
{sequenceApproversFieldArray.fields.map((el, index) => ( {sequenceApproversFieldArray.fields.map((el, index) => (
<div <div
className={twMerge( className={twMerge(
"rounded border border-mineshaft-500 bg-mineshaft-700 p-3 pb-0", "rounded border border-mineshaft-500 bg-mineshaft-700 p-3 pb-0 shadow-inner",
dragOverItem === index ? "border-2 border-blue-400" : "", dragOverItem === index ? "border-2 border-blue-400" : "",
draggedItem === index ? "opacity-50" : "" draggedItem === index ? "opacity-50" : ""
)} )}
@@ -567,7 +568,7 @@ const Form = ({
label="User Approvers" label="User Approvers"
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
className="flex-grow" className="flex-1"
> >
<FilterableSelect <FilterableSelect
menuPortalTarget={modalContainer.current} menuPortalTarget={modalContainer.current}
@@ -597,7 +598,7 @@ const Form = ({
label="Group Approvers" label="Group Approvers"
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
className="flex-grow" className="flex-1"
> >
<FilterableSelect <FilterableSelect
menuPortalTarget={modalContainer.current} menuPortalTarget={modalContainer.current}
@@ -800,10 +801,15 @@ const Form = ({
</> </>
)} )}
<div className="mt-8 flex items-center space-x-4"> <div className="mt-8 flex items-center space-x-4">
<Button type="submit" isLoading={isSubmitting} isDisabled={isSubmitting}> <Button
type="submit"
colorSchema="secondary"
isLoading={isSubmitting}
isDisabled={isSubmitting}
>
Save Save
</Button> </Button>
<Button onClick={() => onToggle(false)} variant="outline_bg"> <Button onClick={() => onToggle(false)} colorSchema="secondary" variant="plain">
Close Close
</Button> </Button>
</div> </div>