@@ -657,8 +688,27 @@ export const Navbar = () => {
- Personal Settings
+ }>
+ Personal Settings
+
+
+ {(isAllowed) =>
+ isAllowed ? (
+
+ }>
+ Invite Members
+
+
+ ) : null
+ }
+
{
const { subscription } = useSubscription();
const { currentOrg, isSubOrganization } = useOrganization();
+ const navigate = useNavigate();
const orgId = currentOrg?.id ?? "";
const { user } = useUser();
const userId = user?.id || "";
@@ -55,6 +58,22 @@ export const OrgMembersSection = () => {
const [selectedMemberIds, setSelectedMemberIds] = useState([]);
+ const urlAction = useSearch({
+ from: ROUTE_PATHS.Organization.AccessControlPage.id,
+ select: (el) => el.action,
+ structuralSharing: true
+ });
+
+ useEffect(() => {
+ if (urlAction === "invite-members") {
+ handlePopUpOpen("addMember");
+ navigate({
+ to: ".",
+ search: ({ action, ...search }) => search
+ });
+ }
+ }, [urlAction]);
+
const { mutateAsync: deleteMutateAsync } = useDeleteOrgMembership();
const { mutateAsync: deleteBatchMutateAsync } = useDeleteOrgMembershipBatch();
const { mutateAsync: updateOrgMembership } = useUpdateOrgMembership();
@@ -194,13 +213,13 @@ export const OrgMembersSection = () => {
}
+ leftIcon={}
onClick={() =>
isSubOrganization ? handlePopUpOpen("addMemberToSubOrg") : handleAddMemberModal()
}
isDisabled={!isAllowed}
>
- Add Member
+ {isSubOrganization ? "Add Members" : "Invite Members"}
)}