Refresh HiveGrid Cloud reference snapshot
This commit is contained in:
1 parent
5e99e14772
commit
7f88026f79
5955 files changed
+1177325
-188362
No files matched your search
+127
-124
@@ -12,10 +12,11 @@ import { useEffect, useState } from "react";
|
||||
import { Link } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import * as SubframeCore from "@subframe/core";
|
||||
import { FeatherChevronDown, FeatherMoreHorizontal, FeatherPlus, FeatherTrash, FeatherUserCheck, FeatherUserX } from "@subframe/core";
|
||||
import { FeatherChevronDown, FeatherKey, FeatherMoreHorizontal, FeatherShield, FeatherTrash, FeatherUserCheck, FeatherUserX } from "@subframe/core";
|
||||
import type { MembersListRow, MembersListVM } from "@hivegrid/view-models";
|
||||
import { EMPTY_MEMBERS_FILTER, filterMembersRows, type MembersListFilterState, type MemberStatus } from "@hivegrid/view-models";
|
||||
import { roleDisplayName } from "~/components/core/roles/roleDisplay";
|
||||
import { FacetFilterBar, type ClientFacet } from "../shared/FacetFilterBar";
|
||||
import { Avatar } from "~/ui/components/Avatar";
|
||||
import { BadgeFeedback } from "~/ui/components/BadgeFeedback";
|
||||
import { Button } from "~/ui/components/Button";
|
||||
@@ -24,13 +25,8 @@ import { Dialog } from "~/ui/components/Dialog";
|
||||
import { DropdownMenu } from "~/ui/components/DropdownMenu";
|
||||
import { EmptyState } from "~/ui/components/EmptyState";
|
||||
import { IconButton } from "~/ui/components/IconButton";
|
||||
import { SearchInput } from "~/ui/components/SearchInput";
|
||||
import { Select } from "~/ui/components/Select";
|
||||
import { Table } from "~/ui/components/Table";
|
||||
import { Tabs } from "~/ui/components/Tabs";
|
||||
|
||||
// Non-empty sentinel for the "any" option (empty string is not a valid Select value).
|
||||
const FILTER_ALL = "__all__";
|
||||
const STATUS_OPTIONS: readonly MemberStatus[] = ["active", "invited", "inactive"];
|
||||
|
||||
export type MembersActions = {
|
||||
@@ -83,82 +79,77 @@ export function MembersPage({ vm, actions, rolesTabHref, editRouteFor, submittin
|
||||
const rows = filterMembersRows(data.rows, filter);
|
||||
const hasAnyRows = data.rows.length > 0 || data.pendingInvitations.length > 0;
|
||||
|
||||
// Single-select facets on a multi-select control: picking the active option
|
||||
// again clears it, which is what the chip's X does too.
|
||||
const allFacets: ClientFacet[] = [
|
||||
{
|
||||
key: "role",
|
||||
label: t("settings.members.filters.role"),
|
||||
icon: <FeatherShield />,
|
||||
tone: "violet-subtle",
|
||||
options: data.assignableRoles.map((role) => ({ value: role.id, label: roleDisplayName(role, t) })),
|
||||
selected: new Set(filter.roleId ? [filter.roleId] : []),
|
||||
},
|
||||
{
|
||||
key: "status",
|
||||
label: t("settings.members.columns.status"),
|
||||
icon: <FeatherUserCheck />,
|
||||
tone: "blue-subtle",
|
||||
options: STATUS_OPTIONS.map((status) => ({
|
||||
value: status,
|
||||
label: t(`settings.members.status.${status === "inactive" ? "deactivated" : status}`),
|
||||
})),
|
||||
selected: new Set(filter.status ? [filter.status] : []),
|
||||
},
|
||||
{
|
||||
key: "mfa",
|
||||
label: t("settings.members.columns.twoFactor"),
|
||||
icon: <FeatherKey />,
|
||||
tone: "sky-subtle",
|
||||
options: [
|
||||
{ value: "on", label: t("settings.members.twoFactor.on") },
|
||||
{ value: "off", label: t("settings.members.twoFactor.off") },
|
||||
],
|
||||
selected: new Set(filter.mfa === null ? [] : [filter.mfa ? "on" : "off"]),
|
||||
},
|
||||
];
|
||||
// A facet with nothing to pick is a dead button; a workspace may have no
|
||||
// assignable roles beyond the built-in ones yet.
|
||||
const facets = allFacets.filter((facet) => facet.options.length > 0);
|
||||
|
||||
function toggleFacet(facetKey: string, value: string) {
|
||||
if (facetKey === "role") {
|
||||
return setFilter((prev) => ({ ...prev, roleId: prev.roleId === value ? null : value }));
|
||||
}
|
||||
if (facetKey === "status") {
|
||||
return setFilter((prev) => ({ ...prev, status: prev.status === value ? null : (value as MemberStatus) }));
|
||||
}
|
||||
if (facetKey === "mfa") {
|
||||
const next = value === "on";
|
||||
return setFilter((prev) => ({ ...prev, mfa: prev.mfa === next ? null : next }));
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex w-full flex-col gap-6" data-ui-id="ui.settings.members.page">
|
||||
{/* Header: title + description (0px rhythm) + invite CTA (M01) */}
|
||||
<div className="flex flex-wrap items-start justify-between gap-4">
|
||||
<div className="flex flex-col gap-0">
|
||||
<span className="text-heading-2 font-heading-2 text-text-neutral-primary">{t("settings.members.title")}</span>
|
||||
<span className="text-body-default-regular-150 font-body-default-regular-150 text-text-neutral-secondary">
|
||||
{t("settings.members.description")}
|
||||
</span>
|
||||
</div>
|
||||
{data.canInvite ? (
|
||||
<Button icon={<FeatherPlus />} onClick={actions.onInvite} data-ui-id="ui.settings.members.invite">
|
||||
{t("settings.members.actions.new")}
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
{/* The page header (title + invite CTA) is rendered by the route above the layout. */}
|
||||
|
||||
{/* Tabs: Mitarbeiter | Rollen und Berechtigungen (David's S01 structure) */}
|
||||
{rolesTabHref ? (
|
||||
<Tabs>
|
||||
<Tabs.Item active>{t("settings.members.tabs.members")}</Tabs.Item>
|
||||
<Link to={rolesTabHref} className="contents no-underline" data-ui-id="ui.settings.members.tab.roles">
|
||||
<Tabs.Item>{t("settings.members.tabs.rolesAndPermissions")}</Tabs.Item>
|
||||
</Link>
|
||||
</Tabs>
|
||||
) : null}
|
||||
{/* AK-SET-01: the Team-Hub renders the tab bar this screen used to carry. */}
|
||||
|
||||
{/* Toolbar: search (name/email/phone) + role/status/2FA filters */}
|
||||
<div className="flex flex-wrap items-end gap-4" data-ui-id="ui.settings.members.search">
|
||||
<SearchInput
|
||||
className="max-w-[320px]"
|
||||
placeholder={t("settings.members.filters.searchPlaceholder")}
|
||||
hideShortcut
|
||||
value={filter.query}
|
||||
onChange={(event) => setFilter((prev) => ({ ...prev, query: event.target.value }))}
|
||||
/>
|
||||
<Select
|
||||
className="max-w-[200px]"
|
||||
label={t("settings.members.filters.role")}
|
||||
showLabel
|
||||
value={filter.roleId ?? FILTER_ALL}
|
||||
onValueChange={(value: string) => setFilter((prev) => ({ ...prev, roleId: value === FILTER_ALL ? null : value }))}
|
||||
>
|
||||
<Select.Item value={FILTER_ALL}>{t("settings.members.filters.all")}</Select.Item>
|
||||
{data.assignableRoles.map((role) => (
|
||||
<Select.Item key={role.id} value={role.id}>
|
||||
{roleDisplayName(role, t)}
|
||||
</Select.Item>
|
||||
))}
|
||||
</Select>
|
||||
<Select
|
||||
className="max-w-[180px]"
|
||||
label={t("settings.members.columns.status")}
|
||||
showLabel
|
||||
value={filter.status ?? FILTER_ALL}
|
||||
onValueChange={(value: string) => setFilter((prev) => ({ ...prev, status: value === FILTER_ALL ? null : (value as MemberStatus) }))}
|
||||
>
|
||||
<Select.Item value={FILTER_ALL}>{t("settings.members.filters.all")}</Select.Item>
|
||||
{STATUS_OPTIONS.map((status) => (
|
||||
<Select.Item key={status} value={status}>
|
||||
{t(`settings.members.status.${status === "inactive" ? "deactivated" : status}`)}
|
||||
</Select.Item>
|
||||
))}
|
||||
</Select>
|
||||
<Select
|
||||
className="max-w-[160px]"
|
||||
label={t("settings.members.columns.twoFactor")}
|
||||
showLabel
|
||||
value={filter.mfa === null ? FILTER_ALL : filter.mfa ? "on" : "off"}
|
||||
onValueChange={(value: string) => setFilter((prev) => ({ ...prev, mfa: value === FILTER_ALL ? null : value === "on" }))}
|
||||
>
|
||||
<Select.Item value={FILTER_ALL}>{t("settings.members.filters.all")}</Select.Item>
|
||||
<Select.Item value="on">{t("settings.members.twoFactor.on")}</Select.Item>
|
||||
<Select.Item value="off">{t("settings.members.twoFactor.off")}</Select.Item>
|
||||
</Select>
|
||||
</div>
|
||||
{/* --- Filter bar: the shared facet strip every list wears - free-text
|
||||
box, facet buttons, chips for what is active and one reset. Filtering
|
||||
happens on the loaded member list, so a facet takes effect at once. --- */}
|
||||
<FacetFilterBar
|
||||
uiId="ui.settings.members.filter"
|
||||
facets={facets}
|
||||
onToggle={toggleFacet}
|
||||
search={filter.query}
|
||||
onSearchChange={(value) => setFilter((prev) => ({ ...prev, query: value }))}
|
||||
searchPlaceholder={t("settings.members.filters.searchPlaceholder")}
|
||||
onReset={() => setFilter({ query: "", roleId: null, status: null, mfa: null })}
|
||||
labels={{ reset: t("settings.members.filters.reset"), removeChip: t("settings.members.filters.removeChip") }}
|
||||
/>
|
||||
|
||||
{!hasAnyRows ? (
|
||||
<div data-ui-id="ui.settings.members.empty">
|
||||
@@ -171,6 +162,7 @@ export function MembersPage({ vm, actions, rolesTabHref, editRouteFor, submittin
|
||||
<Table.HeaderRow>
|
||||
<Table.HeaderCell>{t("models.user.object")}</Table.HeaderCell>
|
||||
<Table.HeaderCell>{t("models.role.object")}</Table.HeaderCell>
|
||||
<Table.HeaderCell>{t("settings.members.columns.seat")}</Table.HeaderCell>
|
||||
<Table.HeaderCell>{t("settings.members.columns.status")}</Table.HeaderCell>
|
||||
<Table.HeaderCell>{t("settings.members.columns.twoFactor")}</Table.HeaderCell>
|
||||
<Table.HeaderCell> </Table.HeaderCell>
|
||||
@@ -207,23 +199,26 @@ export function MembersPage({ vm, actions, rolesTabHref, editRouteFor, submittin
|
||||
<Table.Cell>
|
||||
<span className="text-body-default-regular-0 font-body-default-regular-0 text-text-neutral-subtle">—</span>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<span className="text-body-default-regular-0 font-body-default-regular-0 text-text-neutral-subtle">—</span>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<BadgeFeedback farbe="subtle-warning">{t("settings.members.status.invited")}</BadgeFeedback>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<span className="text-body-default-regular-0 font-body-default-regular-0 text-text-neutral-subtle">—</span>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<div className="flex grow shrink-0 basis-0 items-center justify-end">
|
||||
{data.canManageMembers ? (
|
||||
<IconButton
|
||||
icon={<FeatherTrash />}
|
||||
title={t("shared.delete")}
|
||||
onClick={() => actions.onDeleteInvitation({ invitationId: invitation.id })}
|
||||
data-ui-id="ui.settings.members.invitation.delete"
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
<Table.Cell variant="align-right">
|
||||
{data.canManageMembers ? (
|
||||
<IconButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
icon={<FeatherTrash />}
|
||||
title={t("shared.delete")}
|
||||
onClick={() => actions.onDeleteInvitation({ invitationId: invitation.id })}
|
||||
data-ui-id="ui.settings.members.invitation.delete"
|
||||
/>
|
||||
) : null}
|
||||
</Table.Cell>
|
||||
</Table.Row>
|
||||
))}
|
||||
@@ -371,6 +366,10 @@ function MemberRow({
|
||||
</span>
|
||||
)}
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
{/* Effective seat type (Fundament C): office (Büro) vs field (Baustelle) — read-only. */}
|
||||
<BadgeFeedback farbe={row.seatType === "office" ? "subtle-brand-primary" : "subtle-warning"}>{t(row.seatLabelKey)}</BadgeFeedback>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<BadgeFeedback farbe={badge}>{t(row.statusLabelKey)}</BadgeFeedback>
|
||||
</Table.Cell>
|
||||
@@ -379,41 +378,45 @@ function MemberRow({
|
||||
{row.mfaEnabled ? t("settings.members.twoFactor.on") : t("settings.members.twoFactor.off")}
|
||||
</BadgeFeedback>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<div className="flex grow shrink-0 basis-0 items-center justify-end">
|
||||
{data.canManageMembers || data.canEditRoles ? (
|
||||
<SubframeCore.DropdownMenu.Root>
|
||||
<SubframeCore.DropdownMenu.Trigger asChild>
|
||||
<IconButton icon={<FeatherMoreHorizontal />} data-ui-id="ui.settings.members.rowActions" />
|
||||
</SubframeCore.DropdownMenu.Trigger>
|
||||
<SubframeCore.DropdownMenu.Portal>
|
||||
<SubframeCore.DropdownMenu.Content side="bottom" align="end" sideOffset={4} asChild>
|
||||
<DropdownMenu>
|
||||
{row.canDeactivate ? (
|
||||
<DropdownMenu.DropdownItem icon={<FeatherUserX />} onClick={onAskDeactivate} data-ui-id="ui.settings.members.menu.deactivate">
|
||||
{t("settings.members.menu.deactivate")}
|
||||
</DropdownMenu.DropdownItem>
|
||||
) : null}
|
||||
{row.canReactivate ? (
|
||||
<DropdownMenu.DropdownItem
|
||||
icon={<FeatherUserCheck />}
|
||||
onClick={() => actions.onReactivate({ userId: row.userId })}
|
||||
data-ui-id="ui.settings.members.menu.reactivate"
|
||||
>
|
||||
{t("settings.members.menu.reactivate")}
|
||||
</DropdownMenu.DropdownItem>
|
||||
) : null}
|
||||
{data.canManageMembers ? (
|
||||
<Link to={editRouteFor(row.tenantUserId)} className="no-underline">
|
||||
<DropdownMenu.DropdownItem icon={<FeatherTrash />}>{t("settings.members.menu.remove")}</DropdownMenu.DropdownItem>
|
||||
</Link>
|
||||
) : null}
|
||||
</DropdownMenu>
|
||||
</SubframeCore.DropdownMenu.Content>
|
||||
</SubframeCore.DropdownMenu.Portal>
|
||||
</SubframeCore.DropdownMenu.Root>
|
||||
) : null}
|
||||
</div>
|
||||
<Table.Cell variant="align-right">
|
||||
{data.canManageMembers || data.canEditRoles ? (
|
||||
<SubframeCore.DropdownMenu.Root>
|
||||
<SubframeCore.DropdownMenu.Trigger asChild>
|
||||
<IconButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
icon={<FeatherMoreHorizontal />}
|
||||
aria-label={`${t("shared.actions")}: ${row.name}`}
|
||||
data-ui-id="ui.settings.members.rowActions"
|
||||
/>
|
||||
</SubframeCore.DropdownMenu.Trigger>
|
||||
<SubframeCore.DropdownMenu.Portal>
|
||||
<SubframeCore.DropdownMenu.Content side="bottom" align="end" sideOffset={4} asChild>
|
||||
<DropdownMenu>
|
||||
{row.canDeactivate ? (
|
||||
<DropdownMenu.DropdownItem icon={<FeatherUserX />} onClick={onAskDeactivate} data-ui-id="ui.settings.members.menu.deactivate">
|
||||
{t("settings.members.menu.deactivate")}
|
||||
</DropdownMenu.DropdownItem>
|
||||
) : null}
|
||||
{row.canReactivate ? (
|
||||
<DropdownMenu.DropdownItem
|
||||
icon={<FeatherUserCheck />}
|
||||
onClick={() => actions.onReactivate({ userId: row.userId })}
|
||||
data-ui-id="ui.settings.members.menu.reactivate"
|
||||
>
|
||||
{t("settings.members.menu.reactivate")}
|
||||
</DropdownMenu.DropdownItem>
|
||||
) : null}
|
||||
{data.canManageMembers ? (
|
||||
<Link to={editRouteFor(row.tenantUserId)} className="no-underline">
|
||||
<DropdownMenu.DropdownItem icon={<FeatherTrash />}>{t("settings.members.menu.remove")}</DropdownMenu.DropdownItem>
|
||||
</Link>
|
||||
) : null}
|
||||
</DropdownMenu>
|
||||
</SubframeCore.DropdownMenu.Content>
|
||||
</SubframeCore.DropdownMenu.Portal>
|
||||
</SubframeCore.DropdownMenu.Root>
|
||||
) : null}
|
||||
</Table.Cell>
|
||||
</Table.Row>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user