forked/topola-viewer
1
0
Fork 0
mirror of https://github.com/PeWu/topola-viewer.git synced 2026-05-26 23:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading from WikiTree by numeric id

Browse Source
This commit is contained in:
Przemek Więch
2022-10-08 01:03:32 +02:00
parent c8a7ed4e0d
commit 4b8b423fa4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app.tsx
View File

@@ -317,7 +317,6 @@ export function App() {
const data = await loadData(args.sourceSpec, args.selection); const data = await loadData(args.sourceSpec, args.selection);
// Set state with data. // Set state with data.
setData(data); setData(data);
setSelection(getSelection(data.chartData, args.selection));
setShowSidePanel(args.showSidePanel); setShowSidePanel(args.showSidePanel);
setState(AppState.SHOWING_CHART); setState(AppState.SHOWING_CHART);
} catch (error: any) { } catch (error: any) {
@@ -328,15 +327,14 @@ export function App() {
state === AppState.LOADING_MORE state === AppState.LOADING_MORE
) { ) {
// Update selection if it has changed in the URL. // Update selection if it has changed in the URL.
const newSelection = getSelection(data!.chartData, args.selection);
const loadMoreFromWikitree = const loadMoreFromWikitree =
args.sourceSpec.source === DataSourceEnum.WIKITREE && args.sourceSpec.source === DataSourceEnum.WIKITREE &&
(!selection || selection.id !== newSelection.id); (!selection || selection.id !== args.selection?.id);
setChartType(args.chartType); setChartType(args.chartType);
setState( setState(
loadMoreFromWikitree ? AppState.LOADING_MORE : AppState.SHOWING_CHART, loadMoreFromWikitree ? AppState.LOADING_MORE : AppState.SHOWING_CHART,
); );
updateDisplay(newSelection); updateDisplay(args.selection!);
if (loadMoreFromWikitree) { if (loadMoreFromWikitree) {
try { try {
const data = await loadWikiTree(args.selection!.id, intl); const data = await loadWikiTree(args.selection!.id, intl);
@@ -441,6 +439,7 @@ export function App() {
switch (state) { switch (state) {
case AppState.SHOWING_CHART: case AppState.SHOWING_CHART:
case AppState.LOADING_MORE: case AppState.LOADING_MORE:
const updatedSelection = getSelection(data!.chartData, selection);
const sidePanelTabs = [ const sidePanelTabs = [
{ {
menuItem: intl.formatMessage({ menuItem: intl.formatMessage({
@@ -448,7 +447,7 @@ export function App() {
defaultMessage: 'Info', defaultMessage: 'Info',
}), }),
render: () => ( render: () => (
<Details gedcom={data!.gedcom} indi={selection!.id} /> <Details gedcom={data!.gedcom} indi={updatedSelection.id} />
), ),
}, },
{ {
@@ -479,7 +478,7 @@ export function App() {
) : null} ) : null}
<Chart <Chart
data={data!.chartData} data={data!.chartData}
selection={selection!} selection={updatedSelection}
chartType={chartType} chartType={chartType}
onSelection={onSelection} onSelection={onSelection}
freezeAnimation={freezeAnimation} freezeAnimation={freezeAnimation}

2
src/datasource/wikitree.ts
View File

@@ -98,7 +98,7 @@ async function getRelatives(
{getChildren: true, getSpouses: true}, {getChildren: true, getSpouses: true},
getApiOptions(handleCors), getApiOptions(handleCors),
); );
if (response === []) { if (!response) {
const id = keysToFetch[0]; const id = keysToFetch[0];
throw new TopolaError( throw new TopolaError(
'WIKITREE_PROFILE_NOT_FOUND', 'WIKITREE_PROFILE_NOT_FOUND',