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

feat: resolved merge conflict

Browse Source
This commit is contained in:
=
2025-01-28 02:01:24 +05:30
parent 91f2d0384e
commit 3e0f04273c
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
+2 -2
View File
@@ -259,7 +259,7 @@ export const IdentityAwsAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -273,7 +273,7 @@ export const IdentityAwsAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
+2 -2
View File
@@ -255,7 +255,7 @@ export const IdentityAzureAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -269,7 +269,7 @@ export const IdentityAzureAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
+2 -2
View File
@@ -294,7 +294,7 @@ export const IdentityGcpAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -308,7 +308,7 @@ export const IdentityGcpAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
+2 -2
View File
@@ -563,7 +563,7 @@ export const IdentityJwtAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -577,7 +577,7 @@ export const IdentityJwtAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
+2 -2
View File
@@ -305,7 +305,7 @@ export const IdentityKubernetesAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -320,7 +320,7 @@ export const IdentityKubernetesAuthForm = ({
errorText={error?.message} errorText={error?.message}
tooltipText="The maximum lifetime for an access token in seconds. This value will be referenced at renewal time." tooltipText="The maximum lifetime for an access token in seconds. This value will be referenced at renewal time."
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
+2 -2
View File
@@ -323,7 +323,7 @@ export const IdentityOidcAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -337,7 +337,7 @@ export const IdentityOidcAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
+2 -2
View File
@@ -192,7 +192,7 @@ export const IdentityTokenAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
@@ -206,7 +206,7 @@ export const IdentityTokenAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
+1 -1
View File
@@ -224,7 +224,7 @@ export const IdentityUniversalAuthForm = ({
isError={Boolean(error)} isError={Boolean(error)}
errorText={error?.message} errorText={error?.message}
> >
<Input {...field} placeholder="2592000" type="number" min="1" step="1" /> <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
</FormControl> </FormControl>
)} )}
/> />