Skip to content
Merged
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
84 changes: 47 additions & 37 deletions src/component/panels/databasePanel/DatabasePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useOnOff } from 'react-science/ui';

import { getSum } from '../../../data/data1d/Spectrum1D/SumManager.js';
import { isSpectrum1D } from '../../../data/data1d/Spectrum1D/index.js';
import type {
InitiateDatabaseResult,
LocalDatabase,
Expand Down Expand Up @@ -100,6 +99,22 @@ function mapKeywordsToArray(searchKeywords: string, solvent: string) {
return values;
}

function resolveSpectraURL(
rowData: {
baseURL: string;
jcampURL: string;
jcampFullURL: string;
},
isFullJcamp: boolean,
): URL | null {
const { baseURL, jcampURL, jcampFullURL } = rowData;
const spectraURL = isFullJcamp ? jcampFullURL : jcampURL;

if (!spectraURL) return null;

return new URL(spectraURL, baseURL);
}

function DatabasePanelInner({
nucleus,
selectedTool,
Expand Down Expand Up @@ -285,49 +300,44 @@ function DatabasePanelInner({

const core = useCore();
const resurrectHandler = useCallback(
(rowData: any) => {
const {
index,
baseURL,
jcampURL: jcampRelativeURL,
ocl,
smiles,
} = rowData;
(rowData: any, isFullJcamp = false) => {
const { index, ocl, smiles } = rowData;
const molfile = getMolfile({ ocl, smiles });
const databaseEntry = result.data[index];

if (jcampRelativeURL) {
const url = new URL(jcampRelativeURL, baseURL);
setTimeout(async () => {
const hideLoading = toaster.showLoading({
message: `load jcamp in progress...`,
});
const spectraURL = resolveSpectraURL(rowData, isFullJcamp);

try {
const {
state: { data },
} = await core.readFromWebSource({
entries: [{ baseURL: url.origin, relativePath: url.pathname }],
});
const spectrum = data?.spectra?.[0] || null;
if (spectrum && isSpectrum1D(spectrum)) {
dispatch({
type: 'RESURRECTING_SPECTRUM',
payload: { source: 'jcamp', databaseEntry, spectrum, molfile },
});
}
} catch {
toaster.show({ message: 'Failed to load Jcamp', intent: 'danger' });
} finally {
hideLoading();
}
}, 0);
} else {
if (!spectraURL) {
dispatch({
type: 'RESURRECTING_SPECTRUM',
payload: { source: 'rangesOrSignals', databaseEntry, molfile },
type: 'RESURRECTING_SPECTRUM_FROM_SIGNALS_OR_RANGES',
payload: { databaseEntry, molfile },
});
return;
}

setTimeout(async () => {
const hideLoading = toaster.showLoading({
message: `load jcamp in progress...`,
});

try {
const {
state: { data },
} = await core.readFromWebSource({
entries: [
{ baseURL: spectraURL.origin, relativePath: spectraURL.pathname },
],
});
dispatch({
type: 'RESURRECTING_SPECTRUM_FROM_JCAMP',
payload: { databaseEntry, spectra: data?.spectra || [], molfile },
});
} catch {
toaster.show({ message: 'Failed to load Jcamp', intent: 'danger' });
} finally {
hideLoading();
}
}, 0);
},
[core, dispatch, result.data, toaster],
);
Expand Down
32 changes: 29 additions & 3 deletions src/component/panels/databasePanel/DatabaseTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Classes } from '@blueprintjs/core';
import dlv from 'dlv';
import type { DatabaseNMREntry } from 'nmr-processing';
import type { CSSProperties } from 'react';
import { memo, useMemo } from 'react';
import { memo, useCallback, useMemo } from 'react';
import { ResponsiveChart } from 'react-d3-utils';
import { FaDownload, FaInfoCircle, FaMinus, FaPlus } from 'react-icons/fa';
import { IdcodeSvgRenderer, SmilesSvgRenderer } from 'react-ocl';
Expand All @@ -11,6 +11,7 @@ import type { CellProps } from 'react-table';

import type { PrepareDataResult } from '../../../data/data1d/database.js';
import { ColumnWrapper } from '../../elements/ColumnWrapper.js';
import type { ContextMenuItem } from '../../elements/ContextMenuBluePrint.tsx';
import type { Column } from '../../elements/ReactTable/ReactTable.js';
import ReactTable from '../../elements/ReactTable/ReactTable.js';
import type { CustomColumn } from '../../elements/ReactTable/utility/addCustomColumn.js';
Expand All @@ -21,8 +22,17 @@ import { formatNumber } from '../../utility/formatNumber.js';

import { DatabaseInfo } from './DatabaseInfo.js';

const contextMenu: ContextMenuItem[] = [
{
text: 'Add all spectra',
icon: <FaPlus />,
data: { id: 'addAllSpectra' },
disabled: (data) => !data.jcampFullURL,
},
];

interface ToggleEvent {
onAdd: (row: any) => void;
onAdd: (row: any, isFullJcamp: boolean) => void;
onRemove: (row: any) => void;
}
interface DatabaseTableProps extends ToggleEvent {
Expand Down Expand Up @@ -266,9 +276,25 @@ function DatabaseTable({
columns.sort((object1, object2) => object1.index - object2.index);
return columns;
}, [databasePreferences, initialColumns]);

const selectContextMenuHandler = useCallback(
(option: any, data: any) => {
const { id } = option;

if (id !== 'addAllSpectra') {
return;
}

onAdd(data, true);
},
[onAdd],
);

return (
<ReactTable
data={data}
contextMenu={contextMenu}
onContextMenuSelect={selectContextMenuHandler}
columns={tableColumns}
highlightedSource="DATABASE"
getHighlightExtra={(row) => ({
Expand Down Expand Up @@ -304,7 +330,7 @@ function ToggleBtn(props: ToggleBtnProps) {
if (isAdded) {
onRemove(data);
} else {
onAdd(data);
onAdd(data, false);
}
}}
>
Expand Down
9 changes: 7 additions & 2 deletions src/component/reducer/Reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,13 @@ function innerSpectrumReducer(draft: Draft<State>, action: Action) {
action,
);

case 'RESURRECTING_SPECTRUM':
return DatabaseActions.handleResurrectSpectrum(draft, action);
case 'RESURRECTING_SPECTRUM_FROM_SIGNALS_OR_RANGES':
return DatabaseActions.handleResurrectSpectrumFromRangesOrSignals(
draft,
action,
);
case 'RESURRECTING_SPECTRUM_FROM_JCAMP':
return DatabaseActions.handleResurrectSpectrumFromJCAMP(draft, action);
case 'TOGGLE_SIMILARITY_TREE':
return DatabaseActions.handleToggleSimilarityTree(draft);

Expand Down
Loading
Loading