Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions packages/ketcher-core/__tests__/application/editor/Editor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,5 +161,41 @@ describe('CoreEditor', () => {
);
expect(editor.monomersLibrary.length).toBe(initialLibrarySize + 1);
});

it('should reject monomer with invalid aliasHELM', () => {
const monomerWithInvalidAlias = {
root: {
templates: [
{
$ref: 'monomerTemplate-CHEM4',
},
],
},
'monomerTemplate-CHEM4': {
type: 'monomerTemplate',
id: 'CHEM4',
class: 'CHEM',
classHELM: 'CHEM',
fullName: 'Test Chem 4',
name: 'CHEM4',
naturalAnalogShort: 'X',
props: {
MonomerName: 'CHEM4',
MonomerClass: 'CHEM',
Name: 'CHEM4',
MonomerNaturalAnalogCode: 'X',
aliasHELM: 'INV ALID',
},
},
};

const initialLibrarySize = editor.monomersLibrary.length;
editor.updateMonomersLibrary(JSON.stringify(monomerWithInvalidAlias));

expect(errorSpy).toHaveBeenCalledWith(
'Load of "CHEM4" monomer has failed, monomer definition contains invalid HELM alias value. The HELM alias must consist only of uppercase and lowercase letters, numbers, hyphens (-), underscores (_), and asterisks (*), spaces prohibited.',
);
expect(editor.monomersLibrary.length).toBe(initialLibrarySize);
});
});
});
12 changes: 12 additions & 0 deletions packages/ketcher-core/src/application/editor/Editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,18 @@ export class CoreEditor {

// handle monomer templates
newMonomersLibraryChunk.forEach((newMonomer) => {
const aliasHELM = newMonomer.props?.aliasHELM;
const monomerName = newMonomer.props?.MonomerName ?? 'Unknown';
if (
aliasHELM !== undefined &&
/[^A-Za-z0-9_*\-]/.test(aliasHELM)
) {
KetcherLogger.error(
`Load of "${monomerName}" monomer has failed, monomer definition contains invalid HELM alias value. The HELM alias must consist only of uppercase and lowercase letters, numbers, hyphens (-), underscores (_), and asterisks (*), spaces prohibited.`,
);
return;
}

const aliasCollisionExists = this._monomersLibrary.some(
(monomer) =>
(Boolean(newMonomer.props?.aliasHELM) &&
Expand Down
Loading