Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3640 - macro after reloading the page monomers added to the favorites section disappear #3688

Merged
Show file tree
Hide file tree
Changes from 10 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
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ export * from './rxn';
export * from './simpleObject';
export * from './sgroup';
export * from './Text';
export * from './monomer/monomerFactory';
27 changes: 26 additions & 1 deletion packages/ketcher-polymer-editor-react/src/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ import {
selectTool,
showPreview,
} from 'state/common';
import { loadMonomerLibrary } from 'state/library';
import {
loadMonomerLibrary,
selectMonomers,
setFavoriteMonomersFromLocalStorage,
unsetFavoriteMonomersFromLocalStorage,
} from 'state/library';
import { useAppDispatch, useAppSelector, useSnakeMode } from 'hooks';
import {
closeErrorTooltip,
Expand Down Expand Up @@ -77,6 +82,13 @@ import { ErrorModal } from 'components/modal/Error';
import { useLoading } from './hooks/useLoading';
import { Loader } from 'components/Loader';
import { FullscreenButton } from 'components/FullscreenButton';
import { getDefaultPresets } from 'src/helpers/getDefaultPreset';
import {
setDefaultPresets,
setFavoritePresetsFromLocalStorage,
unsetFavoritePresetsFromLocalStorage,
} from 'state/rna-builder';
import { IRnaPreset } from 'components/monomerLibrary/RnaBuilder/types';

const muiTheme = createTheme(muiOverrides);

Expand Down Expand Up @@ -132,20 +144,33 @@ function Editor({ theme, togglerComponent }: EditorProps) {
const isLoading = useLoading();
let keyboardEventListener;
const [isMonomerLibraryHidden, setIsMonomerLibraryHidden] = useState(false);
const monomers = useAppSelector(selectMonomers);

useEffect(() => {
dispatch(createEditor({ theme, canvas: canvasRef.current }));
const serializer = new SdfSerializer();
const library = serializer.deserialize(monomersData);
dispatch(loadMonomerLibrary(library));
dispatch(setFavoriteMonomersFromLocalStorage(null));

return () => {
dispatch(destroyEditor(null));
dispatch(loadMonomerLibrary([]));
dispatch(unsetFavoriteMonomersFromLocalStorage(null));
document.removeEventListener('keydown', keyboardEventListener);
};
}, [dispatch]);

useEffect(() => {
const defaultPresets: IRnaPreset[] = getDefaultPresets(monomers);
dispatch(setDefaultPresets(defaultPresets));
dispatch(setFavoritePresetsFromLocalStorage());

return () => {
dispatch(unsetFavoritePresetsFromLocalStorage());
};
}, [dispatch, monomers]);

const dispatchShowPreview = useCallback(
(payload) => dispatch(showPreview(payload)),
[dispatch],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
import { ModalContainer } from 'components/modal/modalContainer';
import { RnaBuilder } from 'components/monomerLibrary/RnaBuilder';
import { MONOMER_TYPES } from 'src/constants';
import mockedPresets from './mockedPresets.json';

jest.mock('../../../src/helpers/dom.ts', () => {
return {
Expand Down Expand Up @@ -65,6 +66,7 @@ const monomerData = [
describe('RNA ContextMenu', () => {
const editPreset = jest.fn();
const duplicatePreset = jest.fn();

it('should render contextMenu correctly', () => {
render(
withThemeAndStoreProvider(
Expand All @@ -79,6 +81,9 @@ describe('RNA ContextMenu', () => {
favorites: {},
monomers: monomerData,
},
rnaBuilder: {
presets: mockedPresets,
},
},
),
);
Expand All @@ -101,6 +106,9 @@ describe('RNA ContextMenu', () => {
favorites: {},
monomers: monomerData,
},
rnaBuilder: {
presets: mockedPresets,
},
},
),
);
Expand All @@ -127,6 +135,9 @@ describe('RNA ContextMenu', () => {
favorites: {},
monomers: monomerData,
},
rnaBuilder: {
presets: mockedPresets,
},
},
),
);
Expand Down
Loading
Loading