fix: resolved recursion issue in select

This commit is contained in:
Akhil Mohan
2023-12-12 22:29:38 +05:30
parent e50c89e326
commit d2f959558e
3 changed files with 9368 additions and 309 deletions
+9353 -299
View File
File diff suppressed because it is too large Load Diff
+7 -4
View File
@@ -12,6 +12,9 @@
"storybook": "storybook dev -p 6006 -s ./public", "storybook": "storybook dev -p 6006 -s ./public",
"build-storybook": "storybook build" "build-storybook": "storybook build"
}, },
"overrides": {
"@radix-ui/react-focus-scope": "1.0.4"
},
"dependencies": { "dependencies": {
"@casl/ability": "^6.5.0", "@casl/ability": "^6.5.0",
"@casl/react": "^3.1.0", "@casl/react": "^3.1.0",
@@ -30,16 +33,16 @@
"@hookform/resolvers": "^2.9.10", "@hookform/resolvers": "^2.9.10",
"@octokit/rest": "^19.0.7", "@octokit/rest": "^19.0.7",
"@radix-ui/react-accordion": "^1.1.2", "@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-alert-dialog": "^1.0.2", "@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-checkbox": "^1.0.1", "@radix-ui/react-checkbox": "^1.0.1",
"@radix-ui/react-dialog": "^1.0.2", "@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.2", "@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-hover-card": "^1.0.3", "@radix-ui/react-hover-card": "^1.0.3",
"@radix-ui/react-label": "^2.0.0", "@radix-ui/react-label": "^2.0.0",
"@radix-ui/react-popover": "^1.0.3", "@radix-ui/react-popover": "^1.0.3",
"@radix-ui/react-popper": "^1.1.1", "@radix-ui/react-popper": "^1.1.1",
"@radix-ui/react-progress": "^1.0.1", "@radix-ui/react-progress": "^1.0.1",
"@radix-ui/react-select": "^1.2.0", "@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-switch": "^1.0.1", "@radix-ui/react-switch": "^1.0.1",
"@radix-ui/react-tabs": "^1.0.2", "@radix-ui/react-tabs": "^1.0.2",
"@radix-ui/react-toast": "^1.1.2", "@radix-ui/react-toast": "^1.1.2",
@@ -88,10 +88,12 @@ export const AddServiceTokenModal = ({ popUp, handlePopUpToggle }: Props) => {
} = useForm<FormData>({ } = useForm<FormData>({
resolver: yupResolver(schema), resolver: yupResolver(schema),
defaultValues: { defaultValues: {
scopes: [{ scopes: [
secretPath: "/", {
environment: currentWorkspace?.environments?.[0]?.slug secretPath: "/",
}] environment: currentWorkspace?.environments?.[0]?.slug
}
]
} }
}); });
@@ -136,7 +138,7 @@ export const AddServiceTokenModal = ({ popUp, handlePopUpToggle }: Props) => {
plaintext: key, plaintext: key,
key: randomBytes key: randomBytes
}); });
const { serviceToken } = await createServiceToken.mutateAsync({ const { serviceToken } = await createServiceToken.mutateAsync({
encryptedKey: ciphertext, encryptedKey: ciphertext,
iv, iv,
@@ -279,7 +281,7 @@ export const AddServiceTokenModal = ({ popUp, handlePopUpToggle }: Props) => {
className="w-full" className="w-full"
> >
{apiTokenExpiry.map(({ label, value }) => ( {apiTokenExpiry.map(({ label, value }) => (
<SelectItem value={String(value || "")} key={label}> <SelectItem value={String(value)} key={label}>
{label} {label}
</SelectItem> </SelectItem>
))} ))}