Skip to content

Commit 585281a

Browse files
Merge pull request #654 from VirtusLab-Open-Source/fix/enable-path-change-when-read-fields-from-related-enable
fix: enable path change when read fields from related enable
2 parents c1b82f3 + ba63706 commit 585281a

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

  • admin/src/pages/HomePage/components/NavigationItemForm/components

admin/src/pages/HomePage/components/NavigationItemForm/components/PathField/index.tsx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ export const PathField: React.FC<PathFieldProps> = ({
5050
isSingleSelected,
5151
});
5252

53-
const disabled = !canUpdate || (values.autoSync && values.type === 'INTERNAL');
54-
55-
const pathDefaultFieldsValue = internalValues.relatedType
56-
? (configQuery.data?.pathDefaultFields?.[internalValues.relatedType] ?? [])
57-
: [];
58-
59-
const selectedEntity = contentTypeItems?.find(
60-
({ documentId }) => documentId === internalValues.related
61-
);
62-
63-
const validPathFieldName = pathDefaultFieldsValue.find((field) => selectedEntity?.[field]);
64-
6553
return (
6654
<Grid.Item alignItems="flex-start" key="title" col={12}>
6755
<Field
@@ -75,15 +63,10 @@ export const PathField: React.FC<PathFieldProps> = ({
7563
value: pathDefault,
7664
})
7765
: '',
78-
disabled
79-
? formatMessage(getTrad('popup.item.form.type.internal.source'), {
80-
value: validPathFieldName || 'id',
81-
})
82-
: '',
8366
].join(' ')}
8467
>
8568
<TextInput
86-
disabled={disabled}
69+
disabled={!canUpdate}
8770
name={pathSourceName}
8871
onChange={(eventOrPath: FormChangeEvent, value?: any) =>
8972
handleChange(eventOrPath, value, onChange)

admin/src/pages/HomePage/components/NavigationItemForm/components/RelatedEntityField/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const useChangeFieldsFromRelated = (
2525

2626
const { contentTypesNameFields, pathDefaultFields } = configQuery.data;
2727

28-
const nextPath = (
28+
const nextPath = values.path ? values.path : (
2929
pathDefaultFields[values.relatedType]?.reduce<string | undefined>((acc, field) => {
3030
return acc ? acc : relatedItem?.[field];
3131
}, undefined) || relatedItem.id

0 commit comments

Comments
 (0)