Skip to content

Commit

Permalink
Team selector
Browse files Browse the repository at this point in the history
  • Loading branch information
pontusab committed Jan 4, 2024
1 parent b60a4ac commit dfdf038
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/dashboard/src/components/main-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const icons = {
"/settings": () => <Icons.Settings size={22} />,
"/inbound": () => (
<div className="relative">
<div className="w-1.5 h-1.5 bg-[#d98d00] rounded-full absolute -top-1 -right-1" />
{/* <div className="w-1.5 h-1.5 bg-[#d98d00] rounded-full absolute -top-1 -right-1" /> */}
<Icons.Inbox2 size={22} />
</div>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ import {
import { useToast } from "@midday/ui/use-toast";
import { Loader2 } from "lucide-react";
import { useAction } from "next-safe-action/hook";
import { useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form";

export function InviteTeamMembersModal({ onOpenChange }) {
export function InviteTeamMembersModal({ onOpenChange, isOpen }) {
const { toast } = useToast();

const inviteMembers = useAction(inviteTeamMembersAction, {
Expand Down Expand Up @@ -62,6 +63,10 @@ export function InviteTeamMembersModal({ onOpenChange }) {
},
});

useEffect(() => {
form.reset();
}, [isOpen]);

const onSubmit = form.handleSubmit((data) => {
inviteMembers.execute({
// Remove invites without email (last appended invite validation)
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/components/tables/members/table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export function MembersTable({ data, currentUser }) {
/>
<Dialog open={isOpen} onOpenChange={onOpenChange}>
<Button onClick={() => onOpenChange(true)}>Invite member</Button>
<InviteTeamMembersModal onOpenChange={onOpenChange} />
<InviteTeamMembersModal onOpenChange={onOpenChange} isOpen={isOpen} />
</Dialog>
</div>
<Table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export function PendingInvitesTable({ data, currentUser }) {
/>
<Dialog open={isOpen} onOpenChange={onOpenChange}>
<Button onClick={() => onOpenChange(true)}>Invite member</Button>
<InviteTeamMembersModal onOpenChange={onOpenChange} />
<InviteTeamMembersModal onOpenChange={onOpenChange} isOpen={isOpen} />
</Dialog>
</div>
<Table>
Expand Down
7 changes: 1 addition & 6 deletions apps/dashboard/src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,4 @@ html.todesktop {

html.todesktop header {
-webkit-app-region: drag;
}

/* html.todesktop aside {
padding-top: 10px;
} */

}

0 comments on commit dfdf038

Please sign in to comment.