fix: prefill advanced field settings in templates (#1332)

## Description

Seems like I was overconfident in #1323 and I did not test properly.
Currently, the advanced settings for a field in a **template** is not
pre-filled with the current fieldMeta, although it is correctly
pre-filled in a **draft document** (That's probably where I messed up my
testing).

In this PR, I propose to directly use the fieldMeta provided by the
field prop in `FieldAdvancedSettings`, instead of multiplying tRPCs to
request the fieldMeta while we already have it.

I apologize for the wasted time in reviewing my previous PR which was
only correcting the display of the field label in the template view.

## Testing Performed

- This time, I correctly checked that the advanced settings for a field
is correctly pre-filled both in a document draft and in a template.
- `npm run build` builds correctly.
This commit is contained in:
Etrenak
2024-09-10 05:22:03 +02:00
committed by GitHub
parent e1b2206d28
commit f6f893fbf7
3 changed files with 9 additions and 19 deletions

View File

@ -148,7 +148,7 @@ msgstr ""
msgid "Blue" msgid "Blue"
msgstr "" msgstr ""
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:297 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:287
#: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58
msgid "Cancel" msgid "Cancel"
msgstr "Abbrechen" msgstr "Abbrechen"
@ -283,7 +283,7 @@ msgstr "Direktlink-Signierung aktivieren"
msgid "Enter password" msgid "Enter password"
msgstr "Passwort eingeben" msgstr "Passwort eingeben"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:226 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:216
msgid "Error" msgid "Error"
msgstr "Fehler" msgstr "Fehler"
@ -292,7 +292,7 @@ msgstr "Fehler"
msgid "External ID" msgid "External ID"
msgstr "Externe ID" msgstr "Externe ID"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:227 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:217
msgid "Failed to save settings." msgid "Failed to save settings."
msgstr "Einstellungen konnten nicht gespeichert werden." msgstr "Einstellungen konnten nicht gespeichert werden."
@ -514,7 +514,7 @@ msgstr "Pflichtfeld"
msgid "Rows per page" msgid "Rows per page"
msgstr "Zeilen pro Seite" msgstr "Zeilen pro Seite"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:296 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:286
msgid "Save" msgid "Save"
msgstr "Speichern" msgstr "Speichern"

View File

@ -143,7 +143,7 @@ msgstr "Black"
msgid "Blue" msgid "Blue"
msgstr "Blue" msgstr "Blue"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:297 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:287
#: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58
msgid "Cancel" msgid "Cancel"
msgstr "Cancel" msgstr "Cancel"
@ -278,7 +278,7 @@ msgstr "Enable Direct Link Signing"
msgid "Enter password" msgid "Enter password"
msgstr "Enter password" msgstr "Enter password"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:226 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:216
msgid "Error" msgid "Error"
msgstr "Error" msgstr "Error"
@ -287,7 +287,7 @@ msgstr "Error"
msgid "External ID" msgid "External ID"
msgstr "External ID" msgstr "External ID"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:227 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:217
msgid "Failed to save settings." msgid "Failed to save settings."
msgstr "Failed to save settings." msgstr "Failed to save settings."
@ -509,7 +509,7 @@ msgstr "Required field"
msgid "Rows per page" msgid "Rows per page"
msgstr "Rows per page" msgstr "Rows per page"
#: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:296 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:286
msgid "Save" msgid "Save"
msgstr "Save" msgstr "Save"

View File

@ -155,17 +155,7 @@ export const FieldAdvancedSettings = forwardRef<HTMLDivElement, FieldAdvancedSet
const doesFieldExist = (!!document || !!template) && field.nativeId !== undefined; const doesFieldExist = (!!document || !!template) && field.nativeId !== undefined;
const { data: fieldData } = trpc.field.getField.useQuery( const fieldMeta = field?.fieldMeta;
{
fieldId: Number(field.nativeId),
teamId,
},
{
enabled: doesFieldExist,
},
);
const fieldMeta = fieldData?.fieldMeta;
const localStorageKey = `field_${field.formId}_${field.type}`; const localStorageKey = `field_${field.formId}_${field.type}`;