Update hivegrid-cloud reference to latest main

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
davidandClaude Fable 5 committed 2026-07-08 16:15:37 +02:00
1 parent e98d38e716
commit 7b21524c86
3781 files changed
+373484 -225607

No files matched your search

@@ -5,7 +5,7 @@ import { CookieCategory } from "./CookieCategory";
const allApplicationCookies: ApplicationCookie[] = [
{
category: CookieCategory.REQUIRED,
name: "RJ_session",
name: "hivegrid_session",
expiry: "1 month",
expiryKey: "cookies.expiry.oneMonth",
descriptionKey: "cookies.items.session.description",
@@ -1,8 +0,0 @@
export type ApiKeyEntityPermissionDto = {
id: string;
name: string;
create: boolean;
read: boolean;
update: boolean;
delete: boolean;
};
@@ -0,0 +1,8 @@
export type BillingProviderCouponDto = {
amount_off?: number | null;
percent_off?: number | null;
currency?: string | null;
applies_to?: {
products: string[];
} | null;
};
@@ -0,0 +1,13 @@
import type { BillingGatewayInvoice } from "@hivegrid/billing";
export type CustomerBillingInvoiceDto = {
id: string;
number: string | null;
issuingDate: string | null;
amountCents: number | null;
currency: string | null;
status: BillingGatewayInvoice["status"];
paymentStatus: BillingGatewayInvoice["paymentStatus"];
invoiceType: string | null;
downloadHref: string | null;
};
@@ -1,17 +0,0 @@
import { Entity, Property } from "@toolctrl/db/prisma-browser";
import { EntityRelationshipWithDetails } from "~/utils/db/entities/entityRelationships.db.server";
export interface RowFiltersDto {
customRow: boolean;
entity: Entity;
query: string | null;
properties: {
property?: Property;
name?: string;
value: string | string[] | null;
condition?: string;
match?: "and" | "or";
parentEntity?: EntityRelationshipWithDetails;
}[];
tags: string[];
}
@@ -1,8 +1,4 @@
import { Entity, Property } from "@toolctrl/db/prisma-browser";
export interface SortedByDto {
name: string;
direction: "asc" | "desc";
property?: Property;
entity?: Entity;
}
@@ -1,9 +0,0 @@
import { Entity, Property, RowValue } from "@toolctrl/db/prisma-browser";
export interface RowDynamicValuesDto {
form: Entity | undefined;
name: string;
total: number;
headers: (RowValue & { property: Property })[];
// details: RequestDetailDto[];
}
@@ -1,16 +0,0 @@
import { RowMedia, RowValueMultiple, RowValueRange } from "@toolctrl/db/prisma-browser";
import { PropertyWithDetails } from "~/utils/db/entities/entities.db.server";
export type RowValueDto = {
id?: string | null;
property: PropertyWithDetails;
propertyId: string;
textValue?: string | undefined;
numberValue?: number | undefined;
dateValue?: Date | undefined;
booleanValue?: boolean | undefined;
selectedOption?: string | undefined;
media?: RowMedia[];
multiple?: RowValueMultiple[];
range?: RowValueRange | undefined;
};
@@ -1,6 +0,0 @@
export type SetupItem = {
title: string;
description: string;
completed: boolean;
path: string | undefined;
};
@@ -27,12 +27,6 @@ export const DefaultPermissions = [
"admin.roles.update",
"admin.roles.delete",
"admin.roles.set",
"admin.analytics.view",
"admin.analytics.delete",
"admin.entities.view",
"admin.entities.create",
"admin.entities.update",
"admin.entities.delete",
// "admin.workflows.view",
// "admin.workflows.create",
// "admin.workflows.update",
@@ -51,10 +45,6 @@ export const DefaultPermissions = [
"admin.emails.create",
"admin.emails.update",
"admin.emails.delete",
"admin.onboarding.view",
"admin.onboarding.create",
"admin.onboarding.update",
"admin.onboarding.delete",
"admin.notifications.view",
"admin.notifications.manage",
"admin.featureFlags.view",
@@ -68,10 +58,6 @@ export const DefaultPermissions = [
"admin.prompts.create",
"admin.prompts.update",
"admin.prompts.delete",
"admin.formulas.view",
"admin.formulas.create",
"admin.formulas.update",
"admin.formulas.delete",
"admin.metrics.view",
"admin.metrics.update",
"admin.metrics.delete",
@@ -86,13 +72,19 @@ export const DefaultPermissions = [
"admin.settings.general.update",
"admin.settings.authentication.view",
"admin.settings.authentication.update",
"admin.settings.analytics.view",
"admin.settings.analytics.update",
"admin.settings.seo.update",
"admin.settings.internationalization.view",
"admin.settings.internationalization.update",
"admin.settings.danger.reset",
"app.dashboard.view",
// P11 Dashboard (R-P11b) — see packages/db permissions-seed.
"dashboard.read",
"dashboard.customize",
// P12 Automation (R-P12a) — see packages/db permissions-seed.
"automation.read",
"automation.manage",
"automation.run",
"automation.admin",
"app.settings.members.view",
"app.settings.members.create",
"app.settings.members.update",
@@ -105,6 +97,8 @@ export const DefaultPermissions = [
"app.settings.subscription.update",
"app.settings.subscription.delete",
"app.settings.subscription.invoices.view",
"app.onboarding.demoData.manage",
"app.onboarding.checklist.update",
"app.settings.account.view",
"app.settings.account.update",
"app.settings.account.delete",
@@ -131,6 +125,105 @@ export const DefaultPermissions = [
"tasks.write",
"tasks.delete",
"tasks.admin",
// P6 CRM core (R-P6) — see packages/db permissions-seed (same list).
"crm.read_own",
"crm.read_all",
"crm.write",
"crm.delete",
"crm.admin",
// P7 Lead-Inbox (R-P7) — see packages/db permissions-seed (same list).
"leads.read_own",
"leads.read_all",
"leads.write",
"leads.delete",
"leads.admin",
// P8 Projekt/Pipelines (R-P8a) — see packages/db permissions-seed.
"projects.read_own",
"projects.read_own_member",
"projects.read_own_pl",
"projects.read_all",
"projects.write",
"projects.change_stage",
"projects.manage_members",
"projects.delete",
"projects.admin",
// P9 Plantafel + Abnahme (R-P9b) — see packages/db permissions-seed.
"plantafel.read_own",
"plantafel.read_all",
"plantafel.write",
"plantafel.bulk_reassign",
"acceptance.read",
"acceptance.write",
"acceptance.admin",
"deals.read_volume_own",
"deals.read_volume_all",
"deals.read_aggregates",
// P17 HR-Hub core (AK-P17a) — see packages/db permissions-seed (same list).
"hr.read_own",
"hr.read_all",
"hr.write",
"hr.admin",
"hr.passwordsafe.use",
"hr.passwordsafe.admin",
// P17 HR-Hub workflows (AK-P17b) — see packages/db permissions-seed (same list).
"hr.leave.approve",
"hr.surveys.results",
// P14 Email (AK-P14a) — tenant-side sending-domain management (see packages/db
// permissions-seed, same list). The module itself is feature-gated
// (email-marketing); these gate viewing/managing the sending domain + suppression.
"email.domain.view",
"email.domain.manage",
// P14 Email-Marketing (AK-P14b) — see packages/db permissions-seed (same list).
"emailMarketing.view",
"emailMarketing.manage",
// P23 Postfach-Sync (VA-P23) — see packages/db permissions-seed (same list).
// read_own: mails of the user's OWN connected mailboxes; read_all: every
// tenant mailbox; write: compose/send over the own mailbox (M09 Block I).
"email.read_own",
"email.read_all",
"email.write",
// P5 Apps-Engine (R-P5) — see packages/db permissions-seed (same list).
"integrations.read",
"integrations.connect",
"integrations.disconnect",
"integrations.manual_sync",
"integrations.view_logs",
"integrations.admin",
// P16 Calendar-Sync (AK-P16a) — see packages/db permissions-seed (same list).
// connect_own: connect/manage your OWN calendar; admin: tenant-wide oversight
// + force-disconnect on user offboarding (M25 Block I).
"calendar.connect_own",
"calendar.admin",
// P16 Booking (AK-P16b) — see packages/db permissions-seed (same list). Cumulative
// bundle (M06 Block K): read_own < read_all < write < admin. read_own/write are
// owner-filtered server-side (provider_user_id = self).
"bookings.read_own",
"bookings.read_all",
"bookings.write",
"bookings.admin",
// P16 Forms (AK-P16c) — see packages/db permissions-seed (same list).
"forms.basic",
"forms.builder",
"forms.publisher",
"forms.admin",
// P16 Signature (AK-P16d) — see packages/db permissions-seed (same list).
// Cumulative bundle: read < send < revoke < admin. read/send are owner-filtered
// server-side through the linked Projekt; admin can manage every tenant document.
"signature.read",
"signature.send",
"signature.revoke",
"signature.admin",
// P11 Global Search (R-P11a) — search.use opens Cmd+K and full search;
// search.admin is reserved for reindex/admin controls.
"search.use",
"search.admin",
// P21 Privacy/GDPR (AK-P21) — see packages/db permissions-seed (same list).
"privacy.user_export.self",
"privacy.tenant_export",
"privacy.tenant_deletion",
"privacy.avv.read",
"privacy.avv.accept",
"privacy.subprocessors.read",
// "entity.{name}.view",
// "entity.{name}.read",
// "entity.{name}.create",
@@ -1,12 +1,12 @@
import { SubscriptionProductDto } from "./SubscriptionProductDto";
import { SubscriptionPriceType } from "~/application/enums/subscriptions/SubscriptionPriceType";
import { SubscriptionBillingPeriod } from "~/application/enums/subscriptions/SubscriptionBillingPeriod";
import { SubscriptionUsageBasedTier } from "@toolctrl/db/prisma-browser";
import { SubscriptionUsageBasedTier } from "@hivegrid/db/prisma-browser";
import { Decimal } from "decimal.js";
export interface SubscriptionPriceDto {
id?: string;
stripeId: string;
billingProviderId: string;
type: SubscriptionPriceType;
billingPeriod: SubscriptionBillingPeriod;
price: number | Decimal;
@@ -2,11 +2,11 @@ import { SubscriptionPriceDto } from "./SubscriptionPriceDto";
import { SubscriptionFeatureDto } from "./SubscriptionFeatureDto";
import { PricingModel } from "~/application/enums/subscriptions/PricingModel";
import { SubscriptionUsageBasedPriceDto } from "./SubscriptionUsageBasedPriceDto";
import { TenantSubscriptionProduct, TenantType } from "@toolctrl/db/prisma-browser";
import { TenantSubscriptionProduct, TenantType } from "@hivegrid/db/prisma-browser";
export interface SubscriptionProductDto {
id?: string;
stripeId: string;
billingProviderId: string;
order: number;
title: string;
description: string | null;
@@ -4,7 +4,7 @@ import { SubscriptionUsageBasedTierDto } from "./SubscriptionUsageBasedTierDto";
export interface SubscriptionUsageBasedPriceDto {
id: string;
subscriptionProductId: string;
stripeId: string;
billingProviderId: string;
billingPeriod: SubscriptionBillingPeriod;
currency: string;
unit: string;
@@ -1,9 +1,9 @@
import fs from "node:fs";
import path from "node:path";
import { describe, expect, it } from "vitest";
import { getEnvVariableDefinition } from "@toolctrl/config";
import { loadFeatureManifests } from "@toolctrl/plugins";
import { queueNames } from "@toolctrl/queue";
import { getEnvVariableDefinition } from "@hivegrid/config";
import { loadFeatureManifests } from "@hivegrid/plugins";
import { queueNames } from "@hivegrid/queue";
const manifestLoad = await loadFeatureManifests();
const manifests = manifestLoad.manifests;
@@ -125,34 +125,7 @@ describe("feature manifests", () => {
});
});
it("includes the AI chatbot reference pattern for admin-managed worker-backed features", () => {
const chatbot = manifests.find((manifest) => manifest.id === "ai-chatbot-admin-managed");
expect(chatbot).toBeDefined();
expect(chatbot?.integration.ownership).toBe("admin-managed");
expect(chatbot?.integration.externalProviders).toContain("deployment-region-ai-provider");
expect(chatbot?.integration.workers.required).toBe(true);
expect(chatbot?.integration.workers.queues).toContain(queueNames.aiChatbot);
expect(chatbot?.integration.workers.queues).toContain(queueNames.browserAutomation);
expect(chatbot?.integration.workers.jobs).toEqual(expect.arrayContaining(["chat-completion", "browser-session-run", "browser-session-cleanup", "usage-flush"]));
expect(chatbot?.integration.configuration.environment).toEqual(
expect.arrayContaining([
"MISTRAL_API_KEY",
"MISTRAL_MODEL",
"SCALEWAY_API_KEY",
"SCALEWAY_MODEL",
"SCALEWAY_BASE_URL",
"ALEPH_ALPHA_API_KEY",
"ALEPH_ALPHA_MODEL",
"ALEPH_ALPHA_BASE_URL",
"BULLMQ_REDIS_URL",
"BROWSER_RUNTIME_URL",
])
);
expect(chatbot?.integration.configuration.secrets.join(" ")).toContain("never be exposed");
});
it("keeps admin-managed AI/browser feature contracts backed by config and queue packages", () => {
it("keeps admin-managed browser feature contracts backed by config and queue packages", () => {
[
"BULLMQ_REDIS_URL",
"BROWSER_RUNTIME_URL",
@@ -164,7 +137,6 @@ describe("feature manifests", () => {
expect(definition?.targets.some((target) => target === "api" || target === "worker"), name).toBe(true);
});
expect(queueNames.aiChatbot).toBe("toolctrl.ai-chatbot");
expect(queueNames.browserAutomation).toBe("toolctrl.browser-automation");
expect(queueNames.browserAutomation).toBe("hivegrid.browser-automation");
});
});
@@ -9,7 +9,7 @@ describe("currencies", () => {
name: "United States Dollar",
value: "usd",
symbol: "$",
default: true,
default: false,
disabled: false,
parities: [{ from: "usd", parity: 1 }],
symbolRight: false,
@@ -20,7 +20,8 @@ describe("currencies", () => {
name: "Euro",
value: "eur",
symbol: "€",
disabled: true,
default: true,
disabled: false,
parities: [{ from: "usd", parity: 1 }],
symbolRight: true,
thousandSeparator: ".",
@@ -5,7 +5,7 @@ const currencies: CurrencyDto[] = [
name: "United States Dollar",
value: "usd",
symbol: "$",
default: true,
default: false,
disabled: false,
parities: [{ from: "usd", parity: 1 }],
symbolRight: false,
@@ -16,7 +16,8 @@ const currencies: CurrencyDto[] = [
name: "Euro",
value: "eur",
symbol: "€",
disabled: true,
default: true,
disabled: false,
parities: [{ from: "usd", parity: 1 }],
symbolRight: true,
thousandSeparator: ".",
@@ -16,7 +16,7 @@ const UNIT_API_CALL = {
function generatePrice(currency: string, price: number, billingPeriod: SubscriptionBillingPeriod): SubscriptionPriceDto {
return {
stripeId: "",
billingProviderId: "",
subscriptionProductId: "",
type: billingPeriod === SubscriptionBillingPeriod.ONCE ? SubscriptionPriceType.ONE_TIME : SubscriptionPriceType.RECURRING,
billingPeriod,
@@ -56,7 +56,7 @@ function generateUsageBasedPrice(
});
return {
id: "",
stripeId: "",
billingProviderId: "",
subscriptionProductId: "",
billingPeriod: SubscriptionBillingPeriod.MONTHLY,
currency,
@@ -74,7 +74,7 @@ function generateUsageBasedPrice(
function generateCommonPlan(order: number, model: PricingModel) {
if (order === 1) {
return {
stripeId: "",
billingProviderId: "",
order,
title: "pricing.products.plan1.title",
description: "pricing.products.plan1.description",
@@ -112,7 +112,7 @@ function generateCommonPlan(order: number, model: PricingModel) {
};
} else if (order === 2) {
return {
stripeId: "",
billingProviderId: "",
order,
title: "pricing.products.plan2.title",
description: "pricing.products.plan2.description",
@@ -149,7 +149,7 @@ function generateCommonPlan(order: number, model: PricingModel) {
};
} else if (order === 3) {
return {
stripeId: "",
billingProviderId: "",
order,
title: "pricing.products.plan3.title",
description: "pricing.products.plan3.description",
@@ -187,7 +187,7 @@ function generateCommonPlan(order: number, model: PricingModel) {
}
return {
stripeId: "",
billingProviderId: "",
order,
title: "pricing.products.plan1.title",
description: "pricing.products.plan1.description",
@@ -241,12 +241,6 @@ const FLAT_RATE_PRICES: SubscriptionProductDto[] = [
},
];
const PER_SEAT_PRICES: SubscriptionProductDto[] = [
...FLAT_RATE_PRICES.map((item) => {
return { ...item, model: PricingModel.PER_SEAT };
}),
];
const USAGE_BASED_PRICES: SubscriptionProductDto[] = [
{
...generateCommonPlan(1, PricingModel.USAGE_BASED),
@@ -327,5 +321,5 @@ const ONE_TIME_PRICES: SubscriptionProductDto[] = [
},
];
const plans = [...FLAT_RATE_PRICES, ...PER_SEAT_PRICES, ...USAGE_BASED_PRICES, ...FLAT_RATE_PLUS_USAGE_BASED_PRICES, ...ONE_TIME_PRICES];
const plans = [...FLAT_RATE_PRICES, ...USAGE_BASED_PRICES, ...FLAT_RATE_PLUS_USAGE_BASED_PRICES, ...ONE_TIME_PRICES];
export default plans;
@@ -0,0 +1,17 @@
import { describe, expect, it } from "vitest";
import plans from "~/application/pricing/plans.server";
import { PricingModel } from "~/application/enums/subscriptions/PricingModel";
import { HIVEGRID_SUBSCRIPTION_PRICING_MODELS, isHiveGridSubscriptionPricingModel } from "./pricingModelPolicy";
describe("HiveGrid subscription pricing model policy", () => {
it("does not allow seat-type pricing models", () => {
expect(HIVEGRID_SUBSCRIPTION_PRICING_MODELS).not.toContain(PricingModel.PER_SEAT);
expect(isHiveGridSubscriptionPricingModel(PricingModel.PER_SEAT)).toBe(false);
});
it("keeps generated admin pricing seeds free of seat-type plans", () => {
expect(plans).not.toHaveLength(0);
expect(plans.map((plan) => plan.model)).not.toContain(PricingModel.PER_SEAT);
});
});
@@ -0,0 +1,13 @@
import { PricingModel } from "~/application/enums/subscriptions/PricingModel";
export const HIVEGRID_SUBSCRIPTION_PRICING_MODELS = [
PricingModel.FLAT_RATE,
PricingModel.USAGE_BASED,
PricingModel.FLAT_RATE_USAGE_BASED,
PricingModel.ONCE,
] as const;
export function isHiveGridSubscriptionPricingModel(model: PricingModel) {
return HIVEGRID_SUBSCRIPTION_PRICING_MODELS.includes(model as (typeof HIVEGRID_SUBSCRIPTION_PRICING_MODELS)[number]);
}
@@ -82,13 +82,11 @@ describe("AdminSidebar", () => {
expect(Array.isArray(sidebar)).toBe(true);
expect(serialized).toContain("/dashboard");
expect(serialized).toContain("/accounts");
expect(serialized).toContain("/analytics/overview");
expect(serialized).toContain("/audit-trails");
expect(serialized).toContain("/notifications/messages");
expect(serialized).toContain("/feature-flags/flags");
expect(serialized).toContain("/onboarding/onboardings");
expect(serialized).toContain("/metrics/summary");
expect(serialized).toContain("/settings/profile");
expect(serialized).not.toContain("/metrics");
expect(sidebar).toEqual(
expect.arrayContaining([
expect.objectContaining({
@@ -100,7 +98,7 @@ describe("AdminSidebar", () => {
);
expect(sidebar.at(-1)?.items).toEqual(
expect.arrayContaining([
expect.objectContaining({ id: "ui.nav.admin.switchToApp", path: "/", exact: true }),
expect.objectContaining({ id: "ui.nav.admin.switchToApp", path: "/select-tenant", permission: "admin.accounts.view", exact: true }),
])
);
const emittedPaths = serialized.match(/"path":"[^"]*"/g) ?? [];
@@ -6,7 +6,6 @@ import { AppConfiguration } from "~/utils/db/appConfiguration.db.server";
import IconSettings from "~/components/layouts/icons/IconSettings";
import IconApp from "~/components/layouts/icons/IconApp";
import IconKeys from "~/components/layouts/icons/IconKeys";
import IconEntities from "~/components/layouts/icons/IconEntities";
import IconAnalytics from "~/components/layouts/icons/IconAnalytics";
import IconDocs from "~/components/layouts/icons/IconDocs";
import IconEmails from "~/components/layouts/icons/IconEmails";
@@ -14,18 +13,13 @@ import IconEvents from "~/components/layouts/icons/IconEvents";
import IconFeatureFlags from "~/components/layouts/icons/IconFeatureFlags";
import IconHelpDesk from "~/components/layouts/icons/IconHelpDesk";
import IconMetrics from "~/components/layouts/icons/IconMetrics";
import IconNavigation from "~/components/layouts/icons/IconNavigation";
import IconNotifications from "~/components/layouts/icons/IconNotifications";
import IconOnboarding from "~/components/layouts/icons/IconOnboarding";
import IconPortals from "~/components/layouts/icons/IconPortals";
import IconWorkflows from "~/components/layouts/icons/IconWorkflows";
import { UI_NAV_IDS } from "~/application/ui/uiRegistry";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { absoluteAppRootPath, type PublicDomainRoutingConfig } from "~/utils/app/CrossHostUrls";
import type { PublicDomainRoutingConfig } from "~/utils/app/CrossHostUrls";
import { disabledPluginRouteSlugs } from "~/utils/app/PublicRouteSegments";
const adminSidebarPath = (path?: string) => adminPath(path, { mode: "host-aware" });
const rootAppFallbackPath = "/";
const disabledAdminRouteSlugs = new Set<string>(disabledPluginRouteSlugs);
function isAdminRouteEnabled(slug: string) {
@@ -42,7 +36,7 @@ type Props = {
routing?: PublicDomainRoutingConfig;
};
export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarItem[] => [
export const AdminSidebar = ({ t, appConfiguration }: Props): SideBarItem[] => [
{
id: "ui.nav.admin.primary",
title: "",
@@ -92,6 +86,13 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
items: [],
permission: "admin.accounts.view",
},
{
id: "ui.nav.admin.accounts.billing",
title: t("admin.billing.title"),
path: adminSidebarPath("accounts/billing"),
items: [],
permission: "admin.account.subscription",
},
{
id: "ui.nav.admin.accounts.rolesAndPermissions",
title: t("app.sidebar.rolesAndPermissions"),
@@ -117,32 +118,16 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
permission: "admin.accounts.view",
},
{
id: UI_NAV_IDS.adminAnalytics,
title: t("app.sidebar.analytics"),
path: adminSidebarPath("analytics"),
icon: <IconAnalytics />,
id: UI_NAV_IDS.adminAudit,
title: t("admin.auditAndEvents"),
path: adminSidebarPath("audit"),
icon: <IconEvents />,
isCollapsible: true,
items: [
{ id: "ui.nav.admin.analytics.overview", title: t("app.sidebar.overview"), path: adminSidebarPath("analytics/overview"), permission: "admin.analytics.view" },
{ id: "ui.nav.admin.analytics.pageViews", title: t("app.sidebar.pageViews"), path: adminSidebarPath("analytics/page-views"), permission: "admin.analytics.view" },
{ id: "ui.nav.admin.analytics.visitors", title: t("app.sidebar.visitors"), path: adminSidebarPath("analytics/visitors"), permission: "admin.analytics.view" },
{ id: "ui.nav.admin.analytics.events", title: t("models.event.plural"), path: adminSidebarPath("analytics/events"), permission: "admin.analytics.view" },
{ id: "ui.nav.admin.analytics.settings", title: t("app.sidebar.settings"), path: adminSidebarPath("analytics/settings"), permission: "admin.settings.analytics.view" },
{ id: "ui.nav.admin.audit.viewer", title: t("app.sidebar.audit"), path: adminSidebarPath("audit"), permission: "admin.auditTrails.view" },
{ id: "ui.nav.admin.audit.trails", title: t("app.sidebar.auditTrails"), path: adminSidebarPath("audit-trails"), permission: "admin.auditTrails.view" },
{ id: "ui.nav.admin.audit.events", title: t("models.event.plural"), path: adminSidebarPath("events"), permission: "admin.events.view" },
],
permission: "admin.analytics.view",
},
{
id: UI_NAV_IDS.adminEvents,
title: t("models.event.plural"),
path: adminSidebarPath("events"),
icon: <IconEvents />,
permission: "admin.events.view",
},
{
id: UI_NAV_IDS.adminAuditTrails,
title: t("app.sidebar.auditTrails"),
path: adminSidebarPath("audit-trails"),
icon: <IconEvents />,
permission: "admin.auditTrails.view",
},
{
@@ -161,31 +146,10 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
],
},
{
id: "ui.nav.admin.build",
title: t("segments.build"),
id: "ui.nav.admin.platform",
title: t("segments.platform"),
path: "",
items: [
{
id: UI_NAV_IDS.adminEntities,
title: t("models.entity.plural"),
path: adminSidebarPath("entities"),
icon: <IconEntities />,
permission: "admin.entities.view",
},
...enabledAdminRouteItem("workflow-engine", {
id: UI_NAV_IDS.adminWorkflows,
title: t("models.workflow.plural"),
path: adminSidebarPath("workflow-engine"),
icon: <IconWorkflows />,
isCollapsible: true,
items: [
{ id: "ui.nav.admin.workflows.workflows", title: t("models.workflow.plural"), path: adminSidebarPath("workflow-engine/workflows") },
{ id: "ui.nav.admin.workflows.executions", title: t("app.sidebar.executions"), path: adminSidebarPath("workflow-engine/executions") },
{ id: "ui.nav.admin.workflows.templates", title: t("models.entity.templates"), path: adminSidebarPath("workflow-engine/templates") },
{ id: "ui.nav.admin.workflows.credentials", title: t("app.sidebar.credentials"), path: adminSidebarPath("workflow-engine/credentials") },
{ id: "ui.nav.admin.workflows.variables", title: t("app.sidebar.variables"), path: adminSidebarPath("workflow-engine/variables") },
],
}),
{
id: UI_NAV_IDS.adminApi,
title: t("settings.api.title"),
@@ -197,8 +161,6 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
items: [
{ id: "ui.nav.admin.api.keys", title: t("app.sidebar.apiKeys"), path: adminSidebarPath("api/keys"), permission: "admin.apiKeys.view" },
{ id: "ui.nav.admin.api.logs", title: t("app.sidebar.logs"), path: adminSidebarPath("api/logs"), permission: "admin.apiKeys.view" },
{ id: "ui.nav.admin.api.docs", title: t("app.sidebar.docs"), path: adminSidebarPath("api/docs"), permission: "admin.apiKeys.view" },
{ id: "ui.nav.admin.api.credits", title: t("app.sidebar.credits"), path: adminSidebarPath("api/credits"), permission: "admin.apiKeys.view" },
],
},
{
@@ -213,18 +175,6 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
],
permission: "admin.featureFlags.view",
},
{
id: UI_NAV_IDS.adminNavigation,
title: t("admin.navigation.title"),
path: adminSidebarPath("navigation"),
icon: <IconNavigation className="size-4" />,
},
...enabledAdminRouteItem("portals", {
id: UI_NAV_IDS.adminPortals,
title: t("app.sidebar.portals"),
path: adminSidebarPath("portals"),
icon: <IconPortals />,
}),
],
},
{
@@ -281,31 +231,6 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
{ id: "ui.nav.admin.helpDesk.feedback", title: t("app.sidebar.feedback"), path: adminSidebarPath("help-desk/feedback") },
],
}),
{
id: UI_NAV_IDS.adminOnboarding,
title: t("app.sidebar.onboarding"),
path: adminSidebarPath("onboarding"),
icon: <IconOnboarding />,
isCollapsible: true,
items: [
{ id: "ui.nav.admin.onboarding.onboardings", title: t("app.sidebar.onboardings"), path: adminSidebarPath("onboarding/onboardings"), permission: "admin.onboarding.view" },
{ id: "ui.nav.admin.onboarding.sessions", title: t("app.sidebar.sessions"), path: adminSidebarPath("onboarding/sessions"), permission: "admin.onboarding.view" },
],
permission: "admin.onboarding.view",
},
{
id: UI_NAV_IDS.adminMetrics,
title: t("app.sidebar.metrics"),
path: adminSidebarPath("metrics"),
icon: <IconMetrics />,
isCollapsible: true,
items: [
{ id: "ui.nav.admin.metrics.summary", title: t("app.sidebar.summary"), path: adminSidebarPath("metrics/summary"), permission: "admin.metrics.view" },
{ id: "ui.nav.admin.metrics.logs", title: t("app.sidebar.logs"), path: adminSidebarPath("metrics/logs"), permission: "admin.metrics.view" },
{ id: "ui.nav.admin.metrics.settings", title: t("app.sidebar.settings"), path: adminSidebarPath("metrics/settings"), permission: "admin.metrics.view" },
],
permission: "admin.metrics.view",
},
],
},
{
@@ -330,7 +255,6 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
path: adminSidebarPath("settings/authentication"),
permission: "admin.settings.authentication.view",
},
{ id: "ui.nav.admin.settings.analytics", title: t("settings.admin.analytics.title"), path: adminSidebarPath("settings/analytics"), permission: "admin.settings.analytics.view" },
{
id: "ui.nav.admin.settings.transactionalEmails",
title: t("settings.admin.transactionalEmails.title"),
@@ -345,8 +269,9 @@ export const AdminSidebar = ({ t, appConfiguration, routing }: Props): SideBarIt
{
id: UI_NAV_IDS.adminSwitchToApp,
title: t("admin.switchToApp"),
path: routing ? absoluteAppRootPath(routing) : rootAppFallbackPath,
path: adminSidebarPath("select-tenant"),
icon: <IconApp />,
permission: "admin.accounts.view",
exact: true,
},
],
@@ -2,48 +2,55 @@ import { existsSync } from "node:fs";
import { vi, describe, it, expect } from "vitest";
import { AppSidebar } from "./AppSidebar";
import { UI_NAV_IDS } from "~/application/ui/uiRegistry";
import { EntitySimple } from "~/utils/db/entities/entities.db.server";
import { resolveRepoPath } from "~/utils/testing/repoPaths";
// R-P6B-β (AD-2): the generic entity-builder is gone, so AppSidebar no longer
// renders dynamic per-entity / entity-group nav. Only typed product features and
// static targets remain.
describe("AppSidebar", () => {
const starterProductAccess = {
dashboard: { allowed: true },
"crm-basic": { allowed: true },
projects: { allowed: true },
automation: { allowed: false },
"email-marketing": { allowed: false },
api: { allowed: false },
"workflow-engine": { allowed: false },
"ai-credits": { allowed: true },
};
const proProductAccess = {
dashboard: { allowed: true },
"crm-basic": { allowed: true },
projects: { allowed: true },
automation: { allowed: false },
"email-marketing": { allowed: true },
"email-inbox": { allowed: true },
api: { allowed: true },
"workflow-engine": { allowed: false },
"ai-credits": { allowed: true },
};
const businessProductAccess = {
dashboard: { allowed: true },
"crm-basic": { allowed: true },
projects: { allowed: true },
automation: { allowed: true },
"email-marketing": { allowed: true },
"email-inbox": { allowed: true },
api: { allowed: true },
"workflow-engine": { allowed: true },
"ai-credits": { allowed: true },
};
it("returns the expected sidebar items", () => {
it("returns the expected static sidebar items", () => {
const t = vi.fn().mockImplementation((v: string) => v) as any;
const i18n = { exists: vi.fn().mockReturnValue(false) } as any;
const entities = [
{ name: "entity1", slug: "entity1", titlePlural: "Entity 1", showInSidebar: true, icon: "" },
{ name: "entity2", slug: "entity2", titlePlural: "Entity 2", showInSidebar: false, icon: "" },
{ name: "entity3", slug: "entity3", titlePlural: "Entity 3", showInSidebar: true, icon: "" },
] as EntitySimple[];
const result = AppSidebar({ t, i18n, tenantId: "test-user", entities, entityGroups: [], appConfiguration: null });
const result = AppSidebar({ t, i18n, tenantId: "test-user", appConfiguration: null });
const serialized = JSON.stringify(result);
expect(result[0]).toMatchObject({
title: "",
path: "",
items: [
expect(result[0].items).toEqual(
expect.arrayContaining([
expect.objectContaining({
id: "ui.nav.app.dashboard",
title: "app.sidebar.dashboard",
@@ -54,25 +61,13 @@ describe("AppSidebar", () => {
title: "app.sidebar.notifications",
path: "/test-user/notifications",
}),
expect.objectContaining({
id: "ui.nav.app.entity.entity1",
title: "Entity 1",
path: "/test-user/entity1",
permission: "entity.entity1.view",
}),
expect.objectContaining({
id: "ui.nav.app.entity.entity3",
title: "Entity 3",
path: "/test-user/entity3",
permission: "entity.entity3.view",
}),
],
});
])
);
expect(result[1]).toMatchObject({
title: "",
path: "",
isSecondary: true,
items: [
items: expect.arrayContaining([
expect.objectContaining({
id: "ui.nav.app.settings",
title: "app.sidebar.settings",
@@ -85,8 +80,10 @@ describe("AppSidebar", () => {
path: "/dashboard",
adminOnly: true,
}),
],
]),
});
expect(serialized).not.toContain("ui.nav.app.entity.");
expect(serialized).not.toContain("ui.nav.app.entityGroup.");
expect(serialized).not.toContain("/app/");
expect(serialized).not.toContain("/admin/");
expect(serialized).not.toContain("/blog");
@@ -102,113 +99,50 @@ describe("AppSidebar", () => {
const t = vi.fn().mockImplementation((v: string) => v) as any;
const i18n = { exists: vi.fn().mockReturnValue(false) } as any;
const starter = JSON.stringify(
AppSidebar({ t, i18n, tenantId: "starter", entities: [], entityGroups: [], appConfiguration: null, productAccess: starterProductAccess })
);
const pro = JSON.stringify(
AppSidebar({ t, i18n, tenantId: "pro", entities: [], entityGroups: [], appConfiguration: null, productAccess: proProductAccess })
);
const business = JSON.stringify(
AppSidebar({ t, i18n, tenantId: "business", entities: [], entityGroups: [], appConfiguration: null, productAccess: businessProductAccess })
);
const starter = JSON.stringify(AppSidebar({ t, i18n, tenantId: "starter", appConfiguration: null, productAccess: starterProductAccess }));
const pro = JSON.stringify(AppSidebar({ t, i18n, tenantId: "pro", appConfiguration: null, productAccess: proProductAccess }));
const business = JSON.stringify(AppSidebar({ t, i18n, tenantId: "business", appConfiguration: null, productAccess: businessProductAccess }));
expect(starter).toContain("/starter/crm");
expect(starter).toContain("/starter/settings/credits");
expect(starter).toContain("/starter/contacts");
expect(starter).toContain("/starter/projects");
expect(starter).not.toContain("/starter/settings/credits");
expect(starter).not.toContain("/starter/email-marketing");
expect(starter).not.toContain("/starter/emails");
expect(starter).not.toContain("/starter/automations");
expect(starter).not.toContain("/starter/settings/api");
expect(starter).not.toContain("/starter/workflow-engine");
expect(pro).toContain("/pro/crm");
expect(pro).toContain("/pro/contacts");
expect(pro).toContain("/pro/projects");
expect(pro).toContain("/pro/email-marketing");
expect(pro).toContain("/pro/emails");
expect(pro).not.toContain("/pro/automations");
expect(pro).toContain("/pro/settings/api");
expect(pro).not.toContain("/pro/workflow-engine");
expect(business).toContain("/business/crm");
expect(business).toContain("/business/contacts");
expect(business).toContain("/business/projects");
expect(business).toContain("/business/email-marketing");
expect(business).toContain("/business/automations");
expect(business).toContain("/business/settings/api");
expect(business).toContain("/business/workflow-engine");
});
it("marks collapsible entity groups as expand-only parents", () => {
const t = vi.fn().mockImplementation((v: string) => v) as any;
const i18n = { exists: vi.fn().mockReturnValue(false) } as any;
const entities = [
{ name: "company", slug: "companies", titlePlural: "Companies", showInSidebar: true, icon: "" },
] as EntitySimple[];
const result = AppSidebar({
t,
i18n,
tenantId: "acme",
entities: [],
entityGroups: [
{
slug: "sales",
title: "Sales",
icon: "",
collapsible: true,
section: null,
entities: [{ entity: entities[0] }],
},
] as any,
appConfiguration: null,
});
const group = result[0].items?.find((item) => item.id === "ui.nav.app.entityGroup.sales");
expect(group).toMatchObject({
isCollapsible: true,
path: "/acme/g/sales",
});
expect(group?.items?.[0]).toMatchObject({ title: "shared.overview", path: "/acme/g/sales" });
});
it("translates DB-backed labels only when locale keys exist", () => {
const t = vi.fn().mockImplementation((v: string) => `translated:${v}`) as any;
const i18n = { exists: vi.fn().mockImplementation((value: string) => value === "models.contact.plural" || value === "groups.sales") } as any;
const entities = [
{ name: "contact", slug: "contacts", titlePlural: "models.contact.plural", showInSidebar: true, icon: "" },
{ name: "custom", slug: "custom", titlePlural: "Custom records", showInSidebar: true, icon: "" },
] as EntitySimple[];
const result = AppSidebar({
t,
i18n,
tenantId: "acme",
entities,
entityGroups: [
{
slug: "sales",
title: "groups.sales",
icon: "",
collapsible: true,
section: null,
entities: [{ entity: entities[0] }],
},
] as any,
appConfiguration: null,
});
const serialized = JSON.stringify(result);
expect(serialized).toContain("translated:models.contact.plural");
expect(serialized).toContain("translated:groups.sales");
expect(serialized).toContain("Custom records");
expect(serialized).not.toContain('"models.contact.plural"');
expect(serialized).not.toContain('"groups.sales"');
});
it("keeps static tenant sidebar targets backed by registered route files", () => {
const t = vi.fn().mockImplementation((v: string) => v) as any;
const i18n = { exists: vi.fn().mockReturnValue(false) } as any;
const result = AppSidebar({ t, i18n, tenantId: "acme", entities: [], entityGroups: [], appConfiguration: null, productAccess: businessProductAccess });
const result = AppSidebar({ t, i18n, tenantId: "acme", appConfiguration: null, productAccess: businessProductAccess });
const serialized = JSON.stringify(result);
expect(serialized).toContain("/acme/dashboard");
expect(serialized).toContain("/acme/notifications");
expect(serialized).toContain("/acme/crm");
expect(serialized).toContain("/acme/contacts");
expect(serialized).toContain("/acme/projects");
expect(serialized).toContain("/acme/automations");
expect(serialized).toContain("/acme/email-marketing");
expect(serialized).toContain("/acme/workflow-engine");
expect(serialized).toContain("/acme/settings/api");
expect(serialized).toContain("/acme/settings/credits");
expect(serialized).not.toContain("/acme/settings/credits");
expect(serialized).toContain("/acme/settings");
expect(serialized).toContain("/acme/settings/profile");
expect(serialized).not.toContain("/app/");
@@ -217,11 +151,14 @@ describe("AppSidebar", () => {
[
"apps/web/app/routes/app.$tenant/dashboard.tsx",
"apps/web/app/routes/app.$tenant/notifications.tsx",
"apps/web/app/routes/app.$tenant/crm.tsx",
"apps/web/app/routes/app.$tenant/contacts._index.tsx",
"apps/web/app/routes/app.$tenant/projects._index.tsx",
"apps/web/app/routes/app.$tenant/automations._index.tsx",
"apps/web/app/routes/app.$tenant/automations.$id.edit.tsx",
"apps/web/app/routes/app.$tenant/automations.templates._index.tsx",
"apps/web/app/routes/app.$tenant/email-marketing.tsx",
"apps/web/app/routes/app.$tenant/__workflows/workflow-engine.tsx",
"apps/web/app/routes/app.$tenant/settings/api/index.tsx",
"apps/web/app/routes/app.$tenant/settings/credits.tsx",
"apps/web/app/routes/app.$tenant/settings.tsx",
"apps/web/app/routes/app.$tenant/settings/profile.tsx",
].forEach((routeFile) => {
@@ -1,7 +1,5 @@
import { SideBarItem } from "./SidebarItem";
import { EntitySimple } from "~/utils/db/entities/entities.db.server";
import { TFunction, type i18n as I18n } from "i18next";
import { EntityGroupWithDetails } from "~/utils/db/entities/entityGroups.db.server";
import { AppConfiguration } from "~/utils/db/appConfiguration.db.server";
import IconSettings from "~/components/layouts/icons/IconSettings";
import IconDashboard from "~/components/layouts/icons/IconDashboard";
@@ -10,46 +8,88 @@ import IconNotifications from "~/components/layouts/icons/IconNotifications";
import IconEmails from "~/components/layouts/icons/IconEmails";
import IconKeys from "~/components/layouts/icons/IconKeys";
import IconWorkflows from "~/components/layouts/icons/IconWorkflows";
import CreditsIcon from "~/components/ui/icons/CreditsIcon";
import AddressBookIcon from "~/components/ui/icons/crm/AddressBookIcon";
import IconDocs from "~/components/layouts/icons/IconDocs";
import ViewListIcon from "~/components/ui/icons/ViewListIcon";
import { UI_ID_PATTERNS, UI_NAV_IDS, uiIdSegment } from "~/application/ui/uiRegistry";
import CalendarIcon from "~/components/ui/icons/CalendarIcon";
import { UI_NAV_IDS } from "~/application/ui/uiRegistry";
import { appPath } from "~/utils/app/CanonicalUrlUtils";
import { absoluteAdminPath, type PublicDomainRoutingConfig } from "~/utils/app/CrossHostUrls";
import { getEntityPermission } from "~/utils/helpers/PermissionsHelper";
import { translateLabel } from "~/utils/i18n/translateLabel";
import { resolveConnectorNavState } from "~/utils/connector/connectorNavState";
import { WALKING_SKELETON_MODULE_KEY } from "~/modules/walkingSkeleton/constants";
import { SearchIcon } from "~/components/ui/icons/vendor";
type Props = {
t: TFunction;
i18n: I18n;
tenantId: string;
entities: EntitySimple[];
entityGroups: EntityGroupWithDetails[];
appConfiguration: AppConfiguration | null;
routing?: PublicDomainRoutingConfig;
productAccess?: Record<string, { allowed: boolean; reason?: string }>;
};
export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing, productAccess }: Props): SideBarItem[] => {
export const AppSidebar = ({ t, tenantId, routing, productAccess }: Props): SideBarItem[] => {
const tenantPath = (path?: string) => appPath({ tenantSlug: tenantId, path, mode: "host-aware" });
const hasFeatureAccess = (featureKey: string) => productAccess?.[featureKey]?.allowed === true;
const hasDashboardAccess = productAccess ? hasFeatureAccess("dashboard") : true;
// R-P1c Konnektor-Demo: Walking-Skeleton-Eintrag zeigt die drei Gate-Zustaende (aktiv/gesperrt/ausgeblendet).
const walkingSkeletonDecision = productAccess?.[WALKING_SKELETON_MODULE_KEY];
const walkingSkeletonState = walkingSkeletonDecision ? resolveConnectorNavState(walkingSkeletonDecision) : "hidden";
const sectionItems: SideBarItem[] = [];
const entitiesItems: SideBarItem[] = [];
const productCoreItems: SideBarItem[] = [
...(hasFeatureAccess("search")
? [
{
id: UI_NAV_IDS.appSearch,
title: t("search.nav.title"),
path: tenantPath("search"),
icon: <SearchIcon />,
permission: "search.use" as const,
},
]
: []),
...(hasFeatureAccess("automation")
? [
{
id: UI_NAV_IDS.appAutomation,
title: t("automation.nav.title"),
path: tenantPath("automations"),
icon: <IconWorkflows />,
permission: "automation.read" as const,
},
]
: []),
...(hasFeatureAccess("crm-basic")
? [
{
id: UI_NAV_IDS.appCrm,
title: t("crm:title"),
path: tenantPath("crm"),
// R-P6: typed CRM contacts replace the entity-builder CRM (/crm → /contacts).
path: tenantPath("contacts"),
icon: <AddressBookIcon />,
permission: "crm.read_own" as const,
},
]
: []),
...(hasFeatureAccess("leads")
? [
{
id: UI_NAV_IDS.appLeads,
title: t("leads.nav.title"),
path: tenantPath("leads"),
icon: <ViewListIcon />,
permission: "leads.read_own" as const,
},
]
: []),
...(hasFeatureAccess("projects")
? [
{
id: UI_NAV_IDS.appProjects,
title: t("projects.nav.title"),
path: tenantPath("projects"),
icon: <ViewListIcon />,
permission: "projects.read_own" as const,
},
]
: []),
@@ -75,6 +115,78 @@ export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing,
},
]
: []),
...(hasFeatureAccess("hr")
? [
{
id: "ui.nav.app.hr",
title: t("hr.nav.title"),
path: tenantPath("hr"),
icon: <AddressBookIcon />,
permission: "hr.read_own" as const,
},
]
: []),
...(hasFeatureAccess("integrations")
? [
{
id: "ui.nav.app.integrations",
title: t("integrations.nav.title"),
path: tenantPath("integrations"),
icon: <IconWorkflows />,
permission: "integrations.read" as const,
},
]
: []),
...(hasFeatureAccess("integrations")
? [
{
// AK-P16a · calendar reuses the integrations feature gate (it is an
// Apps-Engine integration); the entry is gated by calendar.connect_own.
id: UI_NAV_IDS.appCalendar,
title: t("calendar.nav.title"),
path: tenantPath("calendar"),
icon: <CalendarIcon />,
permission: "calendar.connect_own" as const,
},
]
: []),
...(hasFeatureAccess("email-inbox")
? [
{
// VA-P23 · mailbox sync inbox — own `email-inbox` feature gate; the
// entry is gated by email.read_own (own-mailbox visibility, M09 I).
id: UI_NAV_IDS.appEmails,
title: t("emailInbox.nav.title"),
path: tenantPath("emails"),
icon: <IconEmails className="h-5 w-5" />,
permission: "email.read_own" as const,
},
]
: []),
...(hasFeatureAccess("booking")
? [
{
// AK-P16b · Booking module — own `booking` feature gate; the entry is
// gated by bookings.read_own (every provider can see their own bookings).
id: UI_NAV_IDS.appBookings,
title: t("bookings.nav.title"),
path: tenantPath("bookings"),
icon: <CalendarIcon />,
permission: "bookings.read_own" as const,
},
]
: []),
...(hasFeatureAccess("forms")
? [
{
id: UI_NAV_IDS.appForms,
title: t("settings.forms.admin.title"),
path: tenantPath("forms"),
icon: <ViewListIcon />,
permission: "forms.basic" as const,
},
]
: []),
...(hasFeatureAccess("email-marketing")
? [
{
@@ -105,16 +217,6 @@ export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing,
},
]
: []),
...(hasFeatureAccess("ai-credits")
? [
{
id: UI_NAV_IDS.appCredits,
title: t("models.credit.plural"),
path: tenantPath("settings/credits"),
icon: <CreditsIcon />,
},
]
: []),
...(walkingSkeletonState !== "hidden"
? [
{
@@ -128,87 +230,23 @@ export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing,
: []),
];
entityGroups.forEach((group) => {
const item: SideBarItem = {
id: `ui.nav.app.entityGroup.${uiIdSegment(group.slug)}`,
uiIdPattern: UI_ID_PATTERNS.appEntityGroup,
uiIdParams: { groupSlug: group.slug },
title: translateLabel(t, i18n, group.title),
// icon: group.icon,
path: tenantPath(`g/${group.slug}`),
icon: group.icon,
// isActive: true,
};
if (group.collapsible) {
item.isCollapsible = true;
item.items = [
{
id: `ui.nav.app.entityGroup.${uiIdSegment(group.slug)}.overview`,
title: t("shared.overview"),
path: tenantPath(`g/${group.slug}`),
},
...group.entities.map(({ entity }) => {
return {
id: `ui.nav.app.entityGroup.${uiIdSegment(group.slug)}.entity.${uiIdSegment(entity.slug)}`,
uiIdPattern: UI_ID_PATTERNS.appEntityGroupEntity,
uiIdParams: { groupSlug: group.slug, entityName: entity.name ?? entity.slug },
title: translateLabel(t, i18n, entity.titlePlural),
// icon: entity.icon,
path: tenantPath(`g/${group.slug}/${entity.slug}`),
permission: getEntityPermission(entity, "view"),
// entityIcon: entity.icon,
};
}),
];
}
if (group.section) {
const sectionTitle = translateLabel(t, i18n, group.section);
const section = sectionItems.find((f) => f.title === sectionTitle);
if (section) {
section.items = [...(section.items ?? []), item];
} else {
sectionItems.push({
id: `ui.nav.app.section.${uiIdSegment(group.section)}`,
uiIdPattern: UI_ID_PATTERNS.appSection,
uiIdParams: { sectionName: group.section },
title: sectionTitle,
path: ``,
items: [item],
});
}
} else {
entitiesItems.push(item);
}
});
entities
.filter((f) => f.showInSidebar)
.forEach((entity) => {
entitiesItems.push({
id: `ui.nav.app.entity.${uiIdSegment(entity.slug)}`,
uiIdPattern: UI_ID_PATTERNS.appEntity,
uiIdParams: { entityName: entity.name ?? entity.slug, entitySlug: entity.slug },
title: translateLabel(t, i18n, entity.titlePlural),
icon: entity.icon,
// tenantUserTypes: [TenantUserType.OWNER, TenantUserType.ADMIN],
path: tenantPath(entity.slug),
permission: getEntityPermission(entity, "view"),
// side: isDebugMode && SideText({ text: modelProperties.length > 0 ? "DB Model" : "Custom" }),
});
});
const appItem: SideBarItem = {
id: "ui.nav.app.primary",
title: "",
path: "",
items: [
{
id: UI_NAV_IDS.appDashboard,
title: t("app.sidebar.dashboard"),
path: tenantPath("dashboard"),
icon: <IconDashboard />,
// tenantUserTypes: [TenantUserType.OWNER, TenantUserType.ADMIN, TenantUserType.MEMBER],
},
...(hasDashboardAccess
? [
{
id: UI_NAV_IDS.appDashboard,
title: t("app.sidebar.dashboard"),
path: tenantPath("dashboard"),
icon: <IconDashboard />,
permission: "dashboard.read" as const,
// tenantUserTypes: [TenantUserType.OWNER, TenantUserType.ADMIN, TenantUserType.MEMBER],
},
]
: []),
{
id: UI_NAV_IDS.appNotifications,
title: t("app.sidebar.notifications"),
@@ -216,7 +254,6 @@ export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing,
icon: <IconNotifications />,
},
...productCoreItems,
...entitiesItems,
// {
// title: t("models.email.plural"),
// path: `${currentTenantUrl}/emails`,
@@ -227,7 +264,6 @@ export const AppSidebar = ({ t, i18n, tenantId, entities, entityGroups, routing,
return [
appItem,
...sectionItems,
{
id: "ui.nav.app.secondary",
title: "",
@@ -3,8 +3,7 @@ import { AdminSidebar } from "./AdminSidebar";
import { AppSidebar } from "./AppSidebar";
import { DocsSidebar } from "./DocsSidebar";
import type { SideBarItem } from "./SidebarItem";
import type { EntitySimple } from "~/utils/db/entities/entities.db.server";
import { UI_ID_PATTERNS, UI_NAV_IDS, UI_SURFACE_IDS } from "~/application/ui/uiRegistry";
import { UI_NAV_IDS, UI_SURFACE_IDS } from "~/application/ui/uiRegistry";
function flattenSidebarItems(items: SideBarItem[]): SideBarItem[] {
return items.flatMap((item) => [item, ...flattenSidebarItems(item.items ?? [])]);
@@ -48,44 +47,22 @@ describe("sidebar UI IDs", () => {
expectStaticItemsHaveIds(sidebar);
expect(ids).toContain(UI_NAV_IDS.adminDashboard);
expect(ids).toContain(UI_NAV_IDS.adminSettings);
expect(ids).toContain(UI_NAV_IDS.adminEntities);
});
it("assigns unique IDs to app sidebar static and dynamic items", () => {
const entities = [
{ id: "1", order: 1, name: "contacts", slug: "contacts", title: "Contact", titlePlural: "Contacts", active: true, type: "custom", hasApi: true, showInSidebar: true, icon: "", onEdit: null },
{ id: "2", order: 2, name: "hidden", slug: "hidden", title: "Hidden", titlePlural: "Hidden", active: true, type: "custom", hasApi: true, showInSidebar: false, icon: "", onEdit: null },
] as EntitySimple[];
const sidebar = AppSidebar({
t,
i18n,
tenantId: "acme",
entities,
entityGroups: [
{
slug: "sales",
title: "Sales",
icon: "",
collapsible: true,
section: "Operations",
entities: [{ entity: entities[0] }],
},
] as any,
appConfiguration: null,
});
it("assigns unique IDs to app sidebar static items", () => {
// R-P6B-β (AD-2): the generic entity-builder is gone, so AppSidebar no longer
// renders dynamic per-entity / entity-group items.
const sidebar = AppSidebar({ t, i18n, tenantId: "acme", appConfiguration: null });
const ids = flattenSidebarItems(sidebar).map((item) => item.id);
const dynamicEntity = flattenSidebarItems(sidebar).find((item) => item.id === "ui.nav.app.entity.contacts");
expectCompleteUniqueIds(sidebar);
expectStaticItemsHaveIds(sidebar);
expectDynamicItemsHavePatternMetadata(sidebar);
expect(ids).toContain(UI_NAV_IDS.appDashboard);
expect(ids).toContain(UI_NAV_IDS.appSettings);
expect(ids).toContain("ui.nav.app.entity.contacts");
expect(ids).toContain("ui.nav.app.entityGroup.sales");
expect(ids).toContain("ui.nav.app.section.operations");
expect(dynamicEntity?.uiIdPattern).toBe(UI_ID_PATTERNS.appEntity);
expect(dynamicEntity?.uiIdParams).toMatchObject({ entityName: "contacts", entitySlug: "contacts" });
expect(ids).not.toContain("ui.nav.app.entity.contacts");
expect(ids.some((id) => id?.startsWith("ui.nav.app.entity."))).toBe(false);
expect(ids.some((id) => id?.startsWith("ui.nav.app.entityGroup."))).toBe(false);
});
it("assigns unique IDs to docs sidebar items", () => {
@@ -0,0 +1,58 @@
import { readFileSync } from "node:fs";
import { resolve } from "node:path";
import { describe, expect, test } from "vitest";
import { featureKeys, type FeatureKey } from "@hivegrid/entitlements";
// Registry gate for a recurring footgun: AppSidebar gates entries via
// hasFeatureAccess("<key>"), but productAccess is only resolved for the keys in
// appData.ts tenantNavigationFeatureKeys. A key used in the sidebar but missing
// from that list silently hides the entry for ALL tenants/plans (happened to
// files+tasks → fixed in 1017cf58b, then again to dashboard/automation/leads/
// projects/hr/integrations/email-inbox/booking/forms → fixed 2026-07-07 after
// the R-P5 verification). This static contract makes the drift a test failure.
const sidebarSource = readFileSync(resolve(__dirname, "AppSidebar.tsx"), "utf8");
const appDataSource = readFileSync(resolve(__dirname, "../../utils/data/.server/appData.ts"), "utf8");
function usedSidebarFeatureKeys(): string[] {
const keys = new Set<string>();
for (const match of sidebarSource.matchAll(/hasFeatureAccess\("([^"]+)"\)/g)) {
keys.add(match[1]);
}
return [...keys].sort();
}
function resolvedNavigationFeatureKeys(): string[] {
const listMatch = appDataSource.match(/const tenantNavigationFeatureKeys = \[([\s\S]*?)\]/);
if (!listMatch) {
throw new Error("tenantNavigationFeatureKeys list not found in appData.ts");
}
const keys = new Set<string>();
for (const match of listMatch[1].matchAll(/featureKeys\.(\w+)/g)) {
const value = featureKeys[match[1] as keyof typeof featureKeys];
if (!value) {
throw new Error(`Unknown featureKeys entry in tenantNavigationFeatureKeys: ${match[1]}`);
}
keys.add(value);
}
return [...keys].sort();
}
describe("sidebar feature-access registry contract", () => {
test("every hasFeatureAccess key used by AppSidebar is resolved in appData", () => {
const used = usedSidebarFeatureKeys();
const resolved = resolvedNavigationFeatureKeys();
expect(used.length).toBeGreaterThan(0);
const missing = used.filter((key) => !resolved.includes(key));
expect(
missing,
`AppSidebar gates on feature keys that appData.ts tenantNavigationFeatureKeys does not resolve — those sidebar entries are invisible for every tenant. Add them to the list: ${missing.join(", ")}`
).toEqual([]);
});
test("all sidebar gate keys are valid entitlement feature keys", () => {
const validValues = new Set<string>(Object.values(featureKeys));
const invalid = usedSidebarFeatureKeys().filter((key) => !validValues.has(key as FeatureKey));
expect(invalid, `AppSidebar uses gate keys that are no entitlement feature keys: ${invalid.join(", ")}`).toEqual([]);
});
});
@@ -1,9 +1,9 @@
import { describe, expect, it } from "vitest";
import { buttonAdapterNames, buttonAdapters } from "@toolctrl/ui/buttons";
import { layoutAdapterNames, layoutAdapters } from "@toolctrl/ui/layout";
import { navigationAdapterNames, navigationAdapters } from "@toolctrl/ui/navigation";
import { buttonAdapterNames, buttonAdapters } from "@hivegrid/ui/buttons";
import { layoutAdapterNames, layoutAdapters } from "@hivegrid/ui/layout";
import { navigationAdapterNames, navigationAdapters } from "@hivegrid/ui/navigation";
describe("@toolctrl/ui button adapter contract", () => {
describe("@hivegrid/ui button adapter contract", () => {
it("exposes the first available button adapter targets without importing React components", () => {
expect(buttonAdapterNames).toEqual(["Button", "buttonVariants"]);
expect(buttonAdapters).toEqual([
@@ -13,7 +13,7 @@ describe("@toolctrl/ui button adapter contract", () => {
status: "available",
source: "apps/web/app/components/ui/button.tsx",
implementation: "shadcn/radix",
packageExport: "@toolctrl/ui/buttons",
packageExport: "@hivegrid/ui/buttons",
}),
expect.objectContaining({
category: "buttons",
@@ -21,13 +21,13 @@ describe("@toolctrl/ui button adapter contract", () => {
status: "available",
source: "apps/web/app/components/ui/button.tsx",
implementation: "shadcn/radix",
packageExport: "@toolctrl/ui/buttons",
packageExport: "@hivegrid/ui/buttons",
}),
]);
});
});
describe("@toolctrl/ui shell and navigation adapter contracts", () => {
describe("@hivegrid/ui shell and navigation adapter contracts", () => {
it("exposes available layout adapter targets without importing React components", () => {
expect(layoutAdapterNames).toEqual(["ShadcnSidebarLayout", "UiRegistry"]);
expect(layoutAdapters).toEqual([
@@ -37,7 +37,7 @@ describe("@toolctrl/ui shell and navigation adapter contracts", () => {
status: "available",
source: "apps/web/app/components/layouts/sidebars/shadcn/ShadcnSidebarLayout.tsx",
implementation: "shell-layout",
packageExport: "@toolctrl/ui/layout",
packageExport: "@hivegrid/ui/layout",
}),
expect.objectContaining({
category: "layout",
@@ -45,7 +45,7 @@ describe("@toolctrl/ui shell and navigation adapter contracts", () => {
status: "available",
source: "apps/web/app/application/ui/uiRegistry.ts",
implementation: "agent-registry",
packageExport: "@toolctrl/ui/layout",
packageExport: "@hivegrid/ui/layout",
}),
]);
});
@@ -71,6 +71,6 @@ describe("@toolctrl/ui shell and navigation adapter contracts", () => {
expect.objectContaining({ name: "NavActions", source: "apps/web/app/components/layouts/sidebars/shadcn/nav-actions.tsx" }),
expect.objectContaining({ name: "SidebarPrimitives", source: "apps/web/app/components/ui/sidebar.tsx" }),
]);
expect(navigationAdapters.every((adapter) => adapter.status === "available" && adapter.packageExport === "@toolctrl/ui/navigation")).toBe(true);
expect(navigationAdapters.every((adapter) => adapter.status === "available" && adapter.packageExport === "@hivegrid/ui/navigation")).toBe(true);
});
});
@@ -1,9 +1,9 @@
import fs from "node:fs";
import path from "node:path";
import { describe, expect, it } from "vitest";
import { uiAdapterCategories } from "@toolctrl/ui";
import { layoutAdapters } from "@toolctrl/ui/layout";
import { navigationAdapters } from "@toolctrl/ui/navigation";
import { uiAdapterCategories } from "@hivegrid/ui";
import { layoutAdapters } from "@hivegrid/ui/layout";
import { navigationAdapters } from "@hivegrid/ui/navigation";
import { UI_ACTION_IDS, UI_NAV_IDS, UI_SURFACE_IDS } from "~/application/ui/uiRegistry";
import { readRepoDir, repoPathExists } from "~/utils/testing/repoPaths";
@@ -137,7 +137,7 @@ describe("UI surface map", () => {
const uiPlaybook = fs.readFileSync(path.join(process.cwd(), "docs/agent-playbooks/ui-changes.md"), "utf8");
const adapterPlaybook = fs.readFileSync(path.join(process.cwd(), "docs/agent-playbooks/ui-adapter-migration.md"), "utf8");
expect(uiPlaybook).toContain("Identify the target by `data-ui-id`");
expect(adapterPlaybook).toContain("@toolctrl/ui/buttons");
expect(adapterPlaybook).toContain("@hivegrid/ui/buttons");
});
it("matches the declared surface schema shape", () => {
@@ -40,8 +40,16 @@ export const UI_ACTION_IDS = {
export const UI_NAV_IDS = {
appDashboard: "ui.nav.app.dashboard",
appNotifications: "ui.nav.app.notifications",
appSearch: "ui.nav.app.search",
appAutomation: "ui.nav.app.automation",
appCrm: "ui.nav.app.crm",
appLeads: "ui.nav.app.leads",
appProjects: "ui.nav.app.projects",
appEmailMarketing: "ui.nav.app.emailMarketing",
appEmails: "ui.nav.app.emails",
appCalendar: "ui.nav.app.calendar",
appBookings: "ui.nav.app.bookings",
appForms: "ui.nav.app.forms",
appApi: "ui.nav.app.api",
appWorkflowEngine: "ui.nav.app.workflowEngine",
appCredits: "ui.nav.app.credits",
@@ -49,23 +57,15 @@ export const UI_NAV_IDS = {
appSwitchToAdmin: "ui.nav.app.switchToAdmin",
adminDashboard: "ui.nav.admin.dashboard",
adminAccounts: "ui.nav.admin.accounts",
adminAnalytics: "ui.nav.admin.analytics",
adminEntities: "ui.nav.admin.entities",
adminWorkflows: "ui.nav.admin.workflows",
adminApi: "ui.nav.admin.api",
adminEvents: "ui.nav.admin.events",
adminAuditTrails: "ui.nav.admin.auditTrails",
adminAudit: "ui.nav.admin.audit",
adminNotifications: "ui.nav.admin.notifications",
adminFeatureFlags: "ui.nav.admin.featureFlags",
adminNavigation: "ui.nav.admin.navigation",
adminPortals: "ui.nav.admin.portals",
adminPrompts: "ui.nav.admin.prompts",
adminEmailMarketing: "ui.nav.admin.emailMarketing",
adminMarketing: "ui.nav.admin.marketing",
adminKnowledgeBase: "ui.nav.admin.knowledgeBase",
adminHelpDesk: "ui.nav.admin.helpDesk",
adminOnboarding: "ui.nav.admin.onboarding",
adminMetrics: "ui.nav.admin.metrics",
adminSettings: "ui.nav.admin.settings",
adminSwitchToApp: "ui.nav.admin.switchToApp",
docsIntroduction: "ui.nav.docs.introduction",