Skip to content

Commit

Permalink
fix: support .jcamp extensions
Browse files Browse the repository at this point in the history
Closes: #2002
  • Loading branch information
targos committed Dec 15, 2022
1 parent 205245a commit d78acd4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -78,7 +78,7 @@
"ml-stat": "^1.3.3",
"multiplet-analysis": "^2.0.0",
"nmr-correlation": "^2.3.3",
"nmr-load-save": "^0.7.5",
"nmr-load-save": "^0.7.6",
"nmr-processing": "^9.3.2",
"nmredata": "^0.9.2",
"numeral": "^2.0.6",
Expand Down
2 changes: 1 addition & 1 deletion src/component/modal/LoadJCAMPModal.tsx
Expand Up @@ -53,7 +53,7 @@ const styles = css`
}
}
`;
const allowedExtensions = new Set(['dx', 'jdx']);
const allowedExtensions = new Set(['dx', 'jdx', 'jcamp']);

interface LoadJCAMPModalProps {
onLoadClick: (element: any) => void;
Expand Down
10 changes: 6 additions & 4 deletions src/component/toolbar/BasicToolBar.tsx
Expand Up @@ -128,13 +128,15 @@ function BasicToolBarInner({
saveAsHandler,
} = useExport();

const LoadJacmpHandler = useCallback(
const LoadJcampHandler = useCallback(
(file) => {
if (file) {
dispatch({ type: LOAD_JCAMP_FILE, files: [file] });
modal.close();
} else {
alert.error('you file must be one of those extensions [ .jdx, dx ] ');
alert.error(
'you file must be one of those extensions [ .jdx, .dx, .jcamp ] ',
);
}
},
[alert, dispatch, modal],
Expand All @@ -148,13 +150,13 @@ function BasicToolBarInner({
const importJCAMPFile = useCallback(() => {
modal.show(
<LoadJCAMPModal
onLoadClick={LoadJacmpHandler}
onLoadClick={LoadJcampHandler}
onClose={() => modal.close()}
startLoading={startLoadingHandler}
/>,
{},
);
}, [LoadJacmpHandler, modal, startLoadingHandler]);
}, [LoadJcampHandler, modal, startLoadingHandler]);

const openImportPublicationStringModal = useCallback(() => {
modal.show(
Expand Down
3 changes: 2 additions & 1 deletion src/demo/layouts/Main.tsx
Expand Up @@ -131,7 +131,8 @@ const Main = () => {
break;
}
case 'dx':
case 'jdx': {
case 'jdx':
case 'jcamp': {
setDashBoardType('single');
setRoutes({
isLoaded: true,
Expand Down

0 comments on commit d78acd4

Please sign in to comment.