Merge pull request #18863 from jeclrsg/hpcc-32209-file-contents-blank…

…-filter-dialog HPCC-32209 ECL Watch v9 fix result filter dialog blank form
hpcc-systems · Jul 11, 2024 · 0bc3a52 · 0bc3a52
2 parents f11a6d1 + 43cbd8b
commit 0bc3a52
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/esp/src/src-react/components/Result.tsx b/esp/src/src-react/components/Result.tsx
@@ -11,7 +11,7 @@ import { csvEncode } from "src/Utility";
 import { useWorkunit, useMyAccount, useConfirm } from "../hooks/index";
 import { HolyGrail } from "../layouts/HolyGrail";
 import { AutosizeHpccJSComponent } from "../layouts/HpccJSAdapter";
-import { pushParams } from "../util/history";
+import { pushParams, replaceUrl } from "../util/history";
 import { ShortVerticalDivider } from "./Common";
 import { Fields } from "./forms/Fields";
 import { Filter } from "./forms/Filter";
@@ -243,6 +243,12 @@ export const Result: React.FunctionComponent<ResultProps> = ({
         .pageSize(50) as ResultWidget
     );
 
+    const { currentUser } = useMyAccount();
+    const [wu] = useWorkunit(wuid);
+    const [result, setResult] = React.useState<CommsResult>(resultTable.calcResult());
+    const [FilterFields, setFilterFields] = React.useState<Fields>({});
+    const [showFilter, setShowFilter] = React.useState(false);
+
     React.useEffect(() => {
         resultTable
             .wuid(wuid)
@@ -251,20 +257,14 @@ export const Result: React.FunctionComponent<ResultProps> = ({
             .logicalFile(logicalFile)
             .filter(filter)
             .renderHtml(renderHTML)
-            .lazyRender()
+            .render(() => setResult(resultTable.calcResult()))
             ;
     }, [cluster, filter, logicalFile, renderHTML, resultName, resultTable, wuid]);
 
     React.useEffect(() => {
         resultTable.filter(filter);
     }, [filter, resultTable]);
 
-    const { currentUser } = useMyAccount();
-    const [wu] = useWorkunit(wuid);
-    const [result] = React.useState<CommsResult>(resultTable.calcResult());
-    const [FilterFields, setFilterFields] = React.useState<Fields>({});
-    const [showFilter, setShowFilter] = React.useState(false);
-
     React.useEffect(() => {
         result?.fetchXMLSchema().then(() => {
             const filterFields: Fields = {};
@@ -276,8 +276,13 @@ export const Result: React.FunctionComponent<ResultProps> = ({
                 };
             });
             setFilterFields(filterFields);
-        }).catch(err => logger.error(err));
-    }, [result]);
+        }).catch(err => {
+            logger.error(err);
+            if (err.message.indexOf("Cannot open the workunit result") > -1) {
+                replaceUrl(`/workunits/${wuid}/outputs/`);
+            }
+        });
+    }, [result, wuid]);
 
     //  Filter  ---
     const [filterFields, hasHtml] = React.useMemo(() => {
@@ -310,7 +315,7 @@ export const Result: React.FunctionComponent<ResultProps> = ({
             key: "refresh", text: nlsHPCC.Refresh, iconProps: { iconName: "Refresh" },
             onClick: () => {
                 resultTable.reset();
-                resultTable.lazyRender();
+                resultTable.render(() => setResult(resultTable.calcResult()));
             }
         },
         { key: "divider_1", itemType: ContextualMenuItemType.Divider, onRender: () => <ShortVerticalDivider /> },