forked/topola-viewer
1
0
Fork 0
mirror of https://github.com/PeWu/topola-viewer.git synced 2026-03-16 20:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proof of concept loading data from WikiTree

Browse Source
This commit is contained in:
Przemek Wiech
2020-01-13 22:42:26 +01:00
parent 07bcafc7dc
commit 7b09936a84
2 changed files with 178 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app.tsx
View File

@@ -12,6 +12,7 @@ import {Intro} from './intro';
import {Loader, Message, Portal, Responsive} from 'semantic-ui-react';
import {Redirect, Route, RouteComponentProps, Switch} from 'react-router-dom';
import {TopBar} from './top_bar';
import {loadWikiTree} from './wikitree';
/** Shows an error message in the middle of the screen. */
function ErrorMessage(props: {message?: string}) {
@@ -117,11 +118,16 @@ export class App extends React.Component<RouteComponentProps, {}> {
hash: string | undefined,
url: string | undefined,
gedcom: string | undefined,
source: string | undefined,
): boolean {
return (
!!(hash && hash !== this.state.hash) ||
!!(url && this.state.url !== url) ||
(!!gedcom && !this.state.loading && !this.state.data)
(!!gedcom && !this.state.loading && !this.state.data) ||
(source === 'wikitree' &&
!this.state.loading &&
!this.state.data &&
!this.state.error)
);
}
@@ -226,6 +232,7 @@ export class App extends React.Component<RouteComponentProps, {}> {
const handleCors = getParam('handleCors') !== 'false'; // True by default.
const standalone = getParam('standalone') !== 'false'; // True by default.
const view = getParam('view');
const source = getParam('source');
const chartTypes = new Map<string | undefined, ChartType>([
['relatives', ChartType.Relatives],
@@ -238,9 +245,9 @@ export class App extends React.Component<RouteComponentProps, {}> {
const images =
this.props.location.state && this.props.location.state.images;
if (!url && !hash) {
if (!url && !hash && !source) {
this.props.history.replace({pathname: '/'});
} else if (this.isNewData(hash, url, gedcom)) {
} else if (this.isNewData(hash, url, gedcom, source)) {
try {
// Set loading state.
this.setState(
@@ -255,9 +262,12 @@ export class App extends React.Component<RouteComponentProps, {}> {
chartType,
}),
);
const data = hash
? await loadGedcom(hash, gedcom, images)
: await loadFromUrl(url!, handleCors);
const data =
source === 'wikitree'
? await loadWikiTree(indi!, handleCors)
: hash
? await loadGedcom(hash, gedcom, images)
: await loadFromUrl(url!, handleCors);
const software = getSoftware(data.gedcom.head);
analyticsEvent(hash ? 'upload_file_loaded' : 'url_file_loaded', {