Merge pull request #2472 from meetcshah19/meet/fix-create-policy-ui

fix: group selection on create policy
Infisical · Sep 23, 2024 · 06d2480 · 06d2480
2 parents 1dc0f4e + fd7d8dd
commit 06d2480
Showing 1 changed file with 63 additions and 62 deletions.
diff --git a/...c/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/...c/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
@@ -255,28 +255,84 @@ export const AccessPolicyForm = ({
               name="secretPath"
               render={({ field, fieldState: { error } }) => (
                 <FormControl
-                  label="Secret Path"
+                label="Secret Path"
+                isError={Boolean(error)}
+                errorText={error?.message}
+                >
+                  <Input {...field} value={field.value || ""} />
+                </FormControl>
+              )}
+              />
+            <Controller
+              control={control}
+              name="approvals"
+              defaultValue={1}
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  label="Minimum Approvals Required"
                   isError={Boolean(error)}
                   errorText={error?.message}
                 >
-                  <Input {...field} value={field.value || ""} />
+                  <Input
+                    {...field}
+                    type="number"
+                    min={1}
+                    onChange={(el) => field.onChange(parseInt(el.target.value, 10))}
+                  />
                 </FormControl>
               )}
             />
+            <Controller
+              control={control}
+              name="enforcementLevel"
+              defaultValue={EnforcementLevel.Hard}
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  label="Enforcement Level"
+                  isError={Boolean(error)}
+                  errorText={error?.message}
+                  tooltipText="Determines the level of enforcement for required approvers of a request"
+                  helperText={
+                    field.value === EnforcementLevel.Hard
+                      ? "All approvers must approve the request."
+                      : "All approvers must approve the request; however, the requester can bypass approval requirements in emergencies."
+                  }
+                >
+                  <Select
+                    value={field.value}
+                    onValueChange={(val) => field.onChange(val as EnforcementLevel)}
+                    className="w-full border border-mineshaft-500"
+                  >
+                    {Object.values(EnforcementLevel).map((level) => {
+                      return (
+                        <SelectItem
+                          value={level}
+                          key={`enforcement-level-${level}`}
+                          className="text-xs"
+                        >
+                          {formatEnforcementLevel(level)}
+                        </SelectItem>
+                      );
+                    })}
+                  </Select>
+                </FormControl>
+              )}
+            />
+            <p>Approvers</p>
             <Controller
               control={control}
               name="approvers"
               render={({ field: { value, onChange }, fieldState: { error } }) => (
                 <FormControl
-                  label="Required User Approvers"
+                  label="User Approvers"
                   isError={Boolean(error)}
                   errorText={error?.message}
                 >
                   <DropdownMenu>
                     <DropdownMenuTrigger asChild>
                       <Input
                         isReadOnly
-                        value={value?.length ? `${value.length} selected` : "None"}
+                        value={value?.filter((e) => e.type=== ApproverType.User).length ? `${value.filter((e) => e.type=== ApproverType.User).length} selected` : "None"}
                         className="text-left"
                       />
                     </DropdownMenuTrigger>
@@ -318,15 +374,15 @@ export const AccessPolicyForm = ({
               name="approvers"
               render={({ field: { value, onChange }, fieldState: { error } }) => (
                 <FormControl
-                  label="Required Group Approvers"
+                  label="Group Approvers"
                   isError={Boolean(error)}
                   errorText={error?.message}
                 >
                   <DropdownMenu>
                     <DropdownMenuTrigger asChild>
                       <Input
                         isReadOnly
-                        value={value?.length ? `${value.length} selected` : "None"}
+                        value={value?.filter((e) => e.type=== ApproverType.Group).length ? `${value?.filter((e) => e.type=== ApproverType.Group).length} selected` : "None"}
                         className="text-left"
                       />
                     </DropdownMenuTrigger>
@@ -339,7 +395,7 @@ export const AccessPolicyForm = ({
                       </DropdownMenuLabel>
                       {groups && groups.map(({ group }) => {
                         const { id } = group;
-                        const isChecked = value?.includes({id, type: ApproverType.Group});
+                        const isChecked = value?.filter((el: {id: string, type: ApproverType}) => el.id === id && el.type === ApproverType.Group).length > 0;
 
                         return (
                           <DropdownMenuItem
@@ -364,61 +420,6 @@ export const AccessPolicyForm = ({
                 </FormControl>
               )}
             />
-            <Controller
-              control={control}
-              name="approvals"
-              defaultValue={1}
-              render={({ field, fieldState: { error } }) => (
-                <FormControl
-                  label="Minimum Approvals Required"
-                  isError={Boolean(error)}
-                  errorText={error?.message}
-                >
-                  <Input
-                    {...field}
-                    type="number"
-                    min={1}
-                    onChange={(el) => field.onChange(parseInt(el.target.value, 10))}
-                  />
-                </FormControl>
-              )}
-            />
-            <Controller
-              control={control}
-              name="enforcementLevel"
-              defaultValue={EnforcementLevel.Hard}
-              render={({ field, fieldState: { error } }) => (
-                <FormControl
-                  label="Enforcement Level"
-                  isError={Boolean(error)}
-                  errorText={error?.message}
-                  tooltipText="Determines the level of enforcement for required approvers of a request"
-                  helperText={
-                    field.value === EnforcementLevel.Hard
-                      ? "All approvers must approve the request."
-                      : "All approvers must approve the request; however, the requester can bypass approval requirements in emergencies."
-                  }
-                >
-                  <Select
-                    value={field.value}
-                    onValueChange={(val) => field.onChange(val as EnforcementLevel)}
-                    className="w-full border border-mineshaft-500"
-                  >
-                    {Object.values(EnforcementLevel).map((level) => {
-                      return (
-                        <SelectItem
-                          value={level}
-                          key={`enforcement-level-${level}`}
-                          className="text-xs"
-                        >
-                          {formatEnforcementLevel(level)}
-                        </SelectItem>
-                      );
-                    })}
-                  </Select>
-                </FormControl>
-              )}
-            />
             <div className="mt-8 flex items-center space-x-4">
               <Button type="submit" isLoading={isSubmitting} isDisabled={isSubmitting}>
                 Save