Skip to content

Commit

Permalink
Merge pull request #18950 from jeclrsg/hpcc-32285-dgrid-empty-loading
Browse files Browse the repository at this point in the history
HPCC-32285 ECL Watch v9 file contents displays empty when loading
  • Loading branch information
GordonSmith authored Aug 2, 2024
2 parents 4afd03c + 5b306db commit 358c0c6
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions esp/src/src-react/components/Result.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import * as ReactDOM from "react-dom";
import { Checkbox, CommandBar, ContextualMenuItemType, DefaultButton, Dialog, DialogFooter, DialogType, ICommandBarItemProps, PrimaryButton, SpinButton, Stack } from "@fluentui/react";
import { Checkbox, CommandBar, ContextualMenuItemType, DefaultButton, Dialog, DialogFooter, DialogType, ICommandBarItemProps, PrimaryButton, SpinButton, Spinner, Stack } from "@fluentui/react";
import { useConst } from "@fluentui/react-hooks";
import { Result as CommsResult, XSDXMLNode } from "@hpcc-js/comms";
import { scopedLogger } from "@hpcc-js/util";
Expand Down Expand Up @@ -247,6 +247,7 @@ export const Result: React.FunctionComponent<ResultProps> = ({
const [wu] = useWorkunit(wuid);
const [result, setResult] = React.useState<CommsResult>(resultTable.calcResult());
const [FilterFields, setFilterFields] = React.useState<Fields>({});
const [loading, setLoading] = React.useState(true);
const [showFilter, setShowFilter] = React.useState(false);

React.useEffect(() => {
Expand Down Expand Up @@ -276,6 +277,7 @@ export const Result: React.FunctionComponent<ResultProps> = ({
};
});
setFilterFields(filterFields);
setLoading(false);
}).catch(err => {
logger.error(err);
if (err.message.indexOf("Cannot open the workunit result") > -1) {
Expand Down Expand Up @@ -370,7 +372,10 @@ export const Result: React.FunctionComponent<ResultProps> = ({
header={<CommandBar items={buttons} farItems={rightButtons} />}
main={
<>
<AutosizeHpccJSComponent widget={resultTable} />
{loading ?
<Spinner label={nlsHPCC.Loading} /> :
<AutosizeHpccJSComponent widget={resultTable} />
}
<Filter showFilter={showFilter} setShowFilter={setShowFilter} filterFields={filterFields} onApply={pushParams} />
<ViewHTMLConfirm />
</>
Expand Down

0 comments on commit 358c0c6

Please sign in to comment.