Skip to content

Commit 8e93486

Browse files
committed
Merge branch 'previewdata-group-improvements' into 'main'
Finding group improvements in design preview data See merge request reportcreator/reportcreator!1077
2 parents 20512d6 + da5e3a8 commit 8e93486

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Upcoming
44
* Fix remote notification disappearing after refetch
5+
* Improve finding grouping in design preview data
56

67

78
## v2025.83 - 2025-09-26

packages/frontend/src/components/Design/PreviewDataForm.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
@update:model-value="updateFindingField(fieldDefinition.id, $event)"
6161
:id="fieldDefinition.id"
6262
:definition="fieldDefinition"
63+
:field-value-suggestions="findingFieldValueSuggestions"
6364
v-bind="fieldAttrs"
6465
>
6566
<template #markdown-context-menu="{value, definition, disabled}">
@@ -178,6 +179,7 @@ function createFinding(data?: any) {
178179
...omit(data || {}, ['data']),
179180
...(data?.data || {}),
180181
id: uuidv4(),
182+
order: Math.max(0, ...findings.value.map(f => f.order || 0)) + 1,
181183
created: new Date().toISOString(),
182184
title: findingData.title || data?.data?.title || 'New Demo Finding',
183185
};
@@ -201,6 +203,8 @@ function setFieldDefinitionDefault(definition: FieldDefinition, value: any) {
201203
definition.default = value;
202204
}
203205
206+
const findingsMap = computed(() => Object.fromEntries(findings.value.map(f => [f.id, f])));
207+
const findingFieldValueSuggestions = useFindingFieldValueSuggestions(findingsMap, props.projectType);
204208
const fieldAttrs = computed(() => ({
205209
showFieldIds: true,
206210
uploadFile: props.uploadFile,

0 commit comments

Comments
 (0)