awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 08:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2427 from Infisical/cancel-button-fix

Browse Source 
fixed inactive cancel button
This commit is contained in:
Maidul Islam
2024-09-14 09:52:01 -04:00
committed by GitHub
parent 008e18638f fc4189ba0f
commit a6f4a95821
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/v2/Select/Select.tsx
+2 -2
View File
@@ -50,8 +50,8 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
<SelectPrimitive.Trigger <SelectPrimitive.Trigger
ref={ref} ref={ref}
className={twMerge( className={twMerge(
`inline-flex items-center justify-between rounded-md `inline-flex items-center justify-between rounded-md border border-mineshaft-600
bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none focus:bg-mineshaft-700/80 data-[placeholder]:text-mineshaft-200`, bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none focus:bg-mineshaft-700/80 data-[placeholder]:text-mineshaft-400`,
className, className,
isDisabled && "cursor-not-allowed opacity-50" isDisabled && "cursor-not-allowed opacity-50"
)} )}
frontend/src/views/Project/MembersPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx
+12 -6
View File
@@ -104,10 +104,11 @@ export const GroupModal = ({ popUp, handlePopUpToggle }: Props) => {
defaultValue={field.value} defaultValue={field.value}
{...field} {...field}
onValueChange={(e) => onChange(e)} onValueChange={(e) => onChange(e)}
className="w-full" className="w-full border border-mineshaft-600"
placeholder="Select group..."
> >
{filteredGroupMembershipOrgs.map(({ name, slug, id }) => ( {filteredGroupMembershipOrgs.map(({ name, slug, id }) => (
<SelectItem value={slug} key={`org-group-${id}`}> <SelectItem value={slug} key={`org-group-${id}`} >
{name} {name}
</SelectItem> </SelectItem>
))} ))}
@@ -131,6 +132,7 @@ export const GroupModal = ({ popUp, handlePopUpToggle }: Props) => {
{...field} {...field}
onValueChange={(e) => onChange(e)} onValueChange={(e) => onChange(e)}
className="w-full" className="w-full"
placeholder="Select role..."
> >
{(roles || []).map(({ name, slug }) => ( {(roles || []).map(({ name, slug }) => (
<SelectItem value={slug} key={`st-role-${slug}`}> <SelectItem value={slug} key={`st-role-${slug}`}>
@@ -141,7 +143,7 @@ export const GroupModal = ({ popUp, handlePopUpToggle }: Props) => {
</FormControl> </FormControl>
)} )}
/> />
<div className="flex items-center"> <div className="flex items-center mt-6">
<Button <Button
className="mr-4" className="mr-4"
size="sm" size="sm"
@@ -151,9 +153,13 @@ export const GroupModal = ({ popUp, handlePopUpToggle }: Props) => {
> >
{popUp?.group?.data ? "Update" : "Create"} {popUp?.group?.data ? "Update" : "Create"}
</Button> </Button>
<Button colorSchema="secondary" variant="plain"> <Button
Cancel colorSchema="secondary"
</Button> variant="plain"
onClick={() => handlePopUpToggle("group", false)}
>
Cancel
</Button>
</div> </div>
</form> </form>
) : ( ) : (