修复任务字段过滤与控件可写规则
This commit is contained in:
andy committed
1 parent
b05001e481
commit
20eac61cb6
9 files changed
+593
-132
No files matched your search
@@ -5,6 +5,9 @@ import {
|
||||
buildInitialFieldValues,
|
||||
buildEditableFieldValues,
|
||||
groupReservationFields,
|
||||
isReservationFieldEditable,
|
||||
isReservationManualReviewFieldWritable,
|
||||
isSelectField,
|
||||
validateReservationFieldValues,
|
||||
} from '@/utils/reservationFieldRules'
|
||||
|
||||
@@ -90,7 +93,7 @@ describe('validateReservationFieldValues', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('groups only fields that match the current display condition', () => {
|
||||
it('groups all backend-returned fields without rebuilding display-condition logic', () => {
|
||||
const groups = groupReservationFields(
|
||||
[
|
||||
createField({
|
||||
@@ -111,10 +114,13 @@ describe('validateReservationFieldValues', () => {
|
||||
},
|
||||
)
|
||||
|
||||
expect(groups.flatMap((group) => group.fields.map((field) => field.field_path))).toEqual(['case_keys.group_code'])
|
||||
expect(groups.flatMap((group) => group.fields.map((field) => field.field_path))).toEqual([
|
||||
'case_keys.group_code',
|
||||
'case_keys.confirmation_number',
|
||||
])
|
||||
})
|
||||
|
||||
it('builds a backend-safe editable payload without readonly or inactive fields', () => {
|
||||
it('builds a backend-safe editable payload without readonly or omitted fields', () => {
|
||||
const payload = buildEditableFieldValues(
|
||||
[
|
||||
createField({
|
||||
@@ -129,16 +135,11 @@ describe('validateReservationFieldValues', () => {
|
||||
display_name: 'Group Code',
|
||||
display_condition: '对象为Group Block或Allotment时展示',
|
||||
}),
|
||||
createField({
|
||||
field_path: 'case_keys.confirmation_number',
|
||||
display_name: 'Confirmation No.',
|
||||
display_condition: '对象为FIT Reservation时展示',
|
||||
}),
|
||||
],
|
||||
{
|
||||
visible_reason: 'AI extracted this task.',
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
'case_keys.confirmation_number': '',
|
||||
'case_keys.confirmation_number': 'CNF-NOT-RETURNED',
|
||||
'extracted_fields.booking_object_type': 'Group Block',
|
||||
},
|
||||
false,
|
||||
@@ -149,6 +150,271 @@ describe('validateReservationFieldValues', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('treats detail.fields as the authoritative backend-filtered field set', () => {
|
||||
const fields = [
|
||||
createField({
|
||||
field_path: 'extracted_fields.booking_object_type',
|
||||
display_name: '订单对象类型',
|
||||
select_editable: 'Y',
|
||||
input_editable: 'N',
|
||||
enum_options: 'Group Block, FIT Reservation',
|
||||
value: 'Group Block',
|
||||
}),
|
||||
createField({
|
||||
field_path: 'case_keys.group_code',
|
||||
display_name: 'Group Code',
|
||||
value: 'GRP-001',
|
||||
}),
|
||||
]
|
||||
const values = buildInitialFieldValues(fields, null, '20260711-p0')
|
||||
const groups = groupReservationFields(fields, '基础信息', {
|
||||
...values,
|
||||
'case_keys.confirmation_number': 'CNF-SHOULD-NOT-RENDER',
|
||||
attachments: [
|
||||
{
|
||||
name: 'hidden-attachment.pdf',
|
||||
},
|
||||
],
|
||||
})
|
||||
const payload = buildEditableFieldValues(
|
||||
fields,
|
||||
{
|
||||
...values,
|
||||
'case_keys.confirmation_number': 'CNF-SHOULD-NOT-SUBMIT',
|
||||
attachments: [
|
||||
{
|
||||
name: 'hidden-attachment.pdf',
|
||||
},
|
||||
],
|
||||
},
|
||||
false,
|
||||
)
|
||||
|
||||
expect(groups.flatMap((group) => group.fields.map((field) => field.field_path))).toEqual([
|
||||
'extracted_fields.booking_object_type',
|
||||
'case_keys.group_code',
|
||||
])
|
||||
expect(payload).toEqual({
|
||||
'extracted_fields.booking_object_type': 'Group Block',
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
})
|
||||
expect(payload).not.toHaveProperty('case_keys.confirmation_number')
|
||||
expect(payload).not.toHaveProperty('attachments')
|
||||
})
|
||||
|
||||
it('uses field control metadata before legacy editable flags when building payloads', () => {
|
||||
const payload = buildEditableFieldValues(
|
||||
[
|
||||
createField({
|
||||
field_path: 'case_keys.group_code',
|
||||
display_name: 'Group Code',
|
||||
value: 'GRP-001',
|
||||
control_type: 'text',
|
||||
edit_scope: 'normal_and_manual_review',
|
||||
write_target: 'field_values',
|
||||
raw_readonly: false,
|
||||
} as Partial<ReservationTaskFieldResult>),
|
||||
createField({
|
||||
field_path: 'source_message.attachments',
|
||||
display_name: '来源附件',
|
||||
value: [{ name: 'rooming-list.pdf' }],
|
||||
editable: 'Y',
|
||||
input_editable: 'Y',
|
||||
control_type: 'file',
|
||||
edit_scope: 'never',
|
||||
write_target: 'none',
|
||||
raw_readonly: true,
|
||||
} as Partial<ReservationTaskFieldResult>),
|
||||
createField({
|
||||
field_path: 'route_code',
|
||||
display_name: '路由代码',
|
||||
value: 'R01_NEW_BOOKING_NORMAL',
|
||||
editable: 'Y',
|
||||
input_editable: 'Y',
|
||||
control_type: 'workflow_state',
|
||||
edit_scope: 'system_only',
|
||||
write_target: 'none',
|
||||
raw_readonly: false,
|
||||
} as Partial<ReservationTaskFieldResult>),
|
||||
],
|
||||
{
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
'source_message.attachments': [{ name: 'rooming-list.pdf' }],
|
||||
route_code: 'R01_NEW_BOOKING_NORMAL',
|
||||
},
|
||||
false,
|
||||
)
|
||||
|
||||
expect(payload).toEqual({
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
})
|
||||
})
|
||||
|
||||
it('submits dual draft and review fields in normal editable payloads', () => {
|
||||
const payload = buildEditableFieldValues(
|
||||
[
|
||||
createField({
|
||||
field_path: 'case_keys.group_code',
|
||||
display_name: 'Group Code',
|
||||
value: 'GRP-001',
|
||||
control_type: 'text',
|
||||
edit_scope: 'normal_and_manual_review',
|
||||
write_target: 'draft_payload_and_review_resolution',
|
||||
raw_readonly: false,
|
||||
} as Partial<ReservationTaskFieldResult>),
|
||||
],
|
||||
{
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
},
|
||||
false,
|
||||
)
|
||||
|
||||
expect(payload).toEqual({
|
||||
'case_keys.group_code': 'GRP-001',
|
||||
})
|
||||
})
|
||||
|
||||
it('allows manual review overrides only for fields opened by backend metadata', () => {
|
||||
expect(
|
||||
isReservationManualReviewFieldWritable(
|
||||
createField({
|
||||
field_path: 'extracted_fields.room_items.0.pms_room_type_code',
|
||||
field_pointer: '/extracted_fields/room_items/0/pms_room_type_code',
|
||||
control_type: 'select',
|
||||
edit_scope: 'manual_review_only',
|
||||
write_target: 'review_resolution.field_overrides',
|
||||
raw_readonly: false,
|
||||
}),
|
||||
),
|
||||
).toBe(true)
|
||||
expect(
|
||||
isReservationManualReviewFieldWritable(
|
||||
createField({
|
||||
field_path: 'case_keys.group_code',
|
||||
field_pointer: '/case_keys/group_code',
|
||||
control_type: 'text',
|
||||
edit_scope: 'normal_and_manual_review',
|
||||
write_target: 'draft_payload_and_review_resolution',
|
||||
raw_readonly: false,
|
||||
}),
|
||||
),
|
||||
).toBe(true)
|
||||
expect(
|
||||
isReservationManualReviewFieldWritable(
|
||||
createField({
|
||||
field_path: 'route_code',
|
||||
control_type: 'workflow_state',
|
||||
edit_scope: 'system_only',
|
||||
write_target: 'none',
|
||||
raw_readonly: false,
|
||||
}),
|
||||
),
|
||||
).toBe(false)
|
||||
expect(
|
||||
isReservationManualReviewFieldWritable(
|
||||
createField({
|
||||
field_path: 'source_message.attachments',
|
||||
control_type: 'file',
|
||||
edit_scope: 'never',
|
||||
write_target: 'none',
|
||||
raw_readonly: true,
|
||||
}),
|
||||
),
|
||||
).toBe(false)
|
||||
})
|
||||
|
||||
it('does not render review-resolution-only fields as normal editable controls', () => {
|
||||
expect(
|
||||
isReservationFieldEditable(
|
||||
createField({
|
||||
field_path: 'extracted_fields.room_items.0.pms_room_type_code',
|
||||
control_type: 'select',
|
||||
edit_scope: 'manual_review_only',
|
||||
write_target: 'review_resolution.field_overrides',
|
||||
enum_options: 'RM1, RM2',
|
||||
raw_readonly: false,
|
||||
}),
|
||||
false,
|
||||
),
|
||||
).toBe(false)
|
||||
expect(
|
||||
isReservationManualReviewFieldWritable(
|
||||
createField({
|
||||
field_path: 'extracted_fields.room_items.0.pms_room_type_code',
|
||||
field_pointer: '/extracted_fields/room_items/0/pms_room_type_code',
|
||||
control_type: 'select',
|
||||
edit_scope: 'manual_review_only',
|
||||
write_target: 'review_resolution.field_overrides',
|
||||
enum_options: 'RM1, RM2',
|
||||
raw_readonly: false,
|
||||
}),
|
||||
),
|
||||
).toBe(true)
|
||||
})
|
||||
|
||||
it('does not treat catalog-backed select metadata as a static enum select', () => {
|
||||
const catalogField = createField({
|
||||
field_path: 'extracted_fields.room_items.0.pms_room_type_code',
|
||||
control_type: 'select',
|
||||
edit_scope: 'manual_review_only',
|
||||
write_target: 'review_resolution.field_overrides',
|
||||
options_source: 'active_pms_room_type_catalog',
|
||||
enum_options: 'Q1A, DLX',
|
||||
raw_readonly: false,
|
||||
})
|
||||
const staticField = createField({
|
||||
field_path: 'extracted_fields.payment_method',
|
||||
control_type: 'select',
|
||||
edit_scope: 'normal_task',
|
||||
write_target: 'draft_payload.field_values',
|
||||
options_source: 'static_enum',
|
||||
enum_options: 'PREPAID, HOTEL_COLLECT',
|
||||
raw_readonly: false,
|
||||
})
|
||||
|
||||
expect(isSelectField(catalogField)).toBe(false)
|
||||
expect(isReservationManualReviewFieldWritable(catalogField)).toBe(true)
|
||||
expect(isSelectField(staticField)).toBe(true)
|
||||
})
|
||||
|
||||
it('honors edit scope white lists for normal payload and manual review writes', () => {
|
||||
const manualOnlyPayloadField = createField({
|
||||
field_path: 'case_keys.confirmation_number',
|
||||
control_type: 'text',
|
||||
edit_scope: 'manual_review_only',
|
||||
write_target: 'field_values',
|
||||
raw_readonly: false,
|
||||
})
|
||||
const workflowDualTargetField = createField({
|
||||
field_path: 'review_status',
|
||||
control_type: 'text',
|
||||
edit_scope: 'workflow_only',
|
||||
write_target: 'draft_payload_and_review_resolution',
|
||||
raw_readonly: false,
|
||||
})
|
||||
const normalOnlyReviewTargetField = createField({
|
||||
field_path: 'case_keys.group_code',
|
||||
control_type: 'text',
|
||||
edit_scope: 'normal_task',
|
||||
write_target: 'review_resolution.field_overrides',
|
||||
raw_readonly: false,
|
||||
})
|
||||
|
||||
expect(isReservationFieldEditable(manualOnlyPayloadField, false)).toBe(false)
|
||||
expect(isReservationFieldEditable(workflowDualTargetField, false)).toBe(false)
|
||||
expect(isReservationManualReviewFieldWritable(manualOnlyPayloadField)).toBe(false)
|
||||
expect(isReservationManualReviewFieldWritable(workflowDualTargetField)).toBe(false)
|
||||
expect(isReservationManualReviewFieldWritable(normalOnlyReviewTargetField)).toBe(false)
|
||||
expect(buildEditableFieldValues(
|
||||
[manualOnlyPayloadField, workflowDualTargetField],
|
||||
{
|
||||
'case_keys.confirmation_number': 'CNF-001',
|
||||
review_status: 'PENDING',
|
||||
},
|
||||
false,
|
||||
)).toEqual({})
|
||||
})
|
||||
|
||||
it('hydrates P0 room_items fields from field_values and submits main field_path keys', () => {
|
||||
const roomTypeField = createField({
|
||||
field_path: 'extracted_fields.room_items.0.room_type_raw',
|
||||
|
||||
Reference in new issue
Block a user