Skip to content

Commit 0b963c0

Browse files
Merge pull request #621 from VirtusLab-Open-Source/fix/default-name-fields
fix: default name fields
2 parents 854e81d + 77fe5ee commit 0b963c0

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

server/src/services/common/utils.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { getGenericRepository } from '../../repositories';
22
import { NavigationError } from '../../app-errors';
33
import { NavigationItemType } from '../../schemas';
44
import { Core, UID } from '@strapi/types';
5+
import { isEmpty } from 'lodash';
56

67
export interface DuplicateCheckItem {
78
items?: DuplicateCheckItem[];
@@ -65,12 +66,14 @@ export const generateFieldsFromRelated = async (
6566
{ locale }
6667
);
6768

68-
const defaultTitleFields = contentTypesNameFields[related.__type || 'default'];
69+
const defaultTitleFields = isEmpty(contentTypesNameFields[related.__type])
70+
? contentTypesNameFields['default'] : contentTypesNameFields[related.__type];
71+
6972
const title = defaultTitleFields.reduce((acc, field) => {
7073
return acc ? acc : relatedEntity?.[field]?.toString();
7174
}, '');
7275

73-
const defaultPathFields = related ? pathDefaultFields[related.__type] : [];
76+
const defaultPathFields = pathDefaultFields[related.__type] || [];
7477
const path = defaultPathFields.reduce((acc, field) => {
7578
return acc ? acc : relatedEntity?.[field]?.toString();
7679
}, undefined) || relatedEntity?.id.toString();

0 commit comments

Comments
 (0)