diff --git a/apps/api/src/models/teamModel.ts b/apps/api/src/models/teamModel.ts index 1251948c..d1cf52d6 100644 --- a/apps/api/src/models/teamModel.ts +++ b/apps/api/src/models/teamModel.ts @@ -6,7 +6,7 @@ export interface TeamDocument extends Omit, Document {} const TeamSchema = new Schema( { name: { type: String, unique: true, required: true }, - order: { type: Number, required: true }, + order: { type: Number, unique: true, required: false }, }, { timestamps: true, versionKey: false }, ); diff --git a/apps/web/app/admin/members/_components/sidepanel/Form.tsx b/apps/web/app/admin/members/_components/sidepanel/Form.tsx index d84a8bc9..bc6c00f0 100644 --- a/apps/web/app/admin/members/_components/sidepanel/Form.tsx +++ b/apps/web/app/admin/members/_components/sidepanel/Form.tsx @@ -57,60 +57,61 @@ export default function MemberForm({ selectedMember, onClose }: MemberFormProps) }; return ( -
void handleSubmit(membersFormSubmit)(...args)}> -
- ( - { - onChange(getRoleValue(displayText)); - }} - > - {ROLE_LABELS.member} - {ROLE_LABELS.admin} - - )} + void handleSubmit(membersFormSubmit)(...args)} + > +
+
+ ( + { + onChange(getRoleValue(displayText)); + }} + > + {ROLE_LABELS.member} + {ROLE_LABELS.admin} + + )} + /> +
+ -
- - - - - -
- } + +
+ } + /> +
+
- - diff --git a/apps/web/app/admin/members/_components/sidepanel/Header.tsx b/apps/web/app/admin/members/_components/sidepanel/Header.tsx index 7d2a89b6..df378559 100644 --- a/apps/web/app/admin/members/_components/sidepanel/Header.tsx +++ b/apps/web/app/admin/members/_components/sidepanel/Header.tsx @@ -20,24 +20,22 @@ export default function PanelHeader({ selectedMember, onClose }: PanelHeaderProp return ( <> - -
-
-

- {selectedMember ? MEMBER_FORM_MESSAGES.TITLE.UPDATE : MEMBER_FORM_MESSAGES.TITLE.ADD} -

- {selectedMember ? ( - - ) : null} -
+
+

+ {selectedMember ? MEMBER_FORM_MESSAGES.TITLE.UPDATE : MEMBER_FORM_MESSAGES.TITLE.ADD} +

+ {selectedMember ? ( + + ) : null}
); diff --git a/apps/web/app/admin/members/_components/sidepanel/index.tsx b/apps/web/app/admin/members/_components/sidepanel/index.tsx index fcb2b9b9..64297c27 100644 --- a/apps/web/app/admin/members/_components/sidepanel/index.tsx +++ b/apps/web/app/admin/members/_components/sidepanel/index.tsx @@ -20,14 +20,12 @@ export default function SidePanel({ isOpen, onClose, selectedMember }: SidePanel return (
-
- -
+
); } diff --git a/apps/web/app/admin/teams/_hooks/useTeamsMutations.ts b/apps/web/app/admin/teams/_hooks/useTeamsMutations.ts index c5665f3d..d55f010a 100644 --- a/apps/web/app/admin/teams/_hooks/useTeamsMutations.ts +++ b/apps/web/app/admin/teams/_hooks/useTeamsMutations.ts @@ -59,7 +59,9 @@ interface UpdateRequest { newName: string; } -export const useUpdateTeamName = (): UseMutationResult, UpdateRequest> => { +export const useUpdateTeamName = ( + onClose?: () => void, +): UseMutationResult, UpdateRequest> => { const queryClient = useQueryClient(); const prevTeamsRef = useRef(); @@ -76,6 +78,7 @@ export const useUpdateTeamName = (): UseMutationResult { notify("success", res.message); + onClose?.(); }, onError: (error) => { if (prevTeamsRef.current) void queryClient.setQueryData(QUERY_KEYS.TEAMS.ALL, prevTeamsRef.current); diff --git a/apps/web/app/settings/_components/modals/ManageTeamModal.tsx b/apps/web/app/settings/_components/modals/ManageTeamModal.tsx index 0b3d3fda..aed89852 100644 --- a/apps/web/app/settings/_components/modals/ManageTeamModal.tsx +++ b/apps/web/app/settings/_components/modals/ManageTeamModal.tsx @@ -50,12 +50,12 @@ export default function ManageTeamModal({ return ( - - void handleSubmit(onSubmit)(...rest)}> + void handleSubmit(onSubmit)(...rest)}> + - - - {buttonText} + + {buttonText} + ); }