@phis/ui 0.2.1 → 0.3.0

package/plugins/runtime-modules/core/widgets/table/client.js

@@ -1,11 +1,10 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { ReloadOutlined, UndoOutlined } from "@ant-design/icons";
 import { PHI_TABLE_WIDGET_DEFAULT_LABELS } from "../../../../../components/widgets/label-types/table";
 import { formatPhiTableWidgetLabel } from "../../../../../components/widgets/label-types/table";
 import { PhiNameControl } from "../../../../../components/controls/phi-name-control";
 import { PhiDescriptionHint } from "../../../../../components/controls/phi-description-tooltip-icon";
-import { Fragment, useCallback, useEffect, useEffectEvent, useMemo, useState } from "react";
+import { Fragment, useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
 import { PhiMultiSelectControl } from "../../../../../components/controls/phi-multi-select-control";
 import { PhiAlertControl } from "../../../../../components/controls/phi-alert-control";
 import { usePhiConfirmDialog } from "../../../../../components/controls/phi-confirm-dialog";
@@ -25,7 +24,10 @@ import { PhiLink } from "../../../../../components/navigation/phi-link";
 import { PhiIcon } from "../../../../../components/shell/phi-icon";
 import { usePhiConfig } from "../../../../../components/root/phi-config-provider";
 import { usePhiSignalListener } from "../../../../../components/runtime/runtime-signal-bus";
-import { usePhiSignalEmitter, usePhiSignalIdentity } from "../../../../../components/runtime/runtime-signal-identity";
+import { usePhiRuntimePageConditionState } from "../../../../../components/runtime/runtime-page-condition-state";
+import { findPhiSignalListenRoute, resolvePhiSignalListenFilter } from "../../../../../helpers/signal-listen-routes";
+import { emitPhiSignalCapability, usePhiSignalEmitter, usePhiSignalIdentity } from "../../../../../components/runtime/runtime-signal-identity";
+import { usePhiVisualAnchorParts } from "../../../../../components/runtime/runtime-visual-anchors";
 import { usePhiApplicationFeedback } from "../../../../../components/runtime/use-phi-application-feedback";
 import { usePhiTableBinding } from "../../../../../components/tables/client/phi-table-binding";
 import { PhiTableBindingControl } from "../../../../../components/tables/client/phi-table-binding-control";
@@ -33,14 +35,21 @@ import { clearPhiDataDragPayload, readPhiDataDragPayload } from "../../../../../
 import { renderPhiValueContent } from "../../../../../components/widgets/client/shared/phi-rendered-value";
 import { formatPhiTranslation } from "../../../../../helpers/translation-format";
 import { readPhiTableFilters, readPhiTableQuery, readPhiTableRowOptions, validatePhiTableWidgetBinding, } from "../../../../../types/table-widget";
-import { readPhiTableColumnOrderSignalValue, readPhiTableBindingParamsSignalValue, readPhiTableExpansionSignalValue, readPhiTableActionSignalValue, } from "../../../../../types/table-signal-values";
+import { readPhiTableColumnOrderSignalValue, readPhiTableBindingParamsSignalValue, readPhiTableExpansionSignalValue, readPhiTableActionSignalValue, isPhiTableQueryValue, } from "../../../../../types/table-signal-values";
 import { collectPhiRuntimeValueConditions, combinePhiRuntimeConditionExpressions, evaluatePhiRuntimeConditionExpression, readPhiRuntimeConditionStateSignalValue, } from "../../../../../types/runtime-condition";
-import { findPhiSignalRoutesByCapabilityId, isPhiControllerSignalAddress, } from "../../../../../types/signals";
+import { isPhiControllerSignalAddress, } from "../../../../../types/signals";
 import { resolvePhiButtonIcon } from "../../../../../components/widgets/client/shared/phi-button-icons";
 import { PhiFlexControl } from "../../../../../components/controls/phi-flex-control";
 import { PhiTypographyControl } from "../../../../../components/controls/phi-typography-control";
 import { PhiCompactGroupControl } from "../../../../../components/controls/phi-compact-group-control";
 import { isPhiRecord } from "../../../../../helpers/is-record";
+/**
+ * The parts of a Table a Tour can point at, as `cms:<instanceId>:<part>` (design/TOURS.md): the filters
+ * and search, the toolbar with its add button, the column heads, the actions column, the footer and the
+ * pagination. A part the Table does not draw -- no filters, one page -- is simply not found, and the step
+ * pointing at it does what its `ifMissing` says.
+ */
+const PHI_TABLE_VISUAL_ANCHOR_PARTS = ["filters", "toolbar", "header", "row-actions", "footer", "pagination"];
 const PHI_TABLE_ACTION_BUTTON_STYLE = { whiteSpace: "nowrap" };
 function formatTableActionTemplate(value, templateValue) {
     return value && templateValue != null ? formatPhiTableWidgetLabel(value, templateValue) : value;
@@ -159,21 +168,16 @@ function readRowIdentity(row, path) {
     const value = readPhiTableControlValue(row, path);
     return typeof value === "string" || (typeof value === "number" && Number.isFinite(value)) ? value : null;
 }
-function findMatchingCondition(row, expression, controllers) {
+function findMatchingCondition(row, expression, sources) {
     if (!expression)
         return null;
-    const result = evaluatePhiRuntimeConditionExpression(expression, { row, controllers });
+    const result = evaluatePhiRuntimeConditionExpression(expression, { ...sources, row });
     if (result === "not-matched")
         return null;
-    return collectPhiRuntimeValueConditions(expression).find((condition) => condition.reason && evaluatePhiRuntimeConditionExpression(condition, { row, controllers }) === "matched") ?? expression;
-}
-function matchesAllConditions(row, expression, controllers) {
-    return !expression || evaluatePhiRuntimeConditionExpression(expression, { row, controllers }) === "matched";
+    return collectPhiRuntimeValueConditions(expression).find((condition) => condition.reason && evaluatePhiRuntimeConditionExpression(condition, { ...sources, row }) === "matched") ?? expression;
 }
-function matchesListenRoute(route, signal) {
-    return route.receiver !== null && route.channel === signal.channel && route.action === signal.action &&
-        route.valueType === signal.valueType &&
-        (route.valueType !== "json" || route.valueSchema === signal.valueSchema);
+function matchesAllConditions(row, expression, sources) {
+    return !expression || evaluatePhiRuntimeConditionExpression(expression, { ...sources, row }) === "matched";
 }
 function resolveTableActions(definitions, capabilities) {
     const byKey = new Map(capabilities?.map((capability) => [capability.key, capability]) ?? []);
@@ -207,7 +211,18 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
     const configKey = JSON.stringify(inputConfig);
     const config = useMemo(() => JSON.parse(configKey), [configKey]);
     const { presentation, features, source } = config;
-    const [bindingParams, setBindingParams] = useState(() => isPhiRecord(source?.params) ? source.params : {});
+    /*
+     * What the reader set, tagged with the configuration it was set against. A Builder edit of the
+     * configured params or columns is a new starting point; the reader's earlier choice belonged to the old
+     * one and would otherwise outlive it -- an order missing the new column, which every reorder then
+     * refused.
+     */
+    const configuredBindingParams = useMemo(() => isPhiRecord(source?.params) ? source.params : {}, [source]);
+    const bindingParamsSeed = JSON.stringify(configuredBindingParams);
+    const [chosenBindingParams, setChosenBindingParams] = useState(null);
+    const bindingParams = chosenBindingParams?.seed === bindingParamsSeed
+        ? chosenBindingParams.params
+        : configuredBindingParams;
     const resolvedSource = useMemo(() => source ? { ...source, params: bindingParams } : null, [bindingParams, source]);
     const resolvedControlSize = presentation.controlSize ??
         (features.tools?.mode !== "external" ? "small" : undefined);
@@ -219,8 +234,21 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
     };
     const [searchDraft, setSearchDraft] = useState(initialQuery.search ?? "");
     const [conditionControllerStates, setConditionControllerStates] = useState({});
-    const [columnOrder, setColumnOrder] = useState(() => presentation.columns.filter((column) => !column.hidden).map((column) => column.key));
+    /*
+     * What a condition on this Table can read besides its row: the Controllers that answered, and the
+     * address the Page was opened at -- the one a Page Widget can always read, where an Area Controller
+     * can only be asked by mounting it at Page scope.
+     */
+    const conditionPage = usePhiRuntimePageConditionState();
+    const conditionSources = useMemo(() => ({ controllers: conditionControllerStates, page: conditionPage }), [conditionControllerStates, conditionPage]);
+    const configuredColumnOrder = useMemo(() => presentation.columns.filter((column) => !column.hidden).map((column) => column.key), [presentation.columns]);
+    const columnOrderSeed = configuredColumnOrder.join("\u0000");
+    const [chosenColumnOrder, setChosenColumnOrder] = useState(null);
+    const columnOrder = chosenColumnOrder?.seed === columnOrderSeed
+        ? chosenColumnOrder.order
+        : configuredColumnOrder;
     const signalIdentity = usePhiSignalIdentity();
+    usePhiVisualAnchorParts(signalIdentity.receiver?.startsWith("cms:") ? signalIdentity.receiver : null, PHI_TABLE_VISUAL_ANCHOR_PARTS);
     const emitSignal = usePhiSignalEmitter(signalIdentity.sender);
     const emitRoutes = useMemo(() => config.signalRoutes?.emits ?? [], [config.signalRoutes?.emits]);
     const listenRoutes = useMemo(() => config.signalRoutes?.listens ?? [], [config.signalRoutes?.listens]);
@@ -228,22 +256,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
      * `correlationId` is the exchange this output belongs to: present when the Table is answering a
      * signal it received, absent when the operator drove it from the Table itself, which begins one.
      */
-    const emitCapability = useCallback((capabilityId, value, correlationId) => {
-        for (const route of findPhiSignalRoutesByCapabilityId(emitRoutes, capabilityId)) {
-            if (route.receiver == null || (route.valueType === "json" && !route.valueSchema))
-                continue;
-            emitSignal({
-                scope: route.scope,
-                channel: route.channel,
-                action: route.action,
-                value: route.valueType === "none" ? null : value,
-                valueType: route.valueType,
-                valueSchema: route.valueSchema ?? null,
-                receiver: route.receiver,
-                correlationId,
-            });
-        }
-    }, [emitRoutes, emitSignal]);
+    const emitCapability = useCallback((capabilityId, value, correlationId) => emitPhiSignalCapability(emitSignal, emitRoutes, capabilityId, value, correlationId), [emitRoutes, emitSignal]);
     const validateResource = useCallback((candidate) => {
         const contractError = validatePhiTableWidgetBinding(config, candidate)[0];
         if (contractError)
@@ -264,6 +277,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         source: resolvedSource,
         initialQuery: { ...initialQuery, sorts: defaultSorts, filters: initialFilters },
         externalQuery,
+        fixedFilters: config.fixedFilters,
         externalSearch,
         defaultPageSize: features.pagination?.pageSize ?? 20,
         refreshKey,
@@ -325,22 +339,71 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         return () => window.clearTimeout(timer);
     }, [features.search?.debounceMs, features.search?.enabled, query.search, searchDraft, setQuery]);
     const updateColumnOrder = useCallback((next, correlationId) => {
-        const known = new Set(presentation.columns.filter((column) => !column.hidden).map((column) => column.key));
+        const known = new Set(configuredColumnOrder);
         if (next.length !== known.size || next.some((key) => !known.has(key)) || new Set(next).size !== next.length)
             return;
-        setColumnOrder(next);
+        setChosenColumnOrder({ seed: columnOrderSeed, order: next });
         emitCapability("columnsChange", { columnOrder: [...next] }, correlationId);
-    }, [emitCapability, presentation.columns]);
+    }, [columnOrderSeed, configuredColumnOrder, emitCapability]);
     const updateExpandedRows = useCallback((next, correlationId) => {
         setExpandedRowIdentities(next);
         emitCapability("expansionChange", { expandedRowIdentities: [...next] }, correlationId);
     }, [emitCapability, setExpandedRowIdentities]);
+    /*
+     * The named fields of the selected rows (`rowSelection.emitFields`). A row kept selected from another
+     * page keeps what was last read of it, so turning the page does not announce a different selection.
+     */
+    const emitFields = features.rowSelection?.emitFields;
+    const rowIdentityPath = resource?.rowIdentityPath ?? "id";
+    const knownSelectedRowsRef = useRef(new Map());
+    const emittedSelectedRowsRef = useRef(null);
+    const readSelectedRows = useCallback((identities) => {
+        if (!emitFields || emitFields.length === 0)
+            return undefined;
+        const known = knownSelectedRowsRef.current;
+        const selectedRows = identities.flatMap((rowIdentity) => {
+            const row = rows.find((candidate) => String(readRowIdentity(candidate, rowIdentityPath)) === String(rowIdentity));
+            if (!row) {
+                const last = known.get(String(rowIdentity));
+                return last ? [last] : [];
+            }
+            return [{
+                    rowIdentity,
+                    values: Object.fromEntries(emitFields.map((field) => {
+                        const value = readPhiTableControlValue(row, field);
+                        return [field, isPhiTableQueryValue(value) ? value : null];
+                    })),
+                }];
+        });
+        knownSelectedRowsRef.current = new Map(selectedRows.map((row) => [String(row.rowIdentity), row]));
+        return selectedRows;
+    }, [emitFields, rowIdentityPath, rows]);
+    const emitSelection = useCallback((identities, correlationId) => {
+        const selectedRows = readSelectedRows(identities);
+        emittedSelectedRowsRef.current = JSON.stringify(selectedRows ?? null);
+        emitCapability("selectionChange", {
+            selectedRowIdentities: [...identities],
+            ...(selectedRows ? { selectedRows } : {}),
+        }, correlationId);
+    }, [emitCapability, readSelectedRows]);
     const updateSelection = useCallback((next, correlationId) => {
         setSelectedRowIdentities(next);
-        emitCapability("selectionChange", { selectedRowIdentities: [...next] }, correlationId);
-    }, [emitCapability, setSelectedRowIdentities]);
+        emitSelection(next, correlationId);
+    }, [emitSelection, setSelectedRowIdentities]);
+    /*
+     * The same selection, said again once what it carries has changed -- a row retired and read back. A
+     * receiver that disables something on a field of the selection would otherwise act on the old value.
+     */
+    useEffect(() => {
+        if (!emitFields || emitFields.length === 0 || selectedRowIdentities.length === 0)
+            return;
+        const selectedRows = readSelectedRows(selectedRowIdentities);
+        if (JSON.stringify(selectedRows ?? null) === emittedSelectedRowsRef.current)
+            return;
+        emitSelection(selectedRowIdentities);
+    }, [emitFields, emitSelection, readSelectedRows, selectedRowIdentities]);
     const updateBindingParams = useCallback((next, correlationId) => {
-        setBindingParams(next);
+        setChosenBindingParams({ seed: bindingParamsSeed, params: next });
         setQuery((current) => ({ ...current, page: 1, cursor: null }));
         setSelectedRowIdentities([]);
         setExpandedRowIdentities([]);
@@ -354,7 +417,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                     : [];
             })),
         }, correlationId);
-    }, [configuredBindingFields, emitCapability, setExpandedRowIdentities, setQuery, setSelectedRowIdentities]);
+    }, [bindingParamsSeed, configuredBindingFields, emitCapability, setExpandedRowIdentities, setQuery, setSelectedRowIdentities]);
     useEffect(() => {
         if (!resource?.bindingFields?.length)
             return;
@@ -375,10 +438,17 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         });
         return () => { cancelled = true; };
     }, [bindingParams, resource?.bindingFields, updateBindingParams]);
-    const activateAction = useCallback((action, row, identities = [], actionValue, correlationId) => {
+    const activateAction = useCallback((action, row, identities = [], actionValue, correlationId, 
+    /*
+     * The row a signal named, which need not be on the loaded page: the identity is what the action
+     * acts on, so it is carried as sent rather than looked up among the rows that happen to be shown.
+     */
+    requestedRowIdentity) => {
         if (onAction?.({ action: action, row, actionValue, selectedRowIdentities: identities }) === true)
             return;
-        const rowIdentity = row && resource ? readRowIdentity(row, resource.rowIdentityPath) : null;
+        const rowIdentity = requestedRowIdentity !== undefined
+            ? requestedRowIdentity
+            : row && resource ? readRowIdentity(row, resource.rowIdentityPath) : null;
         const signalValue = {
             actionKey: action.key,
             rowIdentity,
@@ -403,8 +473,8 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         }).catch(() => undefined);
     }, [emitCapability, executeAction, onAction, resolvedQuery, resource]);
     usePhiSignalListener(useCallback((signal) => {
-        const route = listenRoutes.find((candidate) => matchesListenRoute(candidate, signal));
-        if (!route || (signal.receiver !== "broadcast" && signal.receiver !== signalIdentity.receiver))
+        const route = findPhiSignalListenRoute(listenRoutes, signal, signalIdentity.receiver);
+        if (!route)
             return;
         if (route.capabilityId === "searchChange" && typeof signal.value === "string") {
             setSearchDraft(signal.value);
@@ -459,7 +529,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
             const row = request.rowIdentity == null || !resource
                 ? undefined
                 : rows.find((candidate) => String(readPhiTableControlValue(candidate, resource.rowIdentityPath)) === String(request.rowIdentity));
-            const execute = () => activateAction(action, row, request.selectedRowIdentities ?? [], request.actionValue, signal.correlationId);
+            const execute = () => activateAction(action, row, request.selectedRowIdentities ?? [], request.actionValue, signal.correlationId, request.rowIdentity ?? null);
             if (action.confirm) {
                 const templateValue = request.rowIdentity ?? request.selectedRowIdentities.length;
                 confirm({
@@ -483,19 +553,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                 setConditionControllerStates((current) => ({ ...current, [signal.sender]: next.state }));
             }
         }
-    }, [activateAction, bindingParams, bulkActions, conditionControllerAddresses, confirm, listenRoutes, reload, resource, rowActions, rows, setQuery, signalIdentity.receiver, toolbarActions, updateBindingParams, updateColumnOrder, updateExpandedRows, updateSelection]), useMemo(() => {
-        if (listenRoutes.length === 0)
-            return null;
-        return {
-            scopes: Array.from(new Set(listenRoutes.map((route) => route.scope))),
-            channels: Array.from(new Set(listenRoutes.map((route) => route.channel))),
-            // Only a route set where every route names a schema can filter by schema: a route that names
-            // none accepts a signal that carries none, and listing the others would drop exactly those.
-            ...(listenRoutes.every((route) => route.valueSchema)
-                ? { valueSchemas: Array.from(new Set(listenRoutes.map((route) => route.valueSchema))) }
-                : {}),
-        };
-    }, [listenRoutes]), signalIdentity.receiver);
+    }, [activateAction, bindingParams, bulkActions, conditionControllerAddresses, confirm, listenRoutes, reload, resource, rowActions, rows, setQuery, signalIdentity.receiver, toolbarActions, updateBindingParams, updateColumnOrder, updateExpandedRows, updateSelection]), useMemo(() => resolvePhiSignalListenFilter(listenRoutes), [listenRoutes]), signalIdentity.receiver);
     useEffect(() => {
         if (conditionControllerAddresses.size > 0) {
             emitCapability("conditionStateRequest", null);
@@ -542,6 +600,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                             disabled: loading,
                             constraints: field.constraints,
                             options: field.options,
+                            prefix: column.editor?.prefix,
                         }
                         : undefined;
                 })()
@@ -552,7 +611,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                     return Boolean(findMatchingCondition(row, combinePhiRuntimeConditionExpressions("any", [
                         features.editing?.disabledWhen,
                         column.editor?.disabledWhen,
-                    ]), conditionControllerStates)) || !matchesAllConditions(row, field?.mutableWhen, conditionControllerStates);
+                    ]), conditionSources)) || !matchesAllConditions(row, field?.mutableWhen, conditionSources);
                 }
                 : undefined,
             isEditorLoading: column.editor && features.editing?.mode === "cell" && resource
@@ -591,9 +650,9 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                 sizing: { mode: "content" },
                 render: (_value, row) => {
                     const renderedActions = rowActions.map((action) => {
-                        if (!matchesAllConditions(row, action.visibleWhen, conditionControllerStates))
+                        if (!matchesAllConditions(row, action.visibleWhen, conditionSources))
                             return null;
-                        const disabled = findMatchingCondition(row, action.disabledWhen, conditionControllerStates);
+                        const disabled = findMatchingCondition(row, action.disabledWhen, conditionSources);
                         const rowHref = action.hrefPath ? readPhiTableControlValue(row, action.hrefPath) : action.href;
                         return (_jsx(TableAction, { action: typeof rowHref === "string" ? { ...action, href: rowHref } : action, disabled: Boolean(disabled), disabledReason: disabled && "reason" in disabled ? disabled.reason : undefined, templateValue: resource ? readRowIdentity(row, resource.rowIdentityPath) : null, size: resolvedControlSize, onActivate: () => activateAction(action, row) }, action.key));
                     });
@@ -604,7 +663,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
             });
         }
         return result;
-    }, [activateAction, commitField, conditionControllerStates, features.actions?.rowLayout, features.editing?.disabledWhen, features.editing?.mode, features.rowReordering?.enabled, isFieldMutationPending, labels.actions, loading, presentation.columns, resolvedControlSize, resource, rowActions]);
+    }, [activateAction, commitField, conditionSources, features.actions?.rowLayout, features.editing?.disabledWhen, features.editing?.mode, features.rowReordering?.enabled, isFieldMutationPending, labels.actions, loading, presentation.columns, resolvedControlSize, resource, rowActions]);
     const resolveSummaryValue = useCallback((item) => {
         if (item.value.source === "provider")
             return summary[item.value.fieldKey];
@@ -619,13 +678,27 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         const pageSize = resolvedQuery.pageSize ?? rows.length;
         return pageSize > 0 ? Math.ceil(total / pageSize) : 0;
     }, [resolvedQuery.page, resolvedQuery.pageSize, rows.length, selectedRowIdentities.length, summary, total]);
-    const footer = useMemo(() => presentation.footer ? {
-        align: presentation.footer.align,
-        content: formatPhiTranslation(presentation.footer.template, presentation.footer.values.map((binding) => {
-            const value = resolveSummaryValue({ key: binding.key, value: binding.value });
-            return typeof value === "number" ? value : value == null ? "—" : String(value);
-        })),
-    } : undefined, [presentation.footer, resolveSummaryValue]);
+    const footer = useMemo(() => {
+        if (!presentation.footer)
+            return undefined;
+        // The first variant whose value holds says the line instead; see `PhiTableFooterVariant`.
+        const variant = presentation.footer.variants?.find(({ when }) => {
+            const held = Boolean(resolveSummaryValue({ key: "when", value: when.value }));
+            return when.operator === "truthy" ? held : !held;
+        });
+        const template = variant?.template ?? presentation.footer.template;
+        // A variant with an empty template takes the footer away rather than drawing an empty bar.
+        if (!template.trim())
+            return undefined;
+        const values = variant ? variant.values ?? [] : presentation.footer.values;
+        return {
+            align: presentation.footer.align,
+            content: formatPhiTranslation(template, values.map((binding) => {
+                const value = resolveSummaryValue({ key: binding.key, value: binding.value });
+                return typeof value === "number" ? value : value == null ? "—" : String(value);
+            })),
+        };
+    }, [presentation.footer, resolveSummaryValue]);
     const tableSummary = useMemo(() => presentation.summary ? {
         ...presentation.summary,
         rows: presentation.summary.rows.map((row) => ({
@@ -694,26 +767,26 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
         bulkActions.length > 0 ||
         (hasQueryTools && features.tools?.reset !== false) ||
         features.tools?.reload === true) ? (_jsxs(PhiToolbarControl, { size: resolvedControlSize, compact: true, children: [toolbarActions.map((action) => {
-                if (!matchesAllConditions(null, action.visibleWhen, conditionControllerStates))
+                if (!matchesAllConditions(null, action.visibleWhen, conditionSources))
                     return null;
-                const disabled = findMatchingCondition(null, action.disabledWhen, conditionControllerStates);
+                const disabled = findMatchingCondition(null, action.disabledWhen, conditionSources);
                 return _jsx(TableAction, { action: action, size: resolvedControlSize, disabled: Boolean(disabled), disabledReason: disabled && "reason" in disabled ? disabled.reason : undefined, onActivate: () => activateAction(action, undefined, selectedRowIdentities) }, action.key);
             }), bulkActions.map((action) => {
-                if (!matchesAllConditions(null, action.visibleWhen, conditionControllerStates))
+                if (!matchesAllConditions(null, action.visibleWhen, conditionSources))
                     return null;
-                const disabled = findMatchingCondition(null, action.disabledWhen, conditionControllerStates);
+                const disabled = findMatchingCondition(null, action.disabledWhen, conditionSources);
                 return _jsx(TableAction, { action: action, size: resolvedControlSize, disabled: selectedRowIdentities.length === 0 || Boolean(disabled), disabledReason: disabled && "reason" in disabled ? disabled.reason : undefined, templateValue: selectedRowIdentities.length, onActivate: () => activateAction(action, undefined, selectedRowIdentities) }, action.key);
-            }), hasQueryTools && features.tools?.reset !== false ? (_jsx(PhiButtonControl, { icon: _jsx(UndoOutlined, {}), ariaLabel: labels.reset, size: resolvedControlSize, onClick: resetQuery })) : null, features.tools?.reload ? (_jsx(PhiButtonControl, { icon: _jsx(ReloadOutlined, {}), ariaLabel: labels.reload, tooltip: labels.reload, size: resolvedControlSize, onClick: reload })) : null] })) : null;
+            }), hasQueryTools && features.tools?.reset !== false ? (_jsx(PhiButtonControl, { icon: _jsx(PhiIcon, { name: "undo", size: "inherit" }), ariaLabel: labels.reset, size: resolvedControlSize, onClick: resetQuery })) : null, features.tools?.reload ? (_jsx(PhiButtonControl, { icon: _jsx(PhiIcon, { name: "reload", size: "inherit" }), ariaLabel: labels.reload, tooltip: labels.reload, size: resolvedControlSize, onClick: reload })) : null] })) : null;
     return (_jsxs(PhiFlexControl, { vertical: true, gap: selfContainedTools ? token.paddingSM : token.padding, style: { minWidth: 0, width: "100%" }, children: [confirmDialog, _jsx(PhiCollectionHeaderControl, { title: presentation.title, description: presentation.description, filters: collectionFilters, toolbar: collectionToolbar }), !selfContainedTools && bulkActions.length && selectedRowIdentities.length > 0 ? (_jsx(PhiAlertControl, { level: "info", title: (_jsxs(PhiFlexControl, { align: "center", justify: "space-between", gap: "small", wrap: true, children: [_jsx("span", { children: formatPhiTableWidgetLabel(labels.selected, selectedRowIdentities.length) }), _jsx(PhiFlexControl, { align: "center", gap: "small", children: bulkActions.map((action) => {
-                                if (!matchesAllConditions(null, action.visibleWhen, conditionControllerStates))
+                                if (!matchesAllConditions(null, action.visibleWhen, conditionSources))
                                     return null;
-                                const disabled = findMatchingCondition(null, action.disabledWhen, conditionControllerStates);
+                                const disabled = findMatchingCondition(null, action.disabledWhen, conditionSources);
                                 return _jsx(TableAction, { action: action, size: resolvedControlSize, disabled: Boolean(disabled), disabledReason: disabled && "reason" in disabled ? disabled.reason : undefined, onActivate: () => activateAction(action, undefined, selectedRowIdentities) }, action.key);
                             }) })] })) })) : null, bindingError || contractError || error ? (_jsx(PhiAlertControl, { level: "error", showIcon: true, title: bindingError ?? contractError ?? error?.message })) : null, _jsx(PhiTableBindingControl, { rows: rows, fields: resource?.fields ?? [], sourceConfig: bindingParams, renderDiagnostics: (warnings) => warnings.map((warning) => _jsx(PhiAlertControl, { level: "error", showIcon: true, title: warning }, warning)), rowIdentityPath: resource?.rowIdentityPath ?? "id", columns: columns, columnOrder: columnOrder, sortingMode: features.sorting?.mode ?? "none", sorts: resolvedQuery.sorts ?? [], onSortsChange: (sorts) => setQuery((current) => ({ ...current, page: 1, cursor: null, sorts })), columnReordering: features.columnReordering?.enabled === true, onColumnOrderChange: updateColumnOrder, rowSelection: features.rowSelection?.mode && features.rowSelection.mode !== "none" ? {
                     mode: features.rowSelection.mode,
                     selectedRowIdentities,
                     preserveSelectedRowIdentities: features.rowSelection.preserveSelectedRowIdentities,
-                    isRowDisabled: (row) => Boolean(findMatchingCondition(row, features.rowSelection?.disabledWhen, conditionControllerStates)),
+                    isRowDisabled: (row) => Boolean(findMatchingCondition(row, features.rowSelection?.disabledWhen, conditionSources)),
                     onChange: updateSelection,
                 } : undefined, 
                 /*
@@ -737,7 +810,7 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                  */
                 onRowActivate: features.rowSelection?.mode && features.rowSelection.mode !== "none" && resource?.rowActivation ? (row) => {
                     const identity = readRowIdentity(row, resource.rowIdentityPath);
-                    if (identity == null || findMatchingCondition(row, features.rowSelection?.disabledWhen, conditionControllerStates)) {
+                    if (identity == null || findMatchingCondition(row, features.rowSelection?.disabledWhen, conditionSources)) {
                         return;
                     }
                     if (features.rowSelection?.mode !== "multiple") {
@@ -775,14 +848,14 @@ export function PhiTableWidgetClient({ config: inputConfig, externalSearch, exte
                         : undefined,
                     onMove: (move) => { void moveRow({ kind: "row-move", ...move }).catch(() => undefined); },
                 } : undefined, rowStyle: presentation.row?.mutedWhen ? (row) => ({
-                    opacity: findMatchingCondition(row, presentation.row?.mutedWhen, conditionControllerStates) ? 0.5 : 1,
+                    opacity: findMatchingCondition(row, presentation.row?.mutedWhen, conditionSources) ? 0.5 : 1,
                     transition: `opacity ${token.motionDurationMid}`,
                 }) : undefined, editing: features.editing?.mode === "row" && resource ? {
                     mode: "row",
                     editLabel: labels.editRow,
                     saveLabel: labels.saveRow,
                     cancelLabel: labels.cancelRow,
-                    isRowDisabled: (row) => Boolean(findMatchingCondition(row, features.editing?.disabledWhen, conditionControllerStates)),
+                    isRowDisabled: (row) => Boolean(findMatchingCondition(row, features.editing?.disabledWhen, conditionSources)),
                     onCommit: (row, originalValues, patch) => {
                         const rowIdentity = readRowIdentity(row, resource.rowIdentityPath);
                         if (rowIdentity == null || Object.keys(patch).length === 0)