Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+79
-4
@@ -1,22 +1,35 @@
|
||||
import { LoaderFunctionArgs, MetaFunction, useLoaderData } from "react-router";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { LoaderFunctionArgs, MetaFunction, useFetcher, useLoaderData } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Outlet } from "react-router";
|
||||
import { Outlet, useParams } from "react-router";
|
||||
import toast from "react-hot-toast";
|
||||
import { buildGroupsDetailVM } from "@hivegrid/view-models";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getUserPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { getAllGroups, getMyGroups, GroupWithDetails } from "~/utils/db/permissions/groups.db.server";
|
||||
import { getTenantUsers } from "~/utils/db/tenants.db.server";
|
||||
import { getUserInfo } from "~/utils/session.server";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import GroupsListView from "~/modules/users/components/GroupsListView";
|
||||
import { GroupMembersDialog, type GroupMembersActions } from "~/components/screens/users/GroupMembersDialog";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { useRootData } from "~/utils/data/useRootData";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import InfoBanner from "~/components/ui/banners/InfoBanner";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
|
||||
// R-P2b — groups bulk add/remove (interim UI per AD-28, David parked groups
|
||||
// for RBAC V2): the list gains a "manage members" row action opening the bulk
|
||||
// dialog, which posts bulk-add/bulk-remove to the existing groups/$id action.
|
||||
|
||||
type TenantUserRow = { userId: string; firstName: string | null; lastName: string | null; email: string };
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
items: GroupWithDetails[];
|
||||
tenantUsers: TenantUserRow[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
@@ -37,28 +50,90 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
items = await getMyGroups(userInfo.userId, tenantId);
|
||||
}
|
||||
|
||||
// Bulk-add candidates: active tenant members (minimal fields only).
|
||||
const tenantUsers = (await getTenantUsers(tenantId)).map((member) => ({
|
||||
userId: member.userId,
|
||||
firstName: member.user.firstName,
|
||||
lastName: member.user.lastName,
|
||||
email: member.user.email,
|
||||
}));
|
||||
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.group.plural")} | ${process.env.APP_NAME}`,
|
||||
items,
|
||||
tenantUsers,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function RolesRoute() {
|
||||
type MutationResponse = { error?: string; success?: string };
|
||||
|
||||
export default function GroupsRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const rootData = useRootData();
|
||||
const appData = useAppData();
|
||||
const params = useParams();
|
||||
const { t } = useTranslation();
|
||||
const fetcher = useFetcher<MutationResponse>();
|
||||
const [openGroupId, setOpenGroupId] = useState<string | null>(null);
|
||||
const hadSubmission = useRef(false);
|
||||
|
||||
const canManage = getUserHasPermission(appData, "app.settings.groups.full");
|
||||
const submitting = fetcher.state !== "idle";
|
||||
|
||||
useEffect(() => {
|
||||
if (fetcher.state !== "idle") {
|
||||
hadSubmission.current = true;
|
||||
return;
|
||||
}
|
||||
if (hadSubmission.current) {
|
||||
hadSubmission.current = false;
|
||||
if (fetcher.data?.error) toast.error(fetcher.data.error);
|
||||
else if (fetcher.data?.success) toast.success(fetcher.data.success);
|
||||
}
|
||||
}, [fetcher.state, fetcher.data]);
|
||||
|
||||
const openGroup = openGroupId ? (data.items.find((group) => group.id === openGroupId) ?? null) : null;
|
||||
const groupVM = openGroup
|
||||
? buildGroupsDetailVM({
|
||||
group: { id: openGroup.id, name: openGroup.name, description: openGroup.description },
|
||||
memberUsers: openGroup.users.map((entry) => ({
|
||||
userId: entry.user.id,
|
||||
firstName: entry.user.firstName,
|
||||
lastName: entry.user.lastName,
|
||||
email: entry.user.email,
|
||||
})),
|
||||
tenantUsers: data.tenantUsers,
|
||||
canManage,
|
||||
})
|
||||
: null;
|
||||
|
||||
function postBulk(intent: "bulk-add" | "bulk-remove", userIds: string[]) {
|
||||
if (!openGroupId) return;
|
||||
const formData = new FormData();
|
||||
if (rootData.csrf) formData.set("csrf", rootData.csrf);
|
||||
formData.set("action", intent);
|
||||
for (const userId of userIds) {
|
||||
formData.append("user-ids", userId);
|
||||
}
|
||||
fetcher.submit(formData, { method: "post", action: UrlUtils.currentTenantUrl(params, `settings/groups/${openGroupId}`) });
|
||||
}
|
||||
|
||||
const bulkActions: GroupMembersActions = {
|
||||
onAdd: (userIds) => postBulk("bulk-add", userIds),
|
||||
onRemove: (userIds) => postBulk("bulk-remove", userIds),
|
||||
};
|
||||
|
||||
return (
|
||||
<EditPageLayout>
|
||||
{rootData.featureFlags?.includes("row-groups") ? (
|
||||
<GroupsListView items={data.items} canManage={getUserHasPermission(appData, "app.settings.groups.full")} />
|
||||
<GroupsListView items={data.items} canManage={canManage} onManageMembers={canManage ? setOpenGroupId : undefined} />
|
||||
) : (
|
||||
<InfoBanner title={t("settings.groups.disabled.title")} text={t("settings.groups.disabled.description")} />
|
||||
)}
|
||||
{groupVM ? <GroupMembersDialog vm={groupVM} actions={bulkActions} submitting={submitting} onClose={() => setOpenGroupId(null)} /> : null}
|
||||
<Outlet />
|
||||
</EditPageLayout>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user