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

improvement: address requested feedback

Browse Source
This commit is contained in:
Scott Wilson
2024-11-07 12:38:33 -08:00
parent 61f786e8d8
commit 19c26c680c
24 changed files with 263 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/org/[id]/overview/index.tsx
+18 -27
View File
@@ -70,10 +70,7 @@ import {
useRegisterUserAction
} from "@app/hooks/api";
import { INTERNAL_KMS_KEY_ID } from "@app/hooks/api/kms/types";
import {
DefaultProjectTemplateIdentifier,
useListProjectTemplates
} from "@app/hooks/api/projectTemplates";
import { InfisicalProjectTemplate, useListProjectTemplates } from "@app/hooks/api/projectTemplates";
// import { fetchUserWsKey } from "@app/hooks/api/keys/queries";
import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
import { Workspace } from "@app/hooks/api/types";
@@ -488,7 +485,7 @@ const formSchema = yup.object({
.max(64, "Too long, maximum length is 64 characters"),
addMembers: yup.bool().required().label("Add Members"),
kmsKeyId: yup.string().label("KMS Key ID"),
templateId: yup.string().label("Project Template ID")
template: yup.string().label("Project Template Name")
});
type TAddProjectFormData = yup.InferType<typeof formSchema>;
@@ -543,12 +540,7 @@ const OrganizationPage = () => {
enabled: permission.can(OrgPermissionActions.Read, OrgPermissionSubjects.Kms)
});
const onCreateProject = async ({
name,
addMembers,
kmsKeyId,
templateId
}: TAddProjectFormData) => {
const onCreateProject = async ({ name, addMembers, kmsKeyId, template }: TAddProjectFormData) => {
// type check
if (!currentOrg) return;
if (!user) return;
@@ -560,7 +552,7 @@ const OrganizationPage = () => {
} = await createWs.mutateAsync({
projectName: name,
kmsKeyId: kmsKeyId !== INTERNAL_KMS_KEY_ID ? kmsKeyId : undefined,
templateId: templateId === DefaultProjectTemplateIdentifier ? undefined : templateId
template
});
if (addMembers) {
@@ -1076,7 +1068,7 @@ const OrganizationPage = () => {
/>
<Controller
control={control}
name="templateId"
name="template"
render={({ field: { value, onChange } }) => (
<OrgPermissionCan
I={OrgPermissionActions.Read}
@@ -1099,25 +1091,24 @@ const OrganizationPage = () => {
}
>
<Select
defaultValue={DefaultProjectTemplateIdentifier}
placeholder={DefaultProjectTemplateIdentifier}
defaultValue={InfisicalProjectTemplate.Default}
placeholder={InfisicalProjectTemplate.Default}
isDisabled={!isAllowed || !subscription?.projectTemplates}
value={value}
onValueChange={onChange}
className="w-44"
>
<SelectItem value={DefaultProjectTemplateIdentifier}>
{DefaultProjectTemplateIdentifier}
</SelectItem>
{projectTemplates
.filter(
(template) => template.name !== DefaultProjectTemplateIdentifier
)
.map((template) => (
<SelectItem key={template.id} value={template.id}>
{template.name}
</SelectItem>
))}
{projectTemplates.length
? projectTemplates.map((template) => (
<SelectItem key={template.id} value={template.name}>
{template.name}
</SelectItem>
))
: Object.values(InfisicalProjectTemplate).map((template) => (
<SelectItem key={template} value={template}>
{template}
</SelectItem>
))}
</Select>
</FormControl>
)}