@phis/ui 0.2.1 → 0.3.0

package/plugins/runtime-modules/auth/trees/phi-default-pub-login-page-tree.js

@@ -3,10 +3,12 @@ import { PHI_SPACE } from "../../../../theme/antd-css-var-contract";
 import { PHI_LAYOUT } from "../../../../theme/phi-tokens";
 import { PHI_AUTH_RUNTIME_MODULE_ID } from "../ids";
 import { PHI_CMS_DEFAULT_SLOT_INDEX, PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX, } from "../../../../constants/cms-layout-types";
-import { PhiCmsPageType, PhiCmsRegionType } from "../../../../constants/phi-cms";
+import { PhiCmsPageType } from "../../../../constants/phi-cms";
+import { buildPhiBasePageContentScaffold, PHI_BASE_PAGE_LAYOUT_NODE_ID, } from "../../../../components/regions/presets/phi-base-page-layout";
 import { createPhiCmsPresetNodes } from "../../../../helpers/cms-preset-nodes";
 import { buildPhiLoginNodes, PHI_LOGIN_FORM_LAYOUT_CONFIG, } from "./phi-login-form-nodes";
 import { createPhiAuthControllerAddress } from "../controller/address";
+import { PHI_SURFACE_CARD } from "../../../../helpers/surface-presets";
 const SYNTHETIC_LOGIN_REGION_IDS = {
     regionContent: -230,
 };
@@ -15,7 +17,7 @@ export async function buildPhiDefaultPubLoginPageTree({ page, presetKey, runtime
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
         presetKey,
-    }, ["layoutContent", "layoutForm"]);
+    }, ["layoutContent", "layoutForm", "layoutAside"]);
     const SYNTHETIC_LOGIN_WIDGET_IDS = createPhiPresetCmsInstanceIdMap({
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
@@ -36,32 +38,34 @@ export async function buildPhiDefaultPubLoginPageTree({ page, presetKey, runtime
         authControllerAddress: createPhiAuthControllerAddress(),
     });
     const nodes = createPhiCmsPresetNodes(page);
+    const scaffold = buildPhiBasePageContentScaffold({ page, regionId: SYNTHETIC_LOGIN_REGION_IDS.regionContent });
     return {
         page: nodes.page({ pageType: PhiCmsPageType.Standard }),
         overlays: [],
-        regions: [
-            nodes.region({
-                id: SYNTHETIC_LOGIN_REGION_IDS.regionContent,
-                regionType: PhiCmsRegionType.Content,
-                rootLayoutNodeId: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutContent,
-                sortOrder: 30,
-            }),
-        ],
+        regions: [scaffold.region],
         layoutNodes: [
+            // The base scaffold every module Page stands on; it carries the page's padding, the card its own.
+            scaffold.layoutNode,
             nodes.layout({
                 creationPreset: { layoutKind: "split", preset: "panel" },
                 typeKey: "split-card",
                 id: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutContent,
-                parentLayoutNodeId: null,
+                parentLayoutNodeId: PHI_BASE_PAGE_LAYOUT_NODE_ID,
                 slotIndex: PHI_CMS_DEFAULT_SLOT_INDEX,
                 sortOrder: 0,
                 label: "pub login page",
-                config: {
-                    gap: PHI_SPACE.base,
-                },
+                // The inset of the cards; a Split Card has none of its own.
+                config: { padding: PHI_SPACE.base },
+            }),
+            nodes.layout({
+                typeKey: "flex-vertical",
+                id: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutAside,
+                parentLayoutNodeId: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutContent,
+                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                sortOrder: 0,
+                label: "pub login aside layout",
             }),
             nodes.layout({
-                creationPreset: { layoutKind: "verticalflex", preset: "panel" },
                 typeKey: "flex-vertical",
                 id: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutForm,
                 parentLayoutNodeId: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutContent,
@@ -80,7 +84,6 @@ export async function buildPhiDefaultPubLoginPageTree({ page, presetKey, runtime
                  */
                 config: {
                     ...PHI_LOGIN_FORM_LAYOUT_CONFIG,
-                    padding: 0,
                     anchor: { horizontal: "center", vertical: "middle" },
                 },
             }),
@@ -90,8 +93,8 @@ export async function buildPhiDefaultPubLoginPageTree({ page, presetKey, runtime
             nodes.widget({
                 typeKey: "description",
                 id: SYNTHETIC_LOGIN_WIDGET_IDS.widgetDescription,
-                parentLayoutNodeId: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutContent,
-                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                parentLayoutNodeId: SYNTHETIC_LOGIN_LAYOUT_IDS.layoutAside,
+                slotIndex: 0,
                 sortOrder: 0,
                 label: "pub login description widget",
                 config: {
@@ -100,10 +103,11 @@ export async function buildPhiDefaultPubLoginPageTree({ page, presetKey, runtime
                     description: "Access your customer workspace, orders, and account details.",
                     asideTitle: "What you can do",
                     asideItems: [
-                        "Review orders and customer details.",
-                        "Continue to the page you originally requested.",
-                        "Reset your password if you no longer have access.",
+                        { text: "Review orders and customer details." },
+                        { text: "Continue to the page you originally requested." },
+                        { text: "Reset your password if you no longer have access." },
                     ],
+                    asideList: { itemSurface: PHI_SURFACE_CARD },
                     footer: "Use the secure sign-in form to continue to your account area.",
                 },
             }),

package/plugins/runtime-modules/auth/trees/phi-default-pub-registration-page-tree.js

@@ -3,9 +3,11 @@ import { PHI_SPACE } from "../../../../theme/antd-css-var-contract";
 import { PHI_AUTH_RUNTIME_MODULE_ID } from "../ids";
 import { localizeAreaPath } from "../../../../helpers/locale";
 import { PHI_CMS_DEFAULT_SLOT_INDEX, PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX, } from "../../../../constants/cms-layout-types";
-import { PhiCmsPageType, PhiCmsRegionType } from "../../../../constants/phi-cms";
+import { PhiCmsPageType } from "../../../../constants/phi-cms";
+import { buildPhiBasePageContentScaffold, PHI_BASE_PAGE_LAYOUT_NODE_ID, } from "../../../../components/regions/presets/phi-base-page-layout";
 import { createPhiCmsPresetNodes } from "../../../../helpers/cms-preset-nodes";
 import { PHI_SHARED_FORM_IDS } from "../../../../components/forms/shared-form-ids";
+import { PHI_SURFACE_CARD } from "../../../../helpers/surface-presets";
 const SYNTHETIC_REGISTER_REGION_IDS = {
     regionContent: -200,
 };
@@ -14,54 +16,55 @@ export async function buildPhiDefaultPubRegistrationPageTree({ page, presetKey,
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
         presetKey,
-    }, ["layoutContent", "layoutForm"]);
+    }, ["layoutContent", "layoutForm", "layoutAside"]);
     const SYNTHETIC_REGISTER_WIDGET_IDS = createPhiPresetCmsInstanceIdMap({
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
         presetKey,
     }, ["widgetDescription", "widgetRegistration", "widgetRegistrationNotice"]);
     const nodes = createPhiCmsPresetNodes(page);
+    const scaffold = buildPhiBasePageContentScaffold({ page, regionId: SYNTHETIC_REGISTER_REGION_IDS.regionContent });
     return {
         page: nodes.page({ pageType: PhiCmsPageType.Standard }),
         overlays: [],
-        regions: [
-            nodes.region({
-                id: SYNTHETIC_REGISTER_REGION_IDS.regionContent,
-                regionType: PhiCmsRegionType.Content,
-                rootLayoutNodeId: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutContent,
-                sortOrder: 30,
-            }),
-        ],
+        regions: [scaffold.region],
         layoutNodes: [
+            // The base scaffold every module Page stands on; it carries the page's padding, the card its own.
+            scaffold.layoutNode,
             nodes.layout({
                 creationPreset: { layoutKind: "split", preset: "panel" },
                 typeKey: "split-card",
                 id: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutContent,
-                parentLayoutNodeId: null,
+                parentLayoutNodeId: PHI_BASE_PAGE_LAYOUT_NODE_ID,
                 slotIndex: PHI_CMS_DEFAULT_SLOT_INDEX,
                 sortOrder: 0,
                 label: "pub registration page",
-                config: {
-                    gap: PHI_SPACE.base,
-                },
+                // The inset of the cards; a Split Card has none of its own.
+                config: { padding: PHI_SPACE.base },
+            }),
+            nodes.layout({
+                typeKey: "flex-vertical",
+                id: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutAside,
+                parentLayoutNodeId: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutContent,
+                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                sortOrder: 0,
+                label: "pub registration aside layout",
             }),
             nodes.layout({
-                creationPreset: { layoutKind: "verticalflex", preset: "panel" },
                 typeKey: "flex-vertical",
                 id: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutForm,
                 parentLayoutNodeId: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutContent,
                 slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Right,
                 sortOrder: 0,
                 label: "pub registration form layout",
-                config: { padding: 0 },
             }),
         ],
         contentWidgets: [
             nodes.widget({
                 typeKey: "description",
                 id: SYNTHETIC_REGISTER_WIDGET_IDS.widgetDescription,
-                parentLayoutNodeId: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutContent,
-                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                parentLayoutNodeId: SYNTHETIC_REGISTER_LAYOUT_IDS.layoutAside,
+                slotIndex: 0,
                 sortOrder: 0,
                 label: "pub registration description widget",
                 config: {
@@ -70,10 +73,11 @@ export async function buildPhiDefaultPubRegistrationPageTree({ page, presetKey,
                     description: "Create your account to access your personalized workspace.",
                     asideTitle: "Benefits",
                     asideItems: [
-                        "Manage orders and account details.",
-                        "Confirm your email to activate access.",
-                        "Receive optional updates and product news.",
+                        { text: "Manage orders and account details." },
+                        { text: "Confirm your email to activate access." },
+                        { text: "Receive optional updates and product news." },
                     ],
+                    asideList: { itemSurface: PHI_SURFACE_CARD },
                     footer: "Complete the form and confirm the link in your email to finish registration.",
                 },
             }),

package/plugins/runtime-modules/auth/trees/phi-default-pub-reset-password-page-tree.js

@@ -2,9 +2,11 @@ import { createPhiPresetCmsInstanceIdMap } from "../../../../types/cms-instance-
 import { PHI_SPACE } from "../../../../theme/antd-css-var-contract";
 import { PHI_AUTH_RUNTIME_MODULE_ID } from "../ids";
 import { PHI_CMS_DEFAULT_SLOT_INDEX, PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX, } from "../../../../constants/cms-layout-types";
-import { PhiCmsPageType, PhiCmsRegionType } from "../../../../constants/phi-cms";
+import { PhiCmsPageType } from "../../../../constants/phi-cms";
+import { buildPhiBasePageContentScaffold, PHI_BASE_PAGE_LAYOUT_NODE_ID, } from "../../../../components/regions/presets/phi-base-page-layout";
 import { createPhiCmsPresetNodes } from "../../../../helpers/cms-preset-nodes";
 import { PHI_SHARED_FORM_IDS } from "../../../../components/forms/shared-form-ids";
+import { PHI_SURFACE_CARD } from "../../../../helpers/surface-presets";
 const SYNTHETIC_RESET_PASSWORD_REGION_IDS = {
     regionContent: -270,
 };
@@ -13,7 +15,7 @@ export async function buildPhiDefaultPubResetPasswordPageTree({ page, presetKey,
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
         presetKey,
-    }, ["layoutContent", "layoutForm"]);
+    }, ["layoutContent", "layoutForm", "layoutAside"]);
     const SYNTHETIC_RESET_PASSWORD_WIDGET_IDS = createPhiPresetCmsInstanceIdMap({
         domain: "page",
         ownerModuleId: PHI_AUTH_RUNTIME_MODULE_ID,
@@ -42,47 +44,48 @@ export async function buildPhiDefaultPubResetPasswordPageTree({ page, presetKey,
         operator: "truthy",
     };
     const nodes = createPhiCmsPresetNodes(page);
+    const scaffold = buildPhiBasePageContentScaffold({ page, regionId: SYNTHETIC_RESET_PASSWORD_REGION_IDS.regionContent });
     return {
         page: nodes.page({ pageType: PhiCmsPageType.Standard }),
         overlays: [],
-        regions: [
-            nodes.region({
-                id: SYNTHETIC_RESET_PASSWORD_REGION_IDS.regionContent,
-                regionType: PhiCmsRegionType.Content,
-                rootLayoutNodeId: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutContent,
-                sortOrder: 30,
-            }),
-        ],
+        regions: [scaffold.region],
         layoutNodes: [
+            // The base scaffold every module Page stands on; it carries the page's padding, the card its own.
+            scaffold.layoutNode,
             nodes.layout({
                 creationPreset: { layoutKind: "split", preset: "panel" },
                 typeKey: "split-card",
                 id: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutContent,
-                parentLayoutNodeId: null,
+                parentLayoutNodeId: PHI_BASE_PAGE_LAYOUT_NODE_ID,
                 slotIndex: PHI_CMS_DEFAULT_SLOT_INDEX,
                 sortOrder: 0,
                 label: "pub reset password page",
-                config: {
-                    gap: PHI_SPACE.base,
-                },
+                // The inset of the cards; a Split Card has none of its own.
+                config: { padding: PHI_SPACE.base },
+            }),
+            nodes.layout({
+                typeKey: "flex-vertical",
+                id: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutAside,
+                parentLayoutNodeId: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutContent,
+                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                sortOrder: 0,
+                label: "pub reset password aside layout",
             }),
             nodes.layout({
-                creationPreset: { layoutKind: "verticalflex", preset: "panel" },
                 typeKey: "flex-vertical",
                 id: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutForm,
                 parentLayoutNodeId: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutContent,
                 slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Right,
                 sortOrder: 0,
                 label: "pub reset password form layout",
-                config: { padding: 0 },
             }),
         ],
         contentWidgets: [
             nodes.widget({
                 typeKey: "description",
                 id: SYNTHETIC_RESET_PASSWORD_WIDGET_IDS.widgetDescription,
-                parentLayoutNodeId: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutContent,
-                slotIndex: PHI_CMS_SPLIT_LAYOUT_SLOT_INDEX.Left,
+                parentLayoutNodeId: SYNTHETIC_RESET_PASSWORD_LAYOUT_IDS.layoutAside,
+                slotIndex: 0,
                 sortOrder: 0,
                 label: "pub reset password description widget",
                 config: {
@@ -91,10 +94,11 @@ export async function buildPhiDefaultPubResetPasswordPageTree({ page, presetKey,
                     description: "Use the reset link from your email to choose a new secure password.",
                     asideTitle: "What happens next",
                     asideItems: [
-                        "Open the reset link from your email.",
-                        "Choose a new password and confirm it.",
-                        "Sign in again with your updated password.",
+                        { text: "Open the reset link from your email." },
+                        { text: "Choose a new password and confirm it." },
+                        { text: "Sign in again with your updated password." },
                     ],
+                    asideList: { itemSurface: PHI_SURFACE_CARD },
                     footer: "If the link expired, request a new reset email from the login page.",
                 },
             }),

package/plugins/runtime-modules/auth/trees/security-label-set.js

@@ -1,7 +1,8 @@
 import "server-only";
 import { PHI_TR_CTX_WEB_UI_LABEL } from "../../../../gateway/tr";
-import { definePhiLabelSet, getPhiLabelSet } from "../../../../gateway/label-set";
-const PHI_SECURITY_PAGE_LABEL_SET = definePhiLabelSet({
+import { definePhiRuntimeModuleLabelSet, getPhiLabelSet } from "../../../../gateway/label-set";
+import { PHI_AUTH_RUNTIME_MODULE_IDENTITY } from "../ids";
+const PHI_SECURITY_PAGE_LABEL_SET = definePhiRuntimeModuleLabelSet(PHI_AUTH_RUNTIME_MODULE_IDENTITY, {
     key: "preset:security-page",
     ctx: PHI_TR_CTX_WEB_UI_LABEL,
     labels: {

package/plugins/runtime-modules/auth/widgets/auth-methods/config.d.ts

@@ -6,7 +6,7 @@
  * a Site with no external provider configured simply does not place anything.
  */
 export type PhiCmsAuthMethodsWidgetConfig = Record<string, never>;
-export declare function parsePhiAuthMethodsWidgetConfig(): PhiCmsAuthMethodsWidgetConfig;
+declare function parsePhiAuthMethodsWidgetConfig(): PhiCmsAuthMethodsWidgetConfig;
 export declare const PHI_AUTH_METHODS_WIDGET_DEFINITION: {
     kind: "widget";
     pluginKey: string;
@@ -21,3 +21,4 @@ export declare const PHI_AUTH_METHODS_WIDGET_DEFINITION: {
     defaultConfig: {};
     parseConfig: typeof parsePhiAuthMethodsWidgetConfig;
 };
+export {};

package/plugins/runtime-modules/auth/widgets/auth-methods/config.js

@@ -1,5 +1,5 @@
 import { resolvePhiCmsWidgetPluginKey } from "../../../../../constants/cms-widget-types";
-export function parsePhiAuthMethodsWidgetConfig() {
+function parsePhiAuthMethodsWidgetConfig() {
     return {};
 }
 export const PHI_AUTH_METHODS_WIDGET_DEFINITION = {

package/plugins/runtime-modules/auth/widgets/auth-workflow/client.js

@@ -1,5 +1,6 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { isPhiRecord } from "../../../../../helpers/is-record";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { PhiAuthWorkflowBody } from "../../../../../components/widgets/client/auth-workflow-body";
 import { usePhiSignalListener } from "../../../../../components/runtime/runtime-signal-bus";
@@ -15,10 +16,10 @@ import { PHI_AUTH_MACHINE_STATEMENTS } from "../../machine";
  * and this draws whatever it is told.
  */
 function readWorkflow(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value))
+    if (!isPhiRecord(value))
         return null;
     const workflow = value.workflow;
-    return workflow && typeof workflow === "object" && !Array.isArray(workflow)
+    return isPhiRecord(workflow)
         ? workflow
         : null;
 }

package/plugins/runtime-modules/auth/widgets/auth-workflow/config.d.ts

@@ -11,7 +11,7 @@ import { readPhiSignalRouteSet } from "../../../../../types/signals";
 export type PhiCmsAuthWorkflowWidgetConfig = {
     signalRoutes: ReturnType<typeof readPhiSignalRouteSet>;
 };
-export declare function parsePhiAuthWorkflowWidgetConfig(rawConfig: Record<string, unknown>): PhiCmsAuthWorkflowWidgetConfig;
+declare function parsePhiAuthWorkflowWidgetConfig(rawConfig: Record<string, unknown>): PhiCmsAuthWorkflowWidgetConfig;
 export declare const PHI_AUTH_WORKFLOW_WIDGET_DEFINITION: {
     kind: "widget";
     pluginKey: string;
@@ -54,3 +54,4 @@ export declare const PHI_AUTH_WORKFLOW_WIDGET_DEFINITION: {
     };
     parseConfig: typeof parsePhiAuthWorkflowWidgetConfig;
 };
+export {};

package/plugins/runtime-modules/auth/widgets/auth-workflow/config.js

@@ -1,6 +1,6 @@
 import { resolvePhiCmsWidgetPluginKey } from "../../../../../constants/cms-widget-types";
 import { findPhiSignalRoutesByCapabilityId, PHI_SIGNAL_VALUE_SCHEMAS, readPhiControllerSignalAddressParts, readPhiSignalRouteSet, } from "../../../../../types/signals";
-export function parsePhiAuthWorkflowWidgetConfig(rawConfig) {
+function parsePhiAuthWorkflowWidgetConfig(rawConfig) {
     return { signalRoutes: readPhiSignalRouteSet(rawConfig.signalRoutes) };
 }
 /**

package/plugins/runtime-modules/auth/widgets/logout/client.d.ts

@@ -1,6 +1,8 @@
 import type { PhiBlockRuntime, PhiClientBlockBaseProps } from "../../../../../types";
-export declare function PhiAuthLogoutWidgetClient({ runtime, }: PhiClientBlockBaseProps<Record<string, never>, {
+import type { PhiAuthLogoutWidgetLabels } from "../../../../../components/widgets/label-types/logout";
+export declare function PhiAuthLogoutWidgetClient({ runtime, labels, }: PhiClientBlockBaseProps<PhiAuthLogoutWidgetLabels, {
     padding?: number | string;
 }, Pick<PhiBlockRuntime, "site" | "locale">> & {
     runtime: Pick<PhiBlockRuntime, "site" | "locale">;
+    labels: PhiAuthLogoutWidgetLabels;
 }): import("react").JSX.Element;

package/plugins/runtime-modules/auth/widgets/logout/client.js

@@ -4,29 +4,34 @@ import { requestPhiLogout } from "../../../../../helpers/logout";
 import { useEffect, useState } from "react";
 import { PhiButtonControl } from "../../../../../components/controls/phi-button-control";
 import { PhiAlertControl } from "../../../../../components/controls/phi-alert-control";
+import { localizePath } from "../../../../../helpers/locale";
 import { PhiFlexControl } from "../../../../../components/controls/phi-flex-control";
 import { PhiTypographyControl } from "../../../../../components/controls/phi-typography-control";
 import { PhiSpinControl } from "../../../../../components/controls/phi-spin-control";
-export function PhiAuthLogoutWidgetClient({ runtime, }) {
+export function PhiAuthLogoutWidgetClient({ runtime, labels, }) {
     const [error, setError] = useState(null);
     const locale = runtime.locale.current;
     const siteKey = runtime.site.key;
+    const failedLabel = labels.failed;
     useEffect(() => {
         const controller = new AbortController();
         async function logout() {
             try {
-                await requestPhiLogout({ signal: controller.signal, failedMessage: "Logout failed." });
-                /* Replaced, not assigned: Back must not return to a sign-out that already happened. */
-                window.location.replace(`/${locale}`);
+                await requestPhiLogout({ signal: controller.signal, failedMessage: failedLabel });
+                /*
+                 * Replaced, not assigned: Back must not return to a sign-out that already happened. The start
+                 * page in this locale, built the way every other address is rather than by hand.
+                 */
+                window.location.replace(localizePath(locale, "/"));
             }
             catch (caught) {
                 if (!controller.signal.aborted) {
-                    setError(caught instanceof Error ? caught.message : "Logout failed.");
+                    setError(caught instanceof Error ? caught.message : failedLabel);
                 }
             }
         }
         void logout();
         return () => controller.abort();
-    }, [locale, siteKey]);
-    return (_jsx(PhiFlexControl, { vertical: true, align: "center", gap: "middle", children: error ? (_jsxs(_Fragment, { children: [_jsx(PhiAlertControl, { level: "error", showIcon: true, title: error }), _jsx(PhiButtonControl, { onClick: () => window.location.reload(), label: "Try again" })] })) : (_jsxs(_Fragment, { children: [_jsx(PhiSpinControl, {}), _jsx(PhiTypographyControl, { type: "secondary", children: "Signing out\u2026" })] })) }));
+    }, [failedLabel, locale, siteKey]);
+    return (_jsx(PhiFlexControl, { vertical: true, align: "center", gap: "middle", children: error ? (_jsxs(_Fragment, { children: [_jsx(PhiAlertControl, { level: "error", showIcon: true, title: error }), _jsx(PhiButtonControl, { onClick: () => window.location.reload(), label: labels.retry })] })) : (_jsxs(_Fragment, { children: [_jsx(PhiSpinControl, {}), _jsx(PhiTypographyControl, { type: "secondary", children: labels.signingOut })] })) }));
 }

package/plugins/runtime-modules/auth/widgets/logout/server.d.ts

@@ -4,4 +4,4 @@ export declare function PhiAuthLogoutWidget({ runtime, config, }: {
     config?: {
         padding?: number | string;
     };
-}): import("react").JSX.Element;
+}): Promise<import("react").JSX.Element>;

package/plugins/runtime-modules/auth/widgets/logout/server.js

@@ -1,6 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PhiRuntimeRenderClientType } from "../../../../../constants/runtime-render-client-types";
 import { PhiRuntimeModuleRenderClientHost } from "../../../../../components/runtime/runtime-module-render-client-manifest";
-export function PhiAuthLogoutWidget({ runtime, config, }) {
-    return (_jsx(PhiRuntimeModuleRenderClientHost, { type: PhiRuntimeRenderClientType.AuthLogout, componentProps: { runtime, config } }));
+import { getPhiAuthLogoutWidgetLabels } from "../../../../../components/widgets/label-sets/logout";
+import { phiRuntime } from "../../../../../server-helpers/phi-runtime";
+export async function PhiAuthLogoutWidget({ runtime, config, }) {
+    const rt = phiRuntime(runtime);
+    const labels = await getPhiAuthLogoutWidgetLabels({
+        apiBaseUrl: rt.apiBaseUrl,
+        internalToken: rt.internalToken,
+        locale: runtime.locale.current,
+    });
+    return (_jsx(PhiRuntimeModuleRenderClientHost, { type: PhiRuntimeRenderClientType.AuthLogout, componentProps: { runtime, config, labels } }));
 }

package/plugins/runtime-modules/auth/widgets/security/client.d.ts

@@ -1,7 +1,10 @@
+import type { PhiBlockRuntime } from "../../../../../types";
 import type { PhiAuthWorkflowBodyLabels } from "../../../../../components/widgets/label-types/auth-workflow";
 import { type PhiAuthSecurityWidgetLabels } from "../../../../../components/widgets/label-types/security";
-export declare function PhiAuthSecurityWidgetClient({ apiPath, labels, workflowLabels, }: {
+export declare function PhiAuthSecurityWidgetClient({ apiPath, runtime, labels, workflowLabels, }: {
     apiPath?: string;
+    /** The page's locale, which dates are written in; the browser's own language is not the Site's. */
+    runtime: Pick<PhiBlockRuntime, "locale">;
     labels: PhiAuthSecurityWidgetLabels;
     /** The shared second-factor body's own words; adding a device is drawn by that component. */
     workflowLabels: PhiAuthWorkflowBodyLabels;

package/plugins/runtime-modules/auth/widgets/security/client.js

@@ -1,6 +1,6 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { lazy, Suspense, useCallback, useEffect, useState } from "react";
+import { lazy, Suspense, useCallback, useEffect, useMemo, useState } from "react";
 import { PhiTagControl } from "../../../../../components/controls/phi-tag-control";
 import { PhiButtonControl } from "../../../../../components/controls/phi-button-control";
 import { PhiCardControl } from "../../../../../components/controls/phi-card-control";
@@ -12,13 +12,18 @@ import { PhiTypographyControl } from "../../../../../components/controls/phi-typ
 import { PhiSkeletonControl } from "../../../../../components/controls/phi-skeleton-control";
 import { readPhiJsonError, requestPhiJson } from "../../../../../helpers/client-json-request";
 import { formatPhiAuthSecurityWidgetLabel, } from "../../../../../components/widgets/label-types/security";
+import { usePhiPathname } from "../../../../../components/runtime/use-phi-pathname";
 const PhiAuthWorkflowBody = lazy(() => import("../../../../../components/widgets/client/auth-workflow-body")
     .then((module) => ({ default: module.PhiAuthWorkflowBody })));
-export function PhiAuthSecurityWidgetClient({ apiPath = "/api/auth/account/security", labels, workflowLabels, }) {
+export function PhiAuthSecurityWidgetClient({ apiPath = "/api/auth/account/security", runtime, labels, workflowLabels, }) {
     const [payload, setPayload] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
     const [enrolling, setEnrolling] = useState(false);
+    // Back to where the enrolment began, whatever address this panel stands at.
+    const pathname = usePhiPathname();
+    const pageLocale = runtime.locale.current;
+    const dateFormat = useMemo(() => new Intl.DateTimeFormat(pageLocale, { dateStyle: "medium", timeStyle: "short" }), [pageLocale]);
     const load = useCallback(async (signal) => {
         setLoading(true);
         try {
@@ -68,7 +73,7 @@ export function PhiAuthSecurityWidgetClient({ apiPath = "/api/auth/account/secur
         return removeAndReload(`/api/auth/account/sessions/${encodeURIComponent(sessionId)}`, labels.errors.sessionRevokeFailed);
     }
     if (enrolling) {
-        return (_jsx(Suspense, { fallback: _jsx(PhiSkeletonControl, { lines: 4 }), children: _jsx(PhiAuthWorkflowBody, { mode: "enroll", next: "/app/security", labels: workflowLabels, onComplete: async () => {
+        return (_jsx(Suspense, { fallback: _jsx(PhiSkeletonControl, { lines: 4 }), children: _jsx(PhiAuthWorkflowBody, { mode: "enroll", next: pathname, labels: workflowLabels, onComplete: async () => {
                     setEnrolling(false);
                     await load();
                 } }) }));
@@ -83,14 +88,15 @@ export function PhiAuthSecurityWidgetClient({ apiPath = "/api/auth/account/secur
                         key: String(factor.id),
                         title: factor.label ?? labels.authenticators.unnamed,
                         description: factor.lastUsedAt
-                            ? formatPhiAuthSecurityWidgetLabel(labels.authenticators.lastUsed, new Date(factor.lastUsedAt).toLocaleString())
+                            ? formatPhiAuthSecurityWidgetLabel(labels.authenticators.lastUsed, dateFormat.format(new Date(factor.lastUsedAt)))
                             : labels.authenticators.neverUsed,
                         status: payload.policy.factor?.requiredMethod === "totp"
                             ? _jsx(PhiTagControl, { color: "blue", children: labels.authenticators.required })
                             : null,
                         action: (_jsx(PhiConfirmControl, { title: labels.authenticators.removeConfirm, onConfirm: () => void removeFactor(factor.id), danger: true, trigger: { label: labels.authenticators.remove, type: "link", danger: true } })),
                     })) }) }), _jsx(PhiCardControl, { title: labels.providers.title, children: _jsx(PhiEntryListControl, { emptyDescription: labels.providers.empty, entries: payload.identities.map((identity) => ({
-                        key: identity.providerKey,
+                        // Two accounts at one provider are two identities; the provider key alone named both the same.
+                        key: String(identity.id),
                         title: identity.providerKey,
                         description: identity.issuer,
                     })) }) }), _jsx(PhiCardControl, { title: labels.sessions.title, children: _jsx(PhiEntryListControl, { emptyDescription: labels.sessions.empty, entries: payload.sessions.map((session) => ({

package/plugins/runtime-modules/avatar/definition.d.ts

@@ -11,7 +11,6 @@
  * pinned to the Site Space, so no other Area has a use for it.
  */
 export declare const PHI_AVATAR_RUNTIME_MODULE_DEFINITION: {
-    moduleId: "@phis/ui/modules/avatar";
     kind: "module";
     eligibleAreas: readonly ["app"];
     serverBinding: import("../../../types").PhiRuntimeModuleServerBinding;
@@ -24,4 +23,5 @@ export declare const PHI_AVATAR_RUNTIME_MODULE_DEFINITION: {
             kinds: readonly ["image"];
         };
     };
+    moduleId: "@phis/ui/modules/avatar";
 };

package/plugins/runtime-modules/avatar/definition.js

@@ -1,4 +1,4 @@
-import { PHI_AVATAR_RUNTIME_MODULE_ID } from "./ids";
+import { PHI_AVATAR_RUNTIME_MODULE_IDENTITY } from "./ids";
 import { PHI_AVATAR_USER_SPACE_MEDIA_KINDS } from "./media-spaces";
 import { PHI_CORE_SERVER_BINDING } from "../../../types/server-capabilities";
 /**
@@ -14,7 +14,7 @@ import { PHI_CORE_SERVER_BINDING } from "../../../types/server-capabilities";
  * pinned to the Site Space, so no other Area has a use for it.
  */
 export const PHI_AVATAR_RUNTIME_MODULE_DEFINITION = {
-    moduleId: PHI_AVATAR_RUNTIME_MODULE_ID,
+    ...PHI_AVATAR_RUNTIME_MODULE_IDENTITY,
     kind: "module",
     eligibleAreas: ["app"],
     serverBinding: PHI_CORE_SERVER_BINDING,

package/plugins/runtime-modules/avatar/ids.d.ts

@@ -1 +1,10 @@
 export declare const PHI_AVATAR_RUNTIME_MODULE_ID: "@phis/ui/modules/avatar";
+/**
+ * The Module's identity as its Label Sets inherit it (`definePhiRuntimeModuleLabelSet`): the id and,
+ * where a Module declares one, its source locale. Stated here beside the id and spread into the
+ * definition, so a Label Set a tree or a form reads does not import the definition that imports the
+ * tree -- and a Module that writes in another language says so once.
+ */
+export declare const PHI_AVATAR_RUNTIME_MODULE_IDENTITY: {
+    readonly moduleId: "@phis/ui/modules/avatar";
+};

package/plugins/runtime-modules/avatar/ids.js

@@ -1,2 +1,11 @@
 import { PHI_SHARED_PACKAGE_NAME } from "../../../types/signals";
 export const PHI_AVATAR_RUNTIME_MODULE_ID = `${PHI_SHARED_PACKAGE_NAME}/modules/avatar`;
+/**
+ * The Module's identity as its Label Sets inherit it (`definePhiRuntimeModuleLabelSet`): the id and,
+ * where a Module declares one, its source locale. Stated here beside the id and spread into the
+ * definition, so a Label Set a tree or a form reads does not import the definition that imports the
+ * tree -- and a Module that writes in another language says so once.
+ */
+export const PHI_AVATAR_RUNTIME_MODULE_IDENTITY = {
+    moduleId: PHI_AVATAR_RUNTIME_MODULE_ID,
+};

package/plugins/runtime-modules/avatar/labels.js

@@ -1,7 +1,8 @@
 import "server-only";
 import { PHI_TR_CTX_WEB_UI_LABEL } from "../../../gateway/tr";
-import { definePhiLabelSet, definePhiMessageLabel, getPhiLabelSet } from "../../../gateway/label-set";
-const PHI_AVATAR_WIDGET_LABEL_SET = definePhiLabelSet({
+import { definePhiRuntimeModuleLabelSet, definePhiMessageLabel, getPhiLabelSet } from "../../../gateway/label-set";
+import { PHI_AVATAR_RUNTIME_MODULE_IDENTITY } from "./ids";
+const PHI_AVATAR_WIDGET_LABEL_SET = definePhiRuntimeModuleLabelSet(PHI_AVATAR_RUNTIME_MODULE_IDENTITY, {
     key: "widget:avatar",
     ctx: PHI_TR_CTX_WEB_UI_LABEL,
     labels: {

package/plugins/runtime-modules/avatar/module.d.ts

@@ -4,7 +4,6 @@
  * for state neither of them keeps.
  */
 export declare const PHI_AVATAR_RUNTIME_MODULE: {
-    moduleId: "@phis/ui/modules/avatar";
     kind: "module";
     eligibleAreas: readonly ["app"];
     serverBinding: import("../../../types").PhiRuntimeModuleServerBinding;
@@ -17,4 +16,5 @@ export declare const PHI_AVATAR_RUNTIME_MODULE: {
             kinds: readonly ["image"];
         };
     };
+    moduleId: "@phis/ui/modules/avatar";
 };