@cosmicdrift/kumiko-bundled-features 0.327.0 → 0.328.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.327.0",
+  "version": "0.328.0",
   "description": "Built-in features — tenant, user, auth, delivery. The stuff you'd rewrite anyway, already typed.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -134,12 +134,12 @@
     "./workflow-runner": "./src/workflow-runner/index.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.327.0",
-    "@cosmicdrift/kumiko-framework": "0.327.0",
-    "@cosmicdrift/kumiko-headless": "0.327.0",
-    "@cosmicdrift/kumiko-renderer": "0.327.0",
-    "@cosmicdrift/kumiko-renderer-web": "0.327.0",
-    "@cosmicdrift/kumiko-types": "0.327.0",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.328.0",
+    "@cosmicdrift/kumiko-framework": "0.328.0",
+    "@cosmicdrift/kumiko-headless": "0.328.0",
+    "@cosmicdrift/kumiko-renderer": "0.328.0",
+    "@cosmicdrift/kumiko-renderer-web": "0.328.0",
+    "@cosmicdrift/kumiko-types": "0.328.0",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/mailparser": "^3.4.6",
@@ -167,8 +167,8 @@
   ],
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
-    "@cosmicdrift/kumiko-locale-de": "0.327.0",
-    "@cosmicdrift/kumiko-locale-es": "0.327.0",
+    "@cosmicdrift/kumiko-locale-de": "0.328.0",
+    "@cosmicdrift/kumiko-locale-es": "0.328.0",
     "jsqr": "^1.4.0"
   }
 }

package/src/auth-email-password/changes.json

@@ -1,4 +1,10 @@
 [
+  {
+    "version": "0.328.0",
+    "type": "improvement",
+    "title": "User menu and tenant menu items fit the new shell",
+    "detail": "The web user menu and tenant menu items are adapted to the sidebar footer user block, which now hosts the tenant, language and theme controls."
+  },
   {
     "version": "0.323.0",
     "type": "improvement",

package/src/auth-email-password/web/__tests__/user-menu.test.tsx

@@ -1,7 +1,9 @@
-import { describe, expect, test } from "bun:test";
-import { SidebarProvider } from "@cosmicdrift/kumiko-renderer-web";
+import { describe, expect, mock, test } from "bun:test";
+import { TokensProvider } from "@cosmicdrift/kumiko-renderer";
+import { SidebarProvider, ThemeMenuItem } from "@cosmicdrift/kumiko-renderer-web";
 import { screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { TenantMenuItems } from "../tenant-menu-items";
 import { UserMenu } from "../user-menu";
 import { makeSessionApi, renderWithProviders } from "./test-utils";
 
@@ -77,4 +79,38 @@ describe("UserMenu", () => {
     await user.click(screen.getByRole("button", { name: /Alice Wonder/ }));
     expect(screen.getByText("Sign out")).toBeTruthy();
   });
+
+  test("sidebar variant: tenant and theme controls live inside the menu, not beside the row", async () => {
+    const user = userEvent.setup();
+    const switchTenant = mock(async () => {});
+    const session = makeSessionApi({
+      tenants: [
+        { tenantId: "tenant-1", name: "Alpha", roles: ["Admin"] },
+        { tenantId: "tenant-2", name: "Beta", roles: ["Admin"] },
+      ],
+      switchTenant,
+    });
+    const tokens = {
+      tokens: {} as never,
+      mode: "light" as const,
+      setMode: () => {},
+      toggleMode: () => {},
+    };
+    renderWithProviders(
+      <TokensProvider value={tokens}>
+        <SidebarProvider>
+          <UserMenu variant="sidebar">
+            <TenantMenuItems />
+            <ThemeMenuItem />
+          </UserMenu>
+        </SidebarProvider>
+      </TokensProvider>,
+      { session },
+    );
+    expect(screen.queryByText("Beta")).toBeNull();
+    await user.click(screen.getByRole("button", { name: /Test User/ }));
+    await user.click(screen.getByText("Beta"));
+    expect(switchTenant).toHaveBeenCalledWith("tenant-2");
+    expect(screen.getByText(/Modus/)).toBeTruthy();
+  });
 });

package/src/auth-email-password/web/index.ts

@@ -63,6 +63,8 @@ export type { SignupCompleteScreenProps } from "./signup-complete-screen";
 export { SignupCompleteScreen } from "./signup-complete-screen";
 export type { SignupScreenProps } from "./signup-screen";
 export { SignupScreen } from "./signup-screen";
+export type { TenantMenuItemsProps } from "./tenant-menu-items";
+export { TenantMenuItems } from "./tenant-menu-items";
 export type { TenantSwitcherProps } from "./tenant-switcher";
 export { TenantSwitcher } from "./tenant-switcher";
 export type { ShellUser } from "./use-shell-user";

package/src/auth-email-password/web/tenant-menu-items.tsx

@@ -0,0 +1,47 @@
+// @runtime client
+// Tenant choices as dropdown entries — the TenantSwitcher's list for a user
+// menu that carries the shell controls. Renders nothing for a single tenant.
+
+import { useTranslation } from "@cosmicdrift/kumiko-renderer";
+import {
+  DropdownMenuCheckboxItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+} from "@cosmicdrift/kumiko-renderer-web";
+import type { ReactNode } from "react";
+import { useSession } from "./session";
+
+export type TenantMenuItemsProps = {
+  readonly tenantName?: (tenantId: string) => string;
+};
+
+export function TenantMenuItems({ tenantName }: TenantMenuItemsProps): ReactNode {
+  const t = useTranslation();
+  const { user, tenants, activeTenantId, switchTenant } = useSession();
+  if (user === null || tenants.length <= 1) return null;
+
+  const nameOf = (tenantId: string): string => {
+    if (tenantName !== undefined) return tenantName(tenantId);
+    const membership = tenants.find((m) => m.tenantId === tenantId);
+    return membership?.name || membership?.key || tenantId.slice(0, 8);
+  };
+
+  return (
+    <>
+      <DropdownMenuLabel>{t("auth.tenant.switcher.label")}</DropdownMenuLabel>
+      {tenants.map((membership) => (
+        <DropdownMenuCheckboxItem
+          key={membership.tenantId}
+          checked={membership.tenantId === activeTenantId}
+          onSelect={(event) => {
+            event.preventDefault();
+            if (membership.tenantId !== activeTenantId) void switchTenant(membership.tenantId);
+          }}
+        >
+          <span className="truncate">{nameOf(membership.tenantId)}</span>
+        </DropdownMenuCheckboxItem>
+      ))}
+      <DropdownMenuSeparator />
+    </>
+  );
+}

package/src/auth-email-password/web/user-menu.tsx

@@ -63,13 +63,21 @@ export function UserMenu({ children, variant = "pill" }: UserMenuProps): ReactNo
   const avatarText = initials(displayName);
 
   const content = (
-    <DropdownMenuContent align="end" aria-label={t("auth.user.menu.label")}>
+    <DropdownMenuContent
+      align={variant === "sidebar" ? "start" : "end"}
+      aria-label={t("auth.user.menu.label")}
+    >
       <DropdownMenuLabel className="text-xs">
         <div className="font-medium text-foreground truncate">{displayName}</div>
         {hasName && <div className="truncate">{user.email}</div>}
       </DropdownMenuLabel>
       <DropdownMenuSeparator />
-      {children}
+      {children !== undefined && (
+        <>
+          {children}
+          <DropdownMenuSeparator />
+        </>
+      )}
       <DropdownMenuItem onSelect={() => void logout()}>
         <LogOut className="h-4 w-4" />
         <span>{t("auth.user.menu.logout")}</span>
@@ -91,15 +99,19 @@ export function UserMenu({ children, variant = "pill" }: UserMenuProps): ReactNo
               >
                 <span
                   aria-hidden="true"
-                  className="flex aspect-square size-8 items-center justify-center rounded-lg bg-muted text-xs font-medium text-muted-foreground"
+                  className="flex size-7 shrink-0 items-center justify-center rounded-full bg-sidebar-accent text-xs font-medium text-sidebar-accent-foreground"
                 >
                   {avatarText}
                 </span>
                 <div className="grid flex-1 text-left text-sm leading-tight">
-                  <span className="truncate font-semibold">{displayName}</span>
-                  {hasName && <span className="truncate text-xs">{user.email}</span>}
+                  <span className="truncate font-medium text-sidebar-foreground">
+                    {displayName}
+                  </span>
+                  {hasName && (
+                    <span className="truncate text-xs text-sidebar-muted">{user.email}</span>
+                  )}
                 </div>
-                <ChevronsUpDown className="ml-auto size-4" />
+                <ChevronsUpDown className="ml-auto size-4 text-sidebar-muted" />
               </SidebarMenuButton>
             </DropdownMenuTrigger>
             {content}

package/src/jobs/__tests__/projection-rebuild-job.integration.test.ts

@@ -15,6 +15,7 @@ import {
   table as pgTable,
   selectMany,
   type TenantDb,
+  text,
   uuid,
 } from "@cosmicdrift/kumiko-framework/db";
 import {
@@ -23,6 +24,7 @@ import {
   createTextField,
   defineApply,
   defineFeature,
+  defineMspApply,
   type ProjectionDefinition,
 } from "@cosmicdrift/kumiko-framework/engine";
 import { createJobRunner, type JobRunner } from "@cosmicdrift/kumiko-framework/jobs";
@@ -30,7 +32,10 @@ import {
   enqueueProjectionRebuild,
   PROJECTION_REBUILD_JOB,
 } from "@cosmicdrift/kumiko-framework/migrations";
-import { createProjectionStateTable } from "@cosmicdrift/kumiko-framework/pipeline";
+import {
+  createEventConsumerStateTable,
+  createProjectionStateTable,
+} from "@cosmicdrift/kumiko-framework/pipeline";
 import {
   createTestDb,
   createTestRedis,
@@ -79,12 +84,32 @@ const countsProjection: ProjectionDefinition = {
   },
 };
 
+const itemNamesTable = pgTable("read_rebuild_msp_names", {
+  id: uuid("id").primaryKey(),
+  tenantId: uuid("tenant_id").notNull(),
+  name: text("name").notNull(),
+});
+
 const PROJECTION = "rebuildtest:projection:rebuild-counts";
+const MSP_PROJECTION = "rebuildtest:projection:rebuild-item-names";
 const GROUP = "00000000-0000-4000-8000-000000000001";
 
 const appFeature = defineFeature("rebuildtest", (r) => {
   r.entity("rebuild-item", itemEntity);
   r.projection(countsProjection);
+  r.multiStreamProjection({
+    name: "rebuild-item-names",
+    table: itemNamesTable,
+    apply: {
+      "rebuild-item.created": defineMspApply<{ name: string }>(async (event, tx) => {
+        await asRawClient(tx).unsafe(
+          `INSERT INTO "read_rebuild_msp_names" (id, tenant_id, name) VALUES ($1::uuid, $2::uuid, $3)
+           ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name`,
+          [event.aggregateId, event.tenantId, event.payload.name],
+        );
+      }),
+    },
+  });
 });
 
 const admin = TestUsers.admin;
@@ -103,7 +128,13 @@ beforeAll(async () => {
 
   await unsafeCreateEntityTable(db, itemEntity, "rebuild-item");
   await createProjectionStateTable(db);
-  await unsafePushTables(db, { readRebuildCounts: countsTable, jobRunsTable, jobRunLogsTable });
+  await createEventConsumerStateTable(db);
+  await unsafePushTables(db, {
+    readRebuildCounts: countsTable,
+    readRebuildMspNames: itemNamesTable,
+    jobRunsTable,
+    jobRunLogsTable,
+  });
   tdb = createTenantDb(db, admin.tenantId);
 
   const redisUrl = `redis://${testRedis.redis.options.host}:${testRedis.redis.options.port}/${testRedis.redis.options.db}`;
@@ -168,4 +199,32 @@ describe("projection-rebuild job (jobs feature composed)", () => {
     expect(runs.length).toBeGreaterThanOrEqual(1);
     expect(runs.some((r) => r.status === "completed")).toBe(true);
   }, 30000);
+
+  test("enqueueProjectionRebuild refills a multi-stream projection through the job", async () => {
+    await executor.create({ groupId: GROUP, name: "msp-a" }, admin, tdb);
+    await asRawClient(db).unsafe('DELETE FROM "read_rebuild_msp_names"');
+    expect(await selectMany(db, itemNamesTable)).toHaveLength(0);
+
+    const outcome = await enqueueProjectionRebuild(MSP_PROJECTION, { db, registry, jobRunner });
+    if (outcome.mode !== "dispatched") throw new Error(`expected dispatch, got ${outcome.mode}`);
+
+    await waitFor(async () => (await selectMany(db, itemNamesTable)).length > 0, {
+      delays: Array(40).fill(200),
+    });
+    const names = (await selectMany<{ name: string }>(db, itemNamesTable)).map((r) => r.name);
+    expect(names).toContain("msp-a");
+
+    let status: string | undefined;
+    await waitFor(
+      async () => {
+        const [run] = await selectMany<{ status: string }>(db, jobRunsTable, {
+          bullJobId: outcome.bullJobId,
+        });
+        status = run?.status;
+        return status === "completed" || status === "failed";
+      },
+      { delays: Array(40).fill(200) },
+    );
+    expect(status).toBe("completed");
+  }, 30000);
 });

package/src/jobs/handlers/projection-rebuild.job.ts

@@ -3,7 +3,7 @@
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import type { JobHandlerFn } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
-import { rebuildProjection } from "@cosmicdrift/kumiko-framework/pipeline";
+import { rebuildProjectionOrMultiStream } from "@cosmicdrift/kumiko-framework/migrations";
 import * as z from "zod";
 
 export const projectionRebuildPayloadSchema = z.object({
@@ -31,7 +31,7 @@ export const projectionRebuildJob: JobHandlerFn = async (rawPayload, ctx): Promi
   // documents that instead of the previous implicit ctx.db cast.
   ctx.systemDb.acknowledgeCrossTenant("global projection rebuild");
   const db = ctx.systemDb.unsafeRaw("projection rebuild spans every tenant's rows") as DbConnection; // @cast-boundary db-operator — DbRunner narrows to DbConnection, jobs never run inside a DbTx
-  const result = await rebuildProjection(projection, {
+  const result = await rebuildProjectionOrMultiStream(projection, {
     db,
     registry: ctx.registry,
     ...(skipApplyErrors === true && { errorPolicy: { skipApplyErrors: true } }),