Skip to content

Commit 3f6d2d3

Browse files
Verified fix - All tests passed
Co-authored-by: NikitaKuzminn <87386879+NikitaKuzminn@users.noreply.github.com>
1 parent 9ec2f01 commit 3f6d2d3

1 file changed

Lines changed: 22 additions & 9 deletions

File tree

packages/ketcher-core/src/domain/serializers/ket/fromKet/monomerToDrawingEntity.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function getLibraryMonomerTemplate(
3030
}
3131

3232
const libraryJson = editor.monomersLibraryParsedJson;
33-
33+
3434
// Try to find by template ID first
3535
const templateKey = setMonomerTemplatePrefix(templateId);
3636
if (libraryJson[templateKey]) {
@@ -60,8 +60,11 @@ export function getLibraryMonomerTemplate(
6060
export function enrichTemplateWithLibraryData(
6161
template: IKetMonomerTemplate,
6262
): IKetMonomerTemplate {
63-
const libraryTemplate = getLibraryMonomerTemplate(template.id, template.alias);
64-
63+
const libraryTemplate = getLibraryMonomerTemplate(
64+
template.id,
65+
template.alias,
66+
);
67+
6568
if (!libraryTemplate) {
6669
return template;
6770
}
@@ -75,29 +78,39 @@ export function enrichTemplateWithLibraryData(
7578
// Similar for other properties that might be missing
7679
aliasHELM: template.aliasHELM || libraryTemplate.aliasHELM,
7780
aliasAxoLabs: template.aliasAxoLabs || libraryTemplate.aliasAxoLabs,
78-
modificationTypes: template.modificationTypes || libraryTemplate.modificationTypes,
81+
modificationTypes:
82+
template.modificationTypes || libraryTemplate.modificationTypes,
7983
};
8084
}
8185

8286
export function templateToMonomerProps(template: IKetMonomerTemplate) {
8387
// Enrich the template with library data before extracting props
8488
const enrichedTemplate = enrichTemplateWithLibraryData(template);
85-
89+
8690
return {
8791
id: enrichedTemplate.id,
88-
Name: enrichedTemplate.fullName ?? enrichedTemplate.name ?? enrichedTemplate.alias ?? enrichedTemplate.id,
92+
Name:
93+
enrichedTemplate.fullName ??
94+
enrichedTemplate.name ??
95+
enrichedTemplate.alias ??
96+
enrichedTemplate.id,
8997
MonomerNaturalAnalogCode: enrichedTemplate.naturalAnalogShort ?? '',
9098
MonomerNaturalAnalogThreeLettersCode: enrichedTemplate.naturalAnalog ?? '',
91-
MonomerName: enrichedTemplate.name ?? enrichedTemplate.alias ?? enrichedTemplate.id,
99+
MonomerName:
100+
enrichedTemplate.name ?? enrichedTemplate.alias ?? enrichedTemplate.id,
92101
MonomerFullName: enrichedTemplate.fullName,
93102
MonomerType: enrichedTemplate.classHELM,
94103
MonomerClass: enrichedTemplate.class,
95104
MonomerCaps: {},
96105
idtAliases: enrichedTemplate.idtAliases,
97106
unresolved: enrichedTemplate.unresolved,
98107
modificationTypes: enrichedTemplate.modificationTypes,
99-
...(enrichedTemplate.aliasHELM ? { aliasHELM: enrichedTemplate.aliasHELM } : {}),
100-
...(enrichedTemplate.aliasAxoLabs ? { aliasAxoLabs: enrichedTemplate.aliasAxoLabs } : {}),
108+
...(enrichedTemplate.aliasHELM
109+
? { aliasHELM: enrichedTemplate.aliasHELM }
110+
: {}),
111+
...(enrichedTemplate.aliasAxoLabs
112+
? { aliasAxoLabs: enrichedTemplate.aliasAxoLabs }
113+
: {}),
101114
...(enrichedTemplate.hidden ? { hidden: enrichedTemplate.hidden } : {}),
102115
};
103116
}

0 commit comments

Comments
 (0)