Skip to content

MagDur Loading #42

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.

Sign up for GitHub

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

Merged
prestoncraw merged 1 commit into from
Sep 9, 2026
Merged

MagDur Loading #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions TSX/CollectionWidget/DynamicMagDurChart/DynamicMagDurChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { Application, Gemstone, OpenXDA } from '@gpa-gemstone/application-typing
import { useGetContainerPosition } from '@gpa-gemstone/helper-functions';
import { Line, Plot, Circle, AggregatingCircles } from '@gpa-gemstone/react-graph';
import { CheckBox, Input } from '@gpa-gemstone/react-forms';
import { GenericController, LoadingIcon } from '@gpa-gemstone/react-interactive';
import { Alert, GenericController, LoadingIcon } from '@gpa-gemstone/react-interactive';
import * as React from 'react';
import { EventWidget } from '../../global';
import { DynamicEventSearchRow, FetchFallbackDynamicEventSearchData, IDynamicEventSearchQuery } from '../DynamicEventTable/DynamicEventSearchData';
Expand Down Expand Up @@ -220,9 +220,18 @@ const DynamicMagDurChart: EventWidget.ICollectionWidget<ISettings, DynamicEventS
];
}, [magDurCurves, events, props.EventID, data, props.Settings.Aggregate])

const errorAlert = status === 'error' || magDurStatus === 'error' ? (
<div style={{ flexShrink: 0 }}>
<Alert Class='alert-danger'>
{status === 'error' && magDurStatus === 'error' ? 'Error retrieving event data and magnitude duration curves.' :
status === 'error' ? 'Error retrieving event data.' : 'Error retrieving magnitude duration curves.'}
</Alert>
</div>
) : null;

const content = (
<>
<LoadingIcon Show={status !== 'idle' || magDurStatus !== 'idle'} />
<div style={{ flex: 1, minHeight: 0, overflow: 'hidden' }} ref={bodyRef}>
<LoadingIcon Show={status === 'loading' || magDurStatus === 'loading'} />
<Plot height={bodyHeight ?? 500} width={bodyWidth ?? 500} showBorder={false} menuLocation={'right'}
defaultTdomain={[0.00001, 1000]}
defaultYdomain={[0, 5]}
Expand Down Expand Up @@ -263,12 +272,13 @@ const DynamicMagDurChart: EventWidget.ICollectionWidget<ISettings, DynamicEventS
setSelectedMag(0);
}}
/>
</>
</div>
);

if (!props.Settings.ShowCard)
return (
<div className="h-100 w-100" style={{ display: 'flex', flexDirection: "column", overflow: 'hidden' }} ref={bodyRef}>
<div className="h-100 w-100" style={{ display: 'flex', flexDirection: "column", overflow: 'hidden' }}>
{errorAlert}
{content}
</div>
);
Expand All @@ -278,7 +288,8 @@ const DynamicMagDurChart: EventWidget.ICollectionWidget<ISettings, DynamicEventS
<div className="card-header">
{props.Title == null ? "Magnitude Duration Chart" : props.Title}
</div>
<div className="card-body p-0" style={{ display: 'flex', flexDirection: "column", flex: 1, overflow: 'hidden' }} ref={bodyRef}>
<div className="card-body p-0" style={{ display: 'flex', flexDirection: "column", flex: 1, overflow: 'hidden' }}>
{errorAlert}
{content}
</div>
</div>
Expand Down