Skip to content
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

Jump to bottom

HPCC-32285 ECL Watch v9 file contents displays empty when loading #18950

Merged
merged 1 commit into from
Aug 2, 2024
Merged

HPCC-32285 ECL Watch v9 file contents displays empty when loading #18950

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
9 changes: 7 additions & 2 deletions esp/src/src-react/components/Result.tsx
View file
Open in desktop
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
Loading