@cosmicdrift/kumiko-renderer 0.415.0 → 0.417.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/action-form-body.d.ts +2 -5
- package/dist/app/action-form-body.js +50 -22
- package/dist/app/action-form-support.d.ts +4 -1
- package/dist/app/action-form-support.js +8 -4
- package/dist/app/client-actions.js +6 -4
- package/dist/app/config-edit-body.js +83 -82
- package/dist/app/entity-list-screen.js +1 -1
- package/dist/app/extension-sections.d.ts +2 -0
- package/dist/app/header-actions-bar.d.ts +3 -1
- package/dist/app/header-actions-bar.js +12 -4
- package/dist/app/locked-screen-header.d.ts +2 -0
- package/dist/app/locked-screen-header.js +8 -1
- package/dist/app/projection-detail-body.js +29 -8
- package/dist/app/projection-detail-guidance.d.ts +2 -1
- package/dist/app/projection-detail-guidance.js +45 -30
- package/dist/app/projection-detail-header-model.d.ts +1 -1
- package/dist/app/projection-detail-header-model.js +14 -6
- package/dist/app/projection-detail-header-region.js +25 -9
- package/dist/app/projection-detail-header.d.ts +2 -0
- package/dist/app/projection-detail-header.js +31 -4
- package/dist/app/projection-detail-navigation.d.ts +4 -0
- package/dist/app/projection-detail-navigation.js +5 -1
- package/dist/app/projection-list-shim.js +1 -0
- package/dist/app/row-actions.d.ts +4 -0
- package/dist/app/row-actions.js +19 -3
- package/dist/app/screen-shared.d.ts +1 -0
- package/dist/app/screen-shared.js +23 -3
- package/dist/app/use-projection-detail-actions.d.ts +16 -1
- package/dist/app/use-projection-detail-actions.js +23 -3
- package/dist/app/use-projection-detail-data.d.ts +2 -0
- package/dist/app/use-projection-detail-data.js +53 -10
- package/dist/app/use-projection-list-data.js +1 -1
- package/dist/card-options.d.ts +2 -0
- package/dist/components/ai-assist-payload.d.ts +2 -0
- package/dist/components/ai-assist-payload.js +8 -0
- package/dist/components/choice-chip-class.d.ts +1 -0
- package/dist/components/choice-chip-class.js +9 -0
- package/dist/components/edit-mounts.d.ts +3 -2
- package/dist/components/edit-mounts.js +2 -2
- package/dist/components/grid-cell-for-field.js +1 -1
- package/dist/components/multi-select-chips.d.ts +10 -0
- package/dist/components/multi-select-chips.js +19 -0
- package/dist/components/narrow-description.d.ts +3 -0
- package/dist/components/narrow-description.js +12 -0
- package/dist/components/related-list-section.d.ts +5 -3
- package/dist/components/related-list-section.js +52 -35
- package/dist/components/related-photo-grid.d.ts +11 -0
- package/dist/components/related-photo-grid.js +54 -0
- package/dist/components/render-edit-action-button.d.ts +2 -2
- package/dist/components/render-edit-field-grid.d.ts +12 -3
- package/dist/components/render-edit-field-grid.js +60 -18
- package/dist/components/render-edit-fields-section.js +45 -11
- package/dist/components/render-edit-header-actions.d.ts +2 -1
- package/dist/components/render-edit-header-actions.js +18 -1
- package/dist/components/render-edit-layout.js +5 -3
- package/dist/components/render-edit-logic.js +1 -0
- package/dist/components/render-edit-section-kinds.js +59 -10
- package/dist/components/render-edit-titles.js +1 -1
- package/dist/components/render-edit-types.d.ts +22 -1
- package/dist/components/render-field-ai-assist.d.ts +13 -0
- package/dist/components/render-field-ai-assist.js +90 -0
- package/dist/components/render-field-choice-inputs.js +4 -0
- package/dist/components/render-field-control.d.ts +1 -1
- package/dist/components/render-field-control.js +19 -9
- package/dist/components/render-field-value-chips.d.ts +9 -0
- package/dist/components/render-field-value-chips.js +47 -0
- package/dist/components/render-field-write-only.js +12 -4
- package/dist/components/render-list-hint-columns.d.ts +2 -0
- package/dist/components/render-list-hint-columns.js +43 -5
- package/dist/components/render-list-reference-columns.js +2 -4
- package/dist/components/render-list-row-tone.d.ts +2 -0
- package/dist/components/render-list-row-tone.js +6 -0
- package/dist/components/render-list-table-props.d.ts +13 -2
- package/dist/components/render-list-table-props.js +9 -3
- package/dist/components/render-list-types.d.ts +4 -0
- package/dist/components/render-list.js +12 -4
- package/dist/components/use-render-edit-sections.js +5 -1
- package/dist/components/use-render-list-columns.js +3 -3
- package/dist/components/write-form-registry.d.ts +13 -0
- package/dist/components/write-form-registry.js +6 -0
- package/dist/components/write-form-section.d.ts +5 -1
- package/dist/components/write-form-section.js +55 -16
- package/dist/headless/form/form-controller.d.ts +1 -0
- package/dist/headless/form/form-controller.js +1 -1
- package/dist/headless/format/index.d.ts +1 -0
- package/dist/headless/format/index.js +21 -0
- package/dist/headless/format/phone.d.ts +1 -0
- package/dist/headless/format/phone.js +8 -0
- package/dist/headless/format/relative-time.d.ts +15 -0
- package/dist/headless/format/relative-time.js +63 -0
- package/dist/headless/format/safe-locale.d.ts +1 -0
- package/dist/headless/format/safe-locale.js +13 -0
- package/dist/headless/index.d.ts +2 -2
- package/dist/headless/index.js +2 -2
- package/dist/headless/view-model/edit.d.ts +3 -2
- package/dist/headless/view-model/edit.js +162 -36
- package/dist/headless/view-model/field-text.d.ts +9 -0
- package/dist/headless/view-model/field-text.js +19 -0
- package/dist/headless/view-model/index.d.ts +1 -0
- package/dist/headless/view-model/index.js +1 -0
- package/dist/headless/view-model/list.js +6 -0
- package/dist/headless/view-model/types.d.ts +76 -5
- package/dist/hooks/use-list-table.js +11 -6
- package/dist/i18n-defaults.js +9 -2
- package/dist/index.d.ts +1 -1
- package/dist/primitives-record-guidance.d.ts +32 -1
- package/dist/primitives-share-types.d.ts +82 -0
- package/dist/primitives-share-types.js +1 -0
- package/dist/primitives.d.ts +44 -86
- package/dist/web/app/bold-markup.d.ts +3 -0
- package/dist/web/app/bold-markup.js +14 -0
- package/dist/web/app/dashboard-body.js +8 -3
- package/dist/web/app/dashboard-list-panel.js +8 -4
- package/dist/web/app/dashboard-panel-columns.d.ts +9 -0
- package/dist/web/app/dashboard-panel-columns.js +14 -0
- package/dist/web/app/dashboard-panels.js +31 -3
- package/dist/web/app/dashboard-shared.d.ts +3 -1
- package/dist/web/app/dashboard-shared.js +4 -4
- package/dist/web/app/dashboard-stat-group-panel.d.ts +1 -1
- package/dist/web/app/dashboard-stat-group-panel.js +24 -3
- package/dist/web/app/dashboard-text-panel.d.ts +1 -0
- package/dist/web/app/dashboard-text-panel.js +18 -11
- package/dist/web/app/relative-time.d.ts +0 -5
- package/dist/web/app/relative-time.js +11 -21
- package/dist/web/components/config-cascade.d.ts +2 -1
- package/dist/web/components/config-cascade.js +16 -4
- package/dist/web/drawn-icons.js +2 -1
- package/dist/web/layout/header-action-pinned.d.ts +4 -2
- package/dist/web/layout/header-action-pinned.js +13 -4
- package/dist/web/layout/header-overflow-menu.d.ts +2 -0
- package/dist/web/layout/header-overflow-menu.js +2 -0
- package/dist/web/layout/notification-bell.js +12 -3
- package/dist/web/layout/page-header-slot.d.ts +2 -0
- package/dist/web/layout/page-header-slot.js +4 -0
- package/dist/web/layout/screen-focus.js +4 -1
- package/dist/web/layout/shell-header.js +13 -5
- package/dist/web/primitives/banner.js +24 -8
- package/dist/web/primitives/card.js +5 -3
- package/dist/web/primitives/combobox.js +2 -2
- package/dist/web/primitives/data-table/actions-column.js +1 -1
- package/dist/web/primitives/data-table/card-body.d.ts +1 -1
- package/dist/web/primitives/data-table/card-body.js +37 -14
- package/dist/web/primitives/data-table/card-frame.d.ts +2 -0
- package/dist/web/primitives/data-table/card-frame.js +3 -0
- package/dist/web/primitives/data-table/card-row.js +34 -10
- package/dist/web/primitives/data-table/card-sort-select.js +1 -1
- package/dist/web/primitives/data-table/card-view.js +1 -1
- package/dist/web/primitives/data-table/data-cell-props.d.ts +4 -1
- package/dist/web/primitives/data-table/data-cell-props.js +3 -0
- package/dist/web/primitives/data-table/density.d.ts +3 -1
- package/dist/web/primitives/data-table/density.js +11 -4
- package/dist/web/primitives/data-table/row-click-guard.d.ts +2 -0
- package/dist/web/primitives/data-table/row-click-guard.js +19 -0
- package/dist/web/primitives/data-table/row-render-parts.d.ts +1 -1
- package/dist/web/primitives/data-table/row-render-parts.js +3 -5
- package/dist/web/primitives/data-table/sort-options-select.js +2 -2
- package/dist/web/primitives/data-table/sortable-header.js +4 -4
- package/dist/web/primitives/data-table/table-body.js +3 -1
- package/dist/web/primitives/data-table/table-chrome.js +1 -3
- package/dist/web/primitives/data-table/table-content.js +6 -6
- package/dist/web/primitives/data-table/table-data-cell.js +31 -17
- package/dist/web/primitives/data-table/table-header-row.js +1 -1
- package/dist/web/primitives/data-table/table-view.js +1 -1
- package/dist/web/primitives/data-table/toolbar.js +6 -7
- package/dist/web/primitives/data-table/use-data-table-state.d.ts +6 -1
- package/dist/web/primitives/data-table/use-data-table-state.js +12 -2
- package/dist/web/primitives/data-table-cell.d.ts +17 -3
- package/dist/web/primitives/data-table-cell.js +130 -36
- package/dist/web/primitives/data-table.js +1 -1
- package/dist/web/primitives/default-form.d.ts +1 -1
- package/dist/web/primitives/default-form.js +15 -11
- package/dist/web/primitives/drawer.js +2 -3
- package/dist/web/primitives/facet-filter.d.ts +1 -1
- package/dist/web/primitives/facet-filter.js +2 -5
- package/dist/web/primitives/facet-search-filter.js +1 -1
- package/dist/web/primitives/facet-trigger-label.d.ts +1 -4
- package/dist/web/primitives/facet-trigger-label.js +4 -7
- package/dist/web/primitives/field.js +15 -8
- package/dist/web/primitives/form-footer-parts.js +6 -3
- package/dist/web/primitives/form.js +6 -8
- package/dist/web/primitives/index.js +4 -0
- package/dist/web/primitives/inline-suffix.d.ts +2 -0
- package/dist/web/primitives/inline-suffix.js +5 -0
- package/dist/web/primitives/input-choice-kinds.js +12 -2
- package/dist/web/primitives/input-number-kinds.js +2 -2
- package/dist/web/primitives/input-text-kinds.js +1 -1
- package/dist/web/primitives/layout-elements.d.ts +4 -4
- package/dist/web/primitives/layout-elements.js +50 -13
- package/dist/web/primitives/layout.d.ts +1 -1
- package/dist/web/primitives/layout.js +1 -1
- package/dist/web/primitives/locale-number.d.ts +0 -1
- package/dist/web/primitives/locale-number.js +1 -13
- package/dist/web/primitives/money-input.js +10 -8
- package/dist/web/primitives/narrow-pinned-footer.js +7 -3
- package/dist/web/primitives/number-input.d.ts +2 -1
- package/dist/web/primitives/number-input.js +11 -5
- package/dist/web/primitives/page-header.d.ts +1 -1
- package/dist/web/primitives/page-header.js +8 -1
- package/dist/web/primitives/pager.js +12 -21
- package/dist/web/primitives/photo-grid.d.ts +3 -0
- package/dist/web/primitives/photo-grid.js +6 -0
- package/dist/web/primitives/record-steps.d.ts +1 -1
- package/dist/web/primitives/record-steps.js +7 -16
- package/dist/web/primitives/record-summary.d.ts +1 -1
- package/dist/web/primitives/record-summary.js +8 -3
- package/dist/web/primitives/row-actions.js +38 -24
- package/dist/web/primitives/step-list.d.ts +3 -0
- package/dist/web/primitives/step-list.js +11 -0
- package/dist/web/primitives/use-container-narrow.d.ts +12 -0
- package/dist/web/primitives/use-container-narrow.js +42 -0
- package/dist/web/ui/input.js +1 -1
- package/dist/web/ui/textarea.js +1 -1
- package/dist/web/widgets/dashboard-list-cards.js +6 -3
- package/dist/web/widgets/dashboard-list.d.ts +6 -1
- package/dist/web/widgets/dashboard-list.js +12 -7
- package/dist/web/widgets/drawer-panel-class.js +1 -1
- package/dist/web/widgets/progress-list.js +1 -1
- package/dist/web/widgets/stat-box-cell.js +1 -1
- package/package.json +5 -5
- package/src/changes.json +105 -0
- package/src/web/styles.css +3 -2
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { evalFieldCondition } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
3
|
import { useState } from "react";
|
|
3
4
|
import { RenderEdit } from "../components/render-edit.js";
|
|
5
|
+
import { WriteFormRegistryProvider } from "../components/write-form-registry.js";
|
|
4
6
|
import { useOptionalDispatcher } from "../context/dispatcher-context.js";
|
|
5
7
|
import { useUserRoles } from "../context/user-roles-context.js";
|
|
6
8
|
import { useLocale, useTranslation } from "../i18n.js";
|
|
@@ -47,11 +49,13 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
47
49
|
// entityId fallback (resolveExtensionEntityId in render-edit.tsx) would
|
|
48
50
|
// let a client-controlled value leak where none is meant to reach.
|
|
49
51
|
const effectiveEntityId = screen.singleton === true ? undefined : entityId;
|
|
50
|
-
const { activeSection, hasTabs, entity, detailScreen, detailQuery, reloadNonce, reloadDetail } = useProjectionDetailData({ screen, Tabs: primitives.Tabs, nav, effectiveEntityId });
|
|
52
|
+
const { activeSection, activeSections, visibleSections, hasTabs, entity, detailScreen, detailQuery, reloadNonce, reloadDetail, } = useProjectionDetailData({ screen, Tabs: primitives.Tabs, nav, effectiveEntityId });
|
|
51
53
|
// Header actions render directly via RenderEditActionButton
|
|
52
54
|
// headerActions moved out of RenderEdit's footer — this component owns
|
|
53
55
|
// the failure-surfacing state RenderEdit used to own for them.
|
|
54
56
|
const [actionError, setActionError] = useState(null);
|
|
57
|
+
// writeForm sections register here so an action with `submitWith` can send their values.
|
|
58
|
+
const [writeForms] = useState(() => new Map());
|
|
55
59
|
const appFeatures = useAppFeatures();
|
|
56
60
|
const userRoles = useUserRoles();
|
|
57
61
|
const dispatcher = useOptionalDispatcher();
|
|
@@ -63,7 +67,7 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
63
67
|
const returnTarget = screen.singleton === true ? undefined : returnTargetParam;
|
|
64
68
|
const drawer = useDrawerAction(schema);
|
|
65
69
|
const { openDrawer } = drawer;
|
|
66
|
-
const { buildSectionActions, buildItemActions, headerActions } = useProjectionDetailActions({
|
|
70
|
+
const { buildSectionActions, buildItemActions, headerActions, footerActions } = useProjectionDetailActions({
|
|
67
71
|
schema,
|
|
68
72
|
screen,
|
|
69
73
|
effectiveTranslate,
|
|
@@ -79,11 +83,12 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
79
83
|
detailQuery,
|
|
80
84
|
reloadDetail,
|
|
81
85
|
activeTabId: activeSection?.id,
|
|
86
|
+
writeForms,
|
|
82
87
|
});
|
|
83
88
|
const { hasMetrics, headerActionsList, hasHeaderActions, hasHeaderCard, renderedDetailScreen } = useProjectionDetailLayout({ screen, headerActions, hasTabs, detailScreen });
|
|
84
89
|
const recordId = detailQuery.data?.["id"];
|
|
85
90
|
const tabCounts = useRelatedListTabCounts({
|
|
86
|
-
sections: hasTabs ?
|
|
91
|
+
sections: hasTabs ? visibleSections : [],
|
|
87
92
|
parentId: effectiveEntityId ?? (typeof recordId === "string" ? recordId : undefined),
|
|
88
93
|
});
|
|
89
94
|
if (effectiveEntityId === undefined && screen.singleton !== true) {
|
|
@@ -103,8 +108,13 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
103
108
|
if (!record) {
|
|
104
109
|
return renderRecordNotFound({ schema, screen, nav, returnTarget, effectiveTranslate });
|
|
105
110
|
}
|
|
111
|
+
const visibleMetrics = screen.metrics?.filter((metric) => metric.visibleWhen === undefined || evalFieldCondition(metric.visibleWhen, { ...record }));
|
|
106
112
|
const regionModel = {
|
|
107
|
-
screen
|
|
113
|
+
screen: {
|
|
114
|
+
...screen,
|
|
115
|
+
...(visibleMetrics !== undefined && { metrics: visibleMetrics }),
|
|
116
|
+
layout: { ...screen.layout, sections: visibleSections },
|
|
117
|
+
},
|
|
108
118
|
record,
|
|
109
119
|
primitives,
|
|
110
120
|
effectiveTranslate,
|
|
@@ -119,7 +129,7 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
119
129
|
pageHeaderSlotAvailable,
|
|
120
130
|
pageHeaderCompactContext,
|
|
121
131
|
hasHeaderActions,
|
|
122
|
-
hasMetrics,
|
|
132
|
+
hasMetrics: hasMetrics && (visibleMetrics?.length ?? 0) > 0,
|
|
123
133
|
hasHeaderCard,
|
|
124
134
|
hasTabs,
|
|
125
135
|
tabCounts,
|
|
@@ -129,13 +139,24 @@ export function ProjectionDetailBody({ schema, screen, translate, entityId, }) {
|
|
|
129
139
|
};
|
|
130
140
|
const regionPieces = deriveDetailRegionPieces(regionModel);
|
|
131
141
|
const renderHeaderContent = (headerSlot) => renderDetailHeaderContent(regionModel, regionPieces, headerSlot);
|
|
132
|
-
return (_jsxs(
|
|
142
|
+
return (_jsxs(WriteFormRegistryProvider, { value: writeForms, children: [refetchErrorBanner, _jsx(RenderEdit, { refreshToken: reloadNonce, screen: renderedDetailScreen, entity: entity, featureName: schema.featureName, initial: record, entityId: effectiveEntityId, customSubmit: async () => ({ isSuccess: true, validationBlocked: false, data: undefined }), onReload: reloadDetail, onRelatedListDrawerAction: openDrawer, ...(translate !== undefined && { translate }), ...(hasTabs && activeSection !== undefined && { activeTabId: activeSection.id }), ...(screen.footerHint !== undefined && {
|
|
143
|
+
footerHint: effectiveTranslate(screen.footerHint),
|
|
144
|
+
}), ...(hasTabs &&
|
|
145
|
+
activeSections.length === 1 &&
|
|
146
|
+
screen.layout.narrowTabs !== false && { hideSectionTitles: true }), recordSections: {
|
|
147
|
+
labelTitles: true,
|
|
148
|
+
...(hasTabs &&
|
|
149
|
+
activeSections.length > 1 &&
|
|
150
|
+
activeSections[0]?.tabLabel === undefined && { omitFirstTitle: true }),
|
|
151
|
+
...(screen.pageNavigation === false && { pageNavigation: false }),
|
|
152
|
+
...(screen.photosBeside === true && { photosBeside: true }),
|
|
153
|
+
}, ...(screenFillsHeight(screen) && { fillScreenHeight: true }), ...((hasHeaderCard ||
|
|
133
154
|
hasTabs ||
|
|
134
155
|
hasRecordGuidance(screen) ||
|
|
135
156
|
screen.slots?.header !== undefined ||
|
|
136
157
|
screen.recordTitleField !== undefined) && {
|
|
137
158
|
headerRegion: renderHeaderContent,
|
|
138
|
-
}), buildSectionActions: buildSectionActions, valueDisplay: screen.valueDisplay ?? "text" }, entityId), renderProjectionDrawerHost({
|
|
159
|
+
}), ...(footerActions !== undefined && footerActions.length > 0 && { actions: footerActions }), buildSectionActions: buildSectionActions, valueDisplay: screen.valueDisplay ?? "text" }, entityId), renderProjectionDrawerHost({
|
|
139
160
|
schema,
|
|
140
161
|
translate,
|
|
141
162
|
userRoles,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type RowAction } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
2
|
import { type ReactNode } from "react";
|
|
3
3
|
import type { RenderEditAction } from "../components/render-edit-types.ts";
|
|
4
4
|
import type { DetailHeaderModel } from "./projection-detail-header.tsx";
|
|
@@ -9,5 +9,6 @@ export type DetailGuidanceModel = DetailHeaderModel & {
|
|
|
9
9
|
};
|
|
10
10
|
export declare function wrapLayout(primitives: DetailGuidanceModel["primitives"], className: string, node: ReactNode): ReactNode;
|
|
11
11
|
export declare function renderDetailBreadcrumb(model: DetailGuidanceModel): ReactNode;
|
|
12
|
+
export declare function renderDetailSummary(model: DetailGuidanceModel): ReactNode;
|
|
12
13
|
/** Summary, banner, progress and steps in reading order; blocks whose record field holds nothing drop out. */
|
|
13
14
|
export declare function renderDetailGuidance(model: DetailGuidanceModel): ReactNode;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { evalFieldCondition, } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
3
|
import { Fragment } from "react";
|
|
3
4
|
import { RenderEditActionButton } from "../components/render-edit-action-button.js";
|
|
4
5
|
import { pluralKey } from "../headless/plural-key.js";
|
|
@@ -76,7 +77,7 @@ export function renderDetailBreadcrumb(model) {
|
|
|
76
77
|
}
|
|
77
78
|
return (_jsx(Text, { testId: testId, children: items.map((item, index) => (_jsxs(Fragment, { children: [index > 0 && (_jsx(Text, { variant: "muted", decorative: true, children: " / " })), item.link !== undefined ? (_jsx(Link, { href: item.link.href, ...(item.link.onPress !== undefined && { onPress: item.link.onPress }), children: item.label })) : (_jsx(Text, { children: item.label }))] }, keys[index]))) }));
|
|
78
79
|
}
|
|
79
|
-
function
|
|
80
|
+
export function renderDetailSummary(model) {
|
|
80
81
|
const spec = model.screen.summary;
|
|
81
82
|
if (spec === undefined)
|
|
82
83
|
return undefined;
|
|
@@ -90,7 +91,7 @@ function renderSummary(model) {
|
|
|
90
91
|
const { RecordSummary, Text } = model.primitives;
|
|
91
92
|
const testId = "kumiko-screen-projection-detail-summary";
|
|
92
93
|
if (RecordSummary !== undefined) {
|
|
93
|
-
return (_jsx(RecordSummary, { text: text, ...(narrowText !== undefined && { narrowText }), ...(tone !== undefined && { tone }), testId: testId }));
|
|
94
|
+
return (_jsx(RecordSummary, { text: text, ...(narrowText !== undefined && { narrowText }), ...(tone !== undefined && { tone }), ...(spec.icon !== undefined && { icon: spec.icon }), testId: testId }));
|
|
94
95
|
}
|
|
95
96
|
return _jsx(Text, { testId: testId, children: text });
|
|
96
97
|
}
|
|
@@ -103,46 +104,57 @@ function renderBanner(model) {
|
|
|
103
104
|
return undefined;
|
|
104
105
|
const { Banner } = model.primitives;
|
|
105
106
|
const actions = renderItemActions(model, spec.actions, notice);
|
|
106
|
-
return wrapLayout(model.primitives, GUIDANCE_INSET, _jsx(Banner, { variant: BANNER_VARIANT[notice.tone ?? "neutral"], icon: BANNER_ICON[notice.tone ?? "neutral"], title: notice.title, ...(notice.narrowTitle !== undefined && { narrowTitle: notice.narrowTitle }), ...(notice.narrowText !== undefined && { narrowText: notice.narrowText }), inline: true, ...(actions !== undefined && { actions }), testId: "kumiko-screen-projection-detail-banner", children: notice.text }));
|
|
107
|
+
return wrapLayout(model.primitives, GUIDANCE_INSET, _jsx(Banner, { variant: BANNER_VARIANT[notice.tone ?? "neutral"], ...(spec.iconless !== true && { icon: BANNER_ICON[notice.tone ?? "neutral"] }), title: notice.title, ...(notice.narrowTitle !== undefined && { narrowTitle: notice.narrowTitle }), ...(notice.narrowText !== undefined && { narrowText: notice.narrowText }), inline: true, ...(actions !== undefined && { actions }), testId: "kumiko-screen-projection-detail-banner", children: notice.text }));
|
|
108
|
+
}
|
|
109
|
+
function buildStepItem(model, spec, step) {
|
|
110
|
+
const [mainAction, ...otherActions] = resolveItemActions(model, spec.actions, step);
|
|
111
|
+
return {
|
|
112
|
+
id: step.id,
|
|
113
|
+
title: step.title,
|
|
114
|
+
...(step.narrowTitle !== undefined && { narrowTitle: step.narrowTitle }),
|
|
115
|
+
...(step.detail !== undefined && { detail: step.detail }),
|
|
116
|
+
...(step.narrowDetail !== undefined && { narrowDetail: step.narrowDetail }),
|
|
117
|
+
...(step.tone !== undefined && { tone: step.tone }),
|
|
118
|
+
...(step.why !== undefined && { reason: step.why }),
|
|
119
|
+
...(step.why !== undefined && step.whyOpen === true && { reasonOpen: true }),
|
|
120
|
+
...(step.why !== undefined && step.whyTitle !== undefined && { reasonTitle: step.whyTitle }),
|
|
121
|
+
...(mainAction !== undefined && {
|
|
122
|
+
actions: renderActionButtons(model, [mainAction], spec.actions),
|
|
123
|
+
}),
|
|
124
|
+
...(otherActions.length > 0 && {
|
|
125
|
+
moreActions: renderActionButtons(model, otherActions, spec.actions),
|
|
126
|
+
}),
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
function stepsCollapseProps(spec, t) {
|
|
130
|
+
return {
|
|
131
|
+
...(spec.moreActionsLabel !== undefined && { moreActionsLabel: t(spec.moreActionsLabel) }),
|
|
132
|
+
...(spec.narrowLimit !== undefined && {
|
|
133
|
+
narrowLimit: spec.narrowLimit,
|
|
134
|
+
moreLabel: (count) => t(pluralKey(spec.narrowMoreLabel ?? "kumiko.detail.steps.more", count), { count }),
|
|
135
|
+
lessLabel: t("kumiko.detail.steps.less"),
|
|
136
|
+
}),
|
|
137
|
+
};
|
|
107
138
|
}
|
|
108
139
|
function renderSteps(model) {
|
|
109
140
|
const spec = model.screen.steps;
|
|
110
141
|
if (spec === undefined)
|
|
111
142
|
return undefined;
|
|
143
|
+
if (spec.visibleWhen !== undefined &&
|
|
144
|
+
!evalFieldCondition(spec.visibleWhen, { ...model.record })) {
|
|
145
|
+
return undefined;
|
|
146
|
+
}
|
|
112
147
|
const { effectiveTranslate: t, record } = model;
|
|
113
148
|
const steps = readSteps(record[spec.field]);
|
|
114
149
|
const title = t(spec.title ?? "kumiko.detail.steps.title");
|
|
115
150
|
const subtitleRaw = spec.subtitleField !== undefined ? record[spec.subtitleField] : undefined;
|
|
116
151
|
const subtitle = typeof subtitleRaw === "string" && subtitleRaw !== "" ? subtitleRaw : undefined;
|
|
117
152
|
const emptyLabel = t(spec.emptyLabel ?? "kumiko.detail.steps.empty");
|
|
118
|
-
const items = steps.map((step) =>
|
|
119
|
-
const [mainAction, ...otherActions] = resolveItemActions(model, spec.actions, step);
|
|
120
|
-
return {
|
|
121
|
-
id: step.id,
|
|
122
|
-
title: step.title,
|
|
123
|
-
...(step.narrowTitle !== undefined && { narrowTitle: step.narrowTitle }),
|
|
124
|
-
...(step.detail !== undefined && { detail: step.detail }),
|
|
125
|
-
...(step.narrowDetail !== undefined && { narrowDetail: step.narrowDetail }),
|
|
126
|
-
...(step.tone !== undefined && { tone: step.tone }),
|
|
127
|
-
...(step.why !== undefined && { reason: step.why }),
|
|
128
|
-
...(step.why !== undefined && step.whyOpen === true && { reasonOpen: true }),
|
|
129
|
-
...(step.why !== undefined && step.whyTitle !== undefined && { reasonTitle: step.whyTitle }),
|
|
130
|
-
...(mainAction !== undefined && {
|
|
131
|
-
actions: renderActionButtons(model, [mainAction], spec.actions),
|
|
132
|
-
}),
|
|
133
|
-
...(otherActions.length > 0 && {
|
|
134
|
-
moreActions: renderActionButtons(model, otherActions, spec.actions),
|
|
135
|
-
}),
|
|
136
|
-
};
|
|
137
|
-
});
|
|
153
|
+
const items = steps.map((step) => buildStepItem(model, spec, step));
|
|
138
154
|
const { RecordSteps, Card, Text } = model.primitives;
|
|
139
155
|
const testId = "kumiko-screen-projection-detail-steps";
|
|
140
156
|
if (RecordSteps !== undefined) {
|
|
141
|
-
return (_jsx(RecordSteps, { title: title, ...(subtitle !== undefined && { subtitle }), emptyLabel: emptyLabel, reasonLabel: t("kumiko.detail.steps.reason"), ...(spec.
|
|
142
|
-
narrowLimit: spec.narrowLimit,
|
|
143
|
-
moreLabel: (count) => t(pluralKey(spec.narrowMoreLabel ?? "kumiko.detail.steps.more", count), { count }),
|
|
144
|
-
lessLabel: t("kumiko.detail.steps.less"),
|
|
145
|
-
}), items: items, count: items.length, testId: testId }));
|
|
157
|
+
return (_jsx(RecordSteps, { title: title, ...(subtitle !== undefined && { subtitle }), emptyLabel: emptyLabel, reasonLabel: t("kumiko.detail.steps.reason"), ...stepsCollapseProps(spec, t), items: items, count: items.length, testId: testId }));
|
|
146
158
|
}
|
|
147
159
|
return (_jsx(Card, { slots: { title, ...(subtitle !== undefined && { subtitle }) }, testId: testId, children: items.length === 0 ? (_jsx(Text, { variant: "muted", children: emptyLabel })) : (items.map((item) => (_jsxs(Fragment, { children: [_jsx(Text, { children: item.title }), item.detail !== undefined && _jsx(Text, { variant: "muted", children: item.detail }), item.reason !== undefined && _jsx(Text, { variant: "muted", children: item.reason }), item.actions, item.moreActions] }, item.id)))) }));
|
|
148
160
|
}
|
|
@@ -192,6 +204,9 @@ export function renderDetailGuidance(model) {
|
|
|
192
204
|
const beside = progress?.placement === "beside-steps" && steps !== undefined;
|
|
193
205
|
const progressNode = renderProgress(model, beside);
|
|
194
206
|
const progressInset = progress?.hideOnNarrow === true ? `${PROGRESS_INSET} max-sm:hidden` : PROGRESS_INSET;
|
|
195
|
-
|
|
196
|
-
|
|
207
|
+
const lower = (_jsx(_Fragment, { children: beside ? (wrapLayout(model.primitives, "grid grid-cols-1 items-stretch gap-4 lg:grid-cols-12", _jsxs(_Fragment, { children: [wrapLayout(model.primitives, progressNode !== undefined ? "min-w-0 lg:col-span-8" : "min-w-0 lg:col-span-12", renderSteps(model)), progressNode !== undefined &&
|
|
208
|
+
wrapLayout(model.primitives, `${progressInset} lg:col-span-4 lg:flex lg:flex-col lg:pl-0 lg:[&>*]:flex-1`, progressNode)] }))) : (_jsxs(_Fragment, { children: [progressNode !== undefined && wrapLayout(model.primitives, progressInset, progressNode), renderSteps(model)] })) }));
|
|
209
|
+
return (_jsxs(_Fragment, { children: [renderBanner(model), model.screen.metricsPlacement?.narrow === "before-steps"
|
|
210
|
+
? wrapLayout(model.primitives, "max-md:order-2", lower)
|
|
211
|
+
: lower] }));
|
|
197
212
|
}
|
|
@@ -4,7 +4,7 @@ import { type Translate } from "../headless/index.ts";
|
|
|
4
4
|
import { type StatusBadgeOptionTone } from "../primitives.tsx";
|
|
5
5
|
export declare function headerStatusTone(header: NonNullable<ProjectionDetailScreenDefinition["header"]>, record: Readonly<Record<string, unknown>>): StatusBadgeOptionTone | undefined;
|
|
6
6
|
export declare function resolveHeaderStatusText(screen: ProjectionDetailScreenDefinition, record: Readonly<Record<string, unknown>>, translate: Translate): string;
|
|
7
|
-
export declare function formatOrRaw(format: FormatSpec | undefined, raw: unknown, translate: Translate): string;
|
|
7
|
+
export declare function formatOrRaw(format: FormatSpec | undefined, raw: unknown, translate: Translate, uiLocale?: string): string;
|
|
8
8
|
export declare function resolveSubtitleHref(header: ProjectionDetailScreenDefinition["header"], record: Readonly<Record<string, unknown>>): string | undefined;
|
|
9
9
|
export type DetailTabItem = {
|
|
10
10
|
readonly id: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFieldsEditSection, isFormatSpec, isWriteFormEditSection, normalizeEditField, sectionFieldSpecs, } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
2
|
import { applyFormatSpec } from "../headless/index.js";
|
|
3
3
|
import { statusToneForOptionTone, statusToneForValue, } from "../primitives.js";
|
|
4
|
-
import { isAbsoluteHttpUrl } from "./projection-detail-navigation.js";
|
|
4
|
+
import { isAbsoluteHttpUrl, withUiLocale } from "./projection-detail-navigation.js";
|
|
5
5
|
export function headerStatusTone(header, record) {
|
|
6
6
|
// skip: a header without status has no tone
|
|
7
7
|
if (header.status === undefined)
|
|
@@ -39,11 +39,11 @@ export function resolveHeaderStatusText(screen, record, translate) {
|
|
|
39
39
|
const format = screen.header?.statusFormat ?? layoutStatusFormat(screen, statusField);
|
|
40
40
|
return formatOrRaw(format, raw, translate);
|
|
41
41
|
}
|
|
42
|
-
export function formatOrRaw(format, raw, translate) {
|
|
42
|
+
export function formatOrRaw(format, raw, translate, uiLocale) {
|
|
43
43
|
const rawText = String(raw ?? "");
|
|
44
44
|
if (format === undefined)
|
|
45
45
|
return rawText;
|
|
46
|
-
const formatted = applyFormatSpec(format, raw, translate);
|
|
46
|
+
const formatted = applyFormatSpec(uiLocale === undefined ? format : withUiLocale(format, uiLocale), raw, translate);
|
|
47
47
|
return formatted === "" ? rawText : formatted;
|
|
48
48
|
}
|
|
49
49
|
export function resolveSubtitleHref(header, record) {
|
|
@@ -54,13 +54,21 @@ export function resolveSubtitleHref(header, record) {
|
|
|
54
54
|
return typeof value === "string" && isAbsoluteHttpUrl(value) ? value : undefined;
|
|
55
55
|
}
|
|
56
56
|
export function buildDetailTabItems(sections, record, translate, queryCounts = {}) {
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
// Adjacent sections sharing an id are one tab; its label and count come from the first.
|
|
58
|
+
return sections
|
|
59
|
+
.filter((section, index) => section.id !== sections[index - 1]?.id)
|
|
60
|
+
.map((section) => {
|
|
61
|
+
const countField = isWriteFormEditSection(section) || section.kind === "stepList"
|
|
62
|
+
? undefined
|
|
63
|
+
: section.countField;
|
|
59
64
|
const countValue = countField !== undefined ? record[countField] : queryCounts[section.id ?? ""];
|
|
60
65
|
const count = typeof countValue === "number" && Number.isFinite(countValue) ? countValue : undefined;
|
|
61
66
|
return {
|
|
62
67
|
id: section.id ?? "",
|
|
63
|
-
label: translate(
|
|
68
|
+
label: translate(sections.find((s) => s.id === section.id && s.tabLabel !== undefined)?.tabLabel ??
|
|
69
|
+
section.title ??
|
|
70
|
+
section.id ??
|
|
71
|
+
""),
|
|
64
72
|
...(count !== undefined && { count }),
|
|
65
73
|
};
|
|
66
74
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { resolveRecordTitle } from "../components/render-edit-helpers.js";
|
|
3
3
|
import { requestLeave } from "../leave-guard.js";
|
|
4
|
-
import { renderDetailBreadcrumb, renderDetailGuidance, wrapLayout, } from "./projection-detail-guidance.js";
|
|
5
|
-
import { buildMetricItems, renderActionErrorBanner, renderBandSubtitle, renderHeaderActionsContent, renderHeaderSubtitleSlot, renderHeaderTitleSlot, renderMetricsBlock, renderRecordTitleBlock, renderStatusBadge, } from "./projection-detail-header.js";
|
|
4
|
+
import { renderDetailBreadcrumb, renderDetailGuidance, renderDetailSummary, wrapLayout, } from "./projection-detail-guidance.js";
|
|
5
|
+
import { buildMetricItems, renderActionErrorBanner, renderBandSubtitle, renderHeaderActionsContent, renderHeaderSubtitleSlot, renderHeaderTitleSlot, renderMetricsBlock, renderMobileSummary, renderRecordTitleBlock, renderStatusBadge, } from "./projection-detail-header.js";
|
|
6
6
|
import { buildDetailTabItems } from "./projection-detail-header-model.js";
|
|
7
7
|
export function deriveDetailRegionPieces(model) {
|
|
8
8
|
const { screen, record, primitives, actionError, hasHeaderActions } = model;
|
|
@@ -46,12 +46,26 @@ const NARROW_METRICS_ORDER = "max-md:order-1";
|
|
|
46
46
|
const LEAD_BAND_SHARED_PADDING = "[&>*]:pb-0";
|
|
47
47
|
const TILES_BAND_SHARED_PADDING = "[&>*]:pt-3";
|
|
48
48
|
const NARROW_TABS_ORDER = "max-md:order-2";
|
|
49
|
+
const NARROW_TABS_ORDER_AFTER_STEPS = "max-md:order-3";
|
|
49
50
|
function usesNarrowMetricsOrder(model) {
|
|
50
|
-
return model.screen.metricsPlacement?.narrow
|
|
51
|
+
return model.screen.metricsPlacement?.narrow !== undefined;
|
|
52
|
+
}
|
|
53
|
+
function narrowTabsOrder(model) {
|
|
54
|
+
return model.screen.metricsPlacement?.narrow === "before-steps"
|
|
55
|
+
? NARROW_TABS_ORDER_AFTER_STEPS
|
|
56
|
+
: NARROW_TABS_ORDER;
|
|
51
57
|
}
|
|
52
58
|
function wrapNarrowOrder(model, orderClass, node) {
|
|
53
59
|
return usesNarrowMetricsOrder(model) ? wrapLayout(model.primitives, orderClass, node) : node;
|
|
54
60
|
}
|
|
61
|
+
// `narrowTabs: false` drops the strip on the phone; the sections then stand one under the other.
|
|
62
|
+
function wrapTabStrip(model, strip) {
|
|
63
|
+
const classes = [
|
|
64
|
+
usesNarrowMetricsOrder(model) ? narrowTabsOrder(model) : undefined,
|
|
65
|
+
model.screen.layout.narrowTabs === false ? "max-sm:hidden" : undefined,
|
|
66
|
+
].filter((c) => c !== undefined);
|
|
67
|
+
return classes.length === 0 ? strip : wrapLayout(model.primitives, classes.join(" "), strip);
|
|
68
|
+
}
|
|
55
69
|
// Only the metric tiles move below the guidance on narrow screens; the lead and the
|
|
56
70
|
// subtitle/status line stay under the title, so they get their own tile-less band.
|
|
57
71
|
function renderBandWithNarrowMetrics(model, metricItems, subtitle, lead) {
|
|
@@ -79,16 +93,18 @@ function renderPageHeaderBranch(model, pieces, headerSlot, PageHeader) {
|
|
|
79
93
|
// The title block owns chip and subtitle, so neither the shell header nor the band repeats them.
|
|
80
94
|
const hasTitleBlock = titleText !== undefined;
|
|
81
95
|
const bandSubtitle = hasTitleBlock ? undefined : pieces.bandSubtitle;
|
|
82
|
-
return (_jsxs(_Fragment, { children: [_jsx(PageHeader, { ...(hasTitleBlock && { bodyTitle: true }), ...(hasTitleBlock &&
|
|
83
|
-
|
|
96
|
+
return (_jsxs(_Fragment, { children: [_jsx(PageHeader, { ...(hasTitleBlock && { bodyTitle: true }), ...(hasTitleBlock && { recordTitle: shortTitleOf(header, record) ?? titleText }), ...(header?.narrowTitle !== undefined && {
|
|
97
|
+
narrowRecordTitle: model.effectiveTranslate(header.narrowTitle),
|
|
98
|
+
}), ...(header === undefined && recordTitle !== undefined && { title: recordTitle }), ...(!hasTitleBlock &&
|
|
99
|
+
!pageHeaderCompact &&
|
|
84
100
|
statusBadge !== undefined && {
|
|
85
101
|
status: statusBadge,
|
|
86
102
|
}), ...(hasHeaderActions && {
|
|
87
103
|
actions: renderHeaderActionsContent(model, { compact: pageHeaderCompact, PageHeader }),
|
|
88
104
|
}) }), titleText !== undefined &&
|
|
89
|
-
renderRecordTitleBlock(model, titleText, statusBadge, pieces.headerSubtitleSlot,
|
|
105
|
+
renderRecordTitleBlock(model, titleText, statusBadge, pieces.headerSubtitleSlot, false), hasTitleBlock && renderMobileSummary(model), hasTitleBlock && renderDetailSummary(model), MetricBand === undefined && bandSubtitle, MetricBand === undefined && headerSlot, (hasMetrics || bandSubtitle !== undefined || headerSlot !== undefined) &&
|
|
90
106
|
(MetricBand !== undefined || hasMetrics) &&
|
|
91
|
-
renderBandWithNarrowMetrics(model, metricItems, bandSubtitle, MetricBand !== undefined ? headerSlot : undefined), pieces.actionErrorBanner] }));
|
|
107
|
+
renderBandWithNarrowMetrics(model, metricItems, bandSubtitle, MetricBand !== undefined ? headerSlot : undefined), !hasTitleBlock && renderMobileSummary(model), !hasTitleBlock && renderDetailSummary(model), pieces.actionErrorBanner] }));
|
|
92
108
|
}
|
|
93
109
|
function renderHeaderCardBranch(model, pieces, headerSlot) {
|
|
94
110
|
const { primitives, hasHeaderActions, hasMetrics, hasHeaderCard } = model;
|
|
@@ -103,7 +119,7 @@ function renderHeaderCardBranch(model, pieces, headerSlot) {
|
|
|
103
119
|
...(headerSubtitleSlot !== undefined && { subtitle: headerSubtitleSlot }),
|
|
104
120
|
...(headerSlot !== undefined && { headerContent: headerSlot }),
|
|
105
121
|
...(hasHeaderActions && { headerActions: headerActionsContent }),
|
|
106
|
-
}, children: [hasMetrics && !metricsOutsideCard && renderMetricsBlock(model, pieces.metricItems), pieces.actionErrorBanner] })), metricsOutsideCard &&
|
|
122
|
+
}, children: [hasMetrics && !metricsOutsideCard && renderMetricsBlock(model, pieces.metricItems), pieces.actionErrorBanner] })), renderMobileSummary(model), renderDetailSummary(model), metricsOutsideCard &&
|
|
107
123
|
wrapNarrowOrder(model, NARROW_METRICS_ORDER, renderMetricsBlock(model, pieces.metricItems))] }));
|
|
108
124
|
}
|
|
109
125
|
function renderDetailTabs(model, activeSection, Tabs) {
|
|
@@ -119,5 +135,5 @@ export function renderDetailHeaderContent(model, pieces, headerSlot) {
|
|
|
119
135
|
: renderHeaderCardBranch(model, pieces, headerSlot), renderDetailGuidance(model), hasTabs &&
|
|
120
136
|
activeSection !== undefined &&
|
|
121
137
|
Tabs !== undefined &&
|
|
122
|
-
|
|
138
|
+
wrapTabStrip(model, renderDetailTabs(model, activeSection, Tabs))] }));
|
|
123
139
|
}
|
|
@@ -30,6 +30,8 @@ export declare function renderRecordTitleBlock(model: DetailHeaderModel, titleTe
|
|
|
30
30
|
export declare function renderHeaderSubtitleSlot(model: DetailHeaderModel): ReactNode;
|
|
31
31
|
export declare function buildMetricItems(model: DetailHeaderModel): ReactNode[] | undefined;
|
|
32
32
|
export declare function renderMetricsBlock(model: DetailHeaderModel, metricItems: ReactNode[] | undefined, subtitle?: ReactNode, lead?: ReactNode): ReactNode;
|
|
33
|
+
/** The phone-only line right under the title; nothing when the screen has no `mobileSummary` or the field is empty. */
|
|
34
|
+
export declare function renderMobileSummary(model: DetailHeaderModel): ReactNode;
|
|
33
35
|
export declare function renderStatusBadge(model: DetailHeaderModel): ReactNode;
|
|
34
36
|
export declare function renderBandSubtitle(model: DetailHeaderModel, statusBadge: ReactNode, headerSubtitleSlot: ReactNode, pageHeaderCompact: boolean): ReactNode;
|
|
35
37
|
export declare function renderActionErrorBanner(model: DetailHeaderModel, actionError: ErrorNotice): ReactNode;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { Fragment } from "react";
|
|
2
|
+
import { Children, Fragment } from "react";
|
|
3
3
|
import { isSelectOptionTone } from "../status-tone.js";
|
|
4
4
|
import { ErrorReference } from "./error-reference.js";
|
|
5
5
|
import { HeaderActionsBar } from "./header-actions-bar.js";
|
|
@@ -9,11 +9,14 @@ import { navigateTargetAllows } from "./screen-access.js";
|
|
|
9
9
|
export function renderHeaderActionsContent(model, pageHeaderOptions) {
|
|
10
10
|
const { screen, primitives, headerActionsList, setActionError } = model;
|
|
11
11
|
const { Grid, Button, Dialog, ActionOverflowMenu } = primitives;
|
|
12
|
+
const menuActionIds = (screen.actions ?? [])
|
|
13
|
+
.filter((action) => action.placement === "menu")
|
|
14
|
+
.map((action) => action.id);
|
|
12
15
|
return (_jsx(Grid, { columns: "auto", testId: "kumiko-screen-projection-detail-actions", children: _jsx(HeaderActionsBar, { actions: headerActionsList, Button: Button, Dialog: Dialog, ActionOverflowMenu: ActionOverflowMenu, onError: setActionError, ...(pageHeaderOptions !== undefined && {
|
|
13
16
|
collapseAfterPrimary: true,
|
|
14
17
|
compact: pageHeaderOptions.compact,
|
|
15
18
|
PageHeader: pageHeaderOptions.PageHeader,
|
|
16
|
-
}), ...(screen.primaryAction !== undefined && { preferredPrimaryId: screen.primaryAction }), ...(screen.inlineActions !== undefined && { inlineActionIds: screen.inlineActions }) }) }));
|
|
19
|
+
}), ...(screen.primaryAction !== undefined && { preferredPrimaryId: screen.primaryAction }), ...(screen.inlineActions !== undefined && { inlineActionIds: screen.inlineActions }), ...(menuActionIds.length > 0 && { menuActionIds }) }) }));
|
|
17
20
|
}
|
|
18
21
|
// Plain Text, not Heading — the Card title slot already renders as its own
|
|
19
22
|
// heading element (h3); nesting another heading (h1) inside it is invalid HTML.
|
|
@@ -28,7 +31,9 @@ export function renderHeaderTitleSlot(model) {
|
|
|
28
31
|
// beside it only where the shell bar does not carry it (phone); on desktop the bar shows it.
|
|
29
32
|
export function renderRecordTitleBlock(model, titleText, statusBadge, subtitle, chipInBar) {
|
|
30
33
|
const { Grid, Heading, FillContainer } = model.primitives;
|
|
31
|
-
|
|
34
|
+
// With a mobileSummary the phone shows only the H1 and that line: chip and subtitle give way.
|
|
35
|
+
const hiddenOnPhone = (node) => FillContainer !== undefined && mobileSummaryLineOf(model) !== undefined && node != null ? (_jsx(FillContainer, { className: "max-sm:hidden", children: node })) : (node);
|
|
36
|
+
const block = (_jsxs(_Fragment, { children: [_jsxs(Grid, { columns: "auto", testId: "kumiko-screen-projection-detail-title-block", children: [_jsx(Heading, { variant: "page", testId: "kumiko-screen-projection-detail-title", children: titleText }), !chipInBar && hiddenOnPhone(statusBadge)] }), hiddenOnPhone(subtitle)] }));
|
|
32
37
|
return FillContainer !== undefined ? (_jsx(FillContainer, { className: "flex flex-col gap-1 px-6 pt-2 max-sm:px-4", children: block })) : (block);
|
|
33
38
|
}
|
|
34
39
|
function renderSubtitleParts(model, subtitleParts) {
|
|
@@ -115,7 +120,7 @@ export function buildMetricItems(model) {
|
|
|
115
120
|
const field = metric.field;
|
|
116
121
|
const label = metricLabel(metric, record, effectiveTranslate);
|
|
117
122
|
const rawValue = record[field];
|
|
118
|
-
const value = formatOrRaw(metric.format, rawValue, effectiveTranslate);
|
|
123
|
+
const value = formatOrRaw(metric.format, rawValue, effectiveTranslate, model.locale);
|
|
119
124
|
const tiles = screen.metricsStyle === "tiles";
|
|
120
125
|
const tone = metricTone(metric, record, rawValue);
|
|
121
126
|
const sub = metricSubline(metric.subField, record);
|
|
@@ -129,6 +134,28 @@ export function buildMetricItems(model) {
|
|
|
129
134
|
}
|
|
130
135
|
// Metrics are a dl band when the primitive exists; the old Grid stays as the fallback.
|
|
131
136
|
export function renderMetricsBlock(model, metricItems, subtitle, lead) {
|
|
137
|
+
const { FillContainer } = model.primitives;
|
|
138
|
+
if (mobileSummaryLineOf(model) === undefined || FillContainer === undefined) {
|
|
139
|
+
return renderPlainMetricsBlock(model, metricItems, subtitle, lead);
|
|
140
|
+
}
|
|
141
|
+
// Tiles give way to the summary line (rendered under the title) below sm; display:none keeps one copy for assistive tech.
|
|
142
|
+
const hiddenOnPhone = Children.map(metricItems, (item) => (_jsx(FillContainer, { className: "max-sm:hidden", children: item }))) ?? undefined;
|
|
143
|
+
const band = renderPlainMetricsBlock(model, hiddenOnPhone, subtitle, lead);
|
|
144
|
+
return subtitle === undefined && lead === undefined ? (_jsx(FillContainer, { className: "max-sm:hidden", children: band })) : (band);
|
|
145
|
+
}
|
|
146
|
+
function mobileSummaryLineOf(model) {
|
|
147
|
+
const raw = model.screen.mobileSummary === undefined ? undefined : model.record[model.screen.mobileSummary];
|
|
148
|
+
return typeof raw === "string" && raw !== "" ? raw : undefined;
|
|
149
|
+
}
|
|
150
|
+
/** The phone-only line right under the title; nothing when the screen has no `mobileSummary` or the field is empty. */
|
|
151
|
+
export function renderMobileSummary(model) {
|
|
152
|
+
const { FillContainer, Text } = model.primitives;
|
|
153
|
+
const line = mobileSummaryLineOf(model);
|
|
154
|
+
if (line === undefined || FillContainer === undefined)
|
|
155
|
+
return undefined;
|
|
156
|
+
return (_jsx(FillContainer, { className: "px-6 pt-1 text-left sm:hidden max-sm:px-4", children: _jsx(Text, { variant: "muted", testId: "kumiko-screen-projection-detail-mobile-summary", children: line }) }));
|
|
157
|
+
}
|
|
158
|
+
function renderPlainMetricsBlock(model, metricItems, subtitle, lead) {
|
|
132
159
|
const { screen, primitives } = model;
|
|
133
160
|
const { MetricBand, Grid } = primitives;
|
|
134
161
|
return MetricBand !== undefined ? (_jsx(MetricBand, { testId: "kumiko-screen-projection-detail-metrics", subtitle: subtitle, ...(lead !== undefined && { lead }), ...(screen.metricsStyle === "tiles" && { tiles: true }), children: metricItems })) : (_jsx(Grid, { columns: screen.metrics?.length ?? 1, testId: "kumiko-screen-projection-detail-metrics", children: metricItems }));
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { MetricNavigate, RecordHeaderSubtitlePart } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
|
+
import type { FormatSpec } from "@cosmicdrift/kumiko-types/screen";
|
|
2
3
|
import { type Translate } from "../headless/index.ts";
|
|
3
4
|
import type { FeatureSchema } from "./feature-schema.ts";
|
|
4
5
|
import type { NavApi } from "./nav.tsx";
|
|
@@ -14,4 +15,7 @@ export type SubtitlePartView = {
|
|
|
14
15
|
readonly prefix?: string;
|
|
15
16
|
};
|
|
16
17
|
export declare function metricNavigateResolves(navigate: MetricNavigate, record: Readonly<Record<string, unknown>>): boolean;
|
|
18
|
+
export declare function withUiLocale(format: FormatSpec, uiLocale: string): {
|
|
19
|
+
readonly format: string;
|
|
20
|
+
} & Readonly<Record<string, unknown>>;
|
|
17
21
|
export declare function buildSubtitleParts(parts: readonly RecordHeaderSubtitlePart[], record: Readonly<Record<string, unknown>>, nav: NavApi, appFeatures: readonly FeatureSchema[], userRoles: readonly string[] | undefined, host: ReturnHost | undefined, translate: Translate, locale: string): SubtitlePartView[];
|
|
@@ -79,13 +79,17 @@ function hrefForNavigate(nav, navigate, record) {
|
|
|
79
79
|
}
|
|
80
80
|
return undefined;
|
|
81
81
|
}
|
|
82
|
+
// The format keeps its own locale; otherwise it follows the UI locale instead of the browser's.
|
|
83
|
+
export function withUiLocale(format, uiLocale) {
|
|
84
|
+
return { ...format, locale: ("locale" in format ? format.locale : undefined) ?? uiLocale };
|
|
85
|
+
}
|
|
82
86
|
export function buildSubtitleParts(parts, record, nav, appFeatures, userRoles, host, translate, locale) {
|
|
83
87
|
return parts.flatMap((part) => {
|
|
84
88
|
const field = typeof part === "string" ? part : part.field;
|
|
85
89
|
const format = typeof part === "string" ? undefined : part.format;
|
|
86
90
|
const text = format === undefined
|
|
87
91
|
? String(record[field] ?? "")
|
|
88
|
-
: applyFormatSpec(
|
|
92
|
+
: applyFormatSpec(withUiLocale(format, locale), record[field], translate);
|
|
89
93
|
// skip: empty subtitle parts render nothing
|
|
90
94
|
if (text === "")
|
|
91
95
|
return [];
|
|
@@ -50,6 +50,7 @@ export function synthesizeProjectionEntity(columns, sortable) {
|
|
|
50
50
|
function rowPresentation(screen) {
|
|
51
51
|
return {
|
|
52
52
|
...(screen.rowToneField !== undefined && { rowToneField: screen.rowToneField }),
|
|
53
|
+
...(screen.mutedRowField !== undefined && { mutedRowField: screen.mutedRowField }),
|
|
53
54
|
...(screen.rowRenderer !== undefined && { rowRenderer: screen.rowRenderer }),
|
|
54
55
|
};
|
|
55
56
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { EntityEditScreenDefinition, FeatureSchema, RelatedListToolbarAction, RowAction, RowActionClientAction, RowActionDrawer, RowActionNavigate, RowActionWriteHandler, RowFieldExtractor, ToolbarAction } from "@cosmicdrift/kumiko-framework/ui-types";
|
|
2
2
|
import type { RenderEditAction } from "../components/render-edit-types.ts";
|
|
3
3
|
import type { ToolbarActionButton } from "../components/render-list.tsx";
|
|
4
|
+
import type { WriteFormRegistry } from "../components/write-form-registry.ts";
|
|
4
5
|
import type { Dispatcher, ListRowViewModel, Translate } from "../headless/index.ts";
|
|
5
6
|
import type { DataTableRowAction } from "../primitives.tsx";
|
|
6
7
|
import { type ClientActionRuntime } from "./client-actions.tsx";
|
|
@@ -110,5 +111,8 @@ export declare function buildRecordActions(options: {
|
|
|
110
111
|
* form holds unsaved input so it is not lost silently. */
|
|
111
112
|
readonly discardChanges?: DiscardChanges;
|
|
112
113
|
readonly clientActions?: ClientActionRuntime;
|
|
114
|
+
readonly writeForms?: WriteFormRegistry;
|
|
115
|
+
/** Ids of the actions that a writeForm section submits (`submitWith`). */
|
|
116
|
+
readonly submitWithIds?: ReadonlySet<string>;
|
|
113
117
|
}): readonly RenderEditAction[] | undefined;
|
|
114
118
|
export {};
|
package/dist/app/row-actions.js
CHANGED
|
@@ -465,7 +465,7 @@ export function deletesShownRecord(action, payload, shownRecordId) {
|
|
|
465
465
|
payload["id"] === shownRecordId);
|
|
466
466
|
}
|
|
467
467
|
function buildWriteHandlerRecordAction(action, options) {
|
|
468
|
-
const { record, translate, actionIcon, dispatcher, onWriteSuccess, defaultWritePayloadId, onRecordLeft, discardChanges, } = options;
|
|
468
|
+
const { record, translate, actionIcon, dispatcher, onWriteSuccess, defaultWritePayloadId, onRecordLeft, discardChanges, writeForms, submitWithIds, } = options;
|
|
469
469
|
const shownRecordId = defaultWritePayloadId ?? record["id"];
|
|
470
470
|
const confirm = withDiscardHint(action.confirm !== undefined ? translate(action.confirm) : undefined, discardChanges);
|
|
471
471
|
// The discard label wins: the action then also throws away the unsaved input.
|
|
@@ -480,13 +480,27 @@ function buildWriteHandlerRecordAction(action, options) {
|
|
|
480
480
|
...(confirm !== undefined && { confirm }),
|
|
481
481
|
...(confirmLabel !== undefined && { confirmLabel }),
|
|
482
482
|
onPress: async () => {
|
|
483
|
-
const
|
|
483
|
+
const ownPayload = action.payload !== undefined
|
|
484
484
|
? evalRowExtractor(action.payload, record)
|
|
485
485
|
: { id: shownRecordId };
|
|
486
|
+
// A form submitted by this action (writeForm `submitWith`) validates first; no write on error.
|
|
487
|
+
const form = writeForms?.get(action.id);
|
|
488
|
+
// A form is not mounted (other tab, hidden by visibleWhen): writing only the own payload would
|
|
489
|
+
// silently skip its fields.
|
|
490
|
+
if (form === undefined && submitWithIds?.has(action.id) === true) {
|
|
491
|
+
rendererError(`kumiko-screen: action "${action.id}" submits a writeForm that is not mounted`);
|
|
492
|
+
throw new Error(translate("kumiko.writeForm.unavailable"));
|
|
493
|
+
}
|
|
494
|
+
// A form hidden by CSS (phone/desktop only) shows no inline errors, so the failure is named here.
|
|
495
|
+
if (form !== undefined && !form.validate()) {
|
|
496
|
+
throw new Error(translate("kumiko.writeForm.invalid", { fields: form.invalidFieldLabels().join(", ") }));
|
|
497
|
+
}
|
|
498
|
+
const payload = form === undefined ? ownPayload : { ...ownPayload, ...form.getValues() };
|
|
486
499
|
const result = await dispatcher.write(action.handler, payload);
|
|
487
500
|
if (!result.isSuccess) {
|
|
488
501
|
throw new WriteFailedError(result.error, dispatcherErrorText(result.error, translate));
|
|
489
502
|
}
|
|
503
|
+
form?.rebase();
|
|
490
504
|
const deletedShownRecord = deletesShownRecord(action, payload, shownRecordId);
|
|
491
505
|
if (onRecordLeft !== undefined && (action.redirect !== undefined || deletedShownRecord)) {
|
|
492
506
|
onRecordLeft(action, result.data, deletedShownRecord);
|
|
@@ -504,7 +518,7 @@ function buildWriteHandlerRecordAction(action, options) {
|
|
|
504
518
|
// resolved against the record currently being viewed/edited, independent of
|
|
505
519
|
// any table row.
|
|
506
520
|
export function buildRecordActions(options) {
|
|
507
|
-
const { actions, record, translate, nav, host, dispatcher, openDrawer, onWriteSuccess, onRecordLeft, defaultScreenTargetEntityId, sameEntityScreenId, defaultWritePayloadId, discardChanges, clientActions, } = options;
|
|
521
|
+
const { actions, record, translate, nav, host, dispatcher, openDrawer, onWriteSuccess, onRecordLeft, defaultScreenTargetEntityId, sameEntityScreenId, defaultWritePayloadId, discardChanges, clientActions, writeForms, submitWithIds, } = options;
|
|
508
522
|
const out = [];
|
|
509
523
|
for (const action of actions) {
|
|
510
524
|
if (action.visible !== undefined && !evalFieldCondition(action.visible, record))
|
|
@@ -558,6 +572,8 @@ export function buildRecordActions(options) {
|
|
|
558
572
|
defaultWritePayloadId,
|
|
559
573
|
onRecordLeft,
|
|
560
574
|
discardChanges,
|
|
575
|
+
writeForms,
|
|
576
|
+
submitWithIds,
|
|
561
577
|
}));
|
|
562
578
|
}
|
|
563
579
|
return out.length > 0 ? out : undefined;
|
|
@@ -56,6 +56,7 @@ type ResolvedRedirectTarget = {
|
|
|
56
56
|
readonly screenId: string;
|
|
57
57
|
readonly entityId: string | undefined;
|
|
58
58
|
readonly tab: string | undefined;
|
|
59
|
+
readonly searchParams: Readonly<Record<string, string>>;
|
|
59
60
|
};
|
|
60
61
|
export declare function navigateToRedirectTarget(nav: NavApi, target: ResolvedRedirectTarget): void;
|
|
61
62
|
export declare function resolveSuccessLinks(links: readonly ActionFormSuccessLink[] | undefined, data: unknown, schema: FeatureSchema, appFeatures: readonly FeatureSchema[], nav: NavApi, translate: Translate): readonly ResolvedSuccessLink[];
|