Merge d9bab10 into 221f275

easyops-cn · Aug 6, 2020 · d084bea · d084bea
2 parents 221f275 + d9bab10
commit d084bea
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/panel/components/Layout.tsx b/src/panel/components/Layout.tsx
@@ -51,10 +51,14 @@ export function Layout(): React.ReactElement {
         ((data = event.data.payload), data?.type === "re-evaluation")
       ) {
         const value = hydrate(data.payload, data.repo);
-        const { id, ...changeData } = value;
+        const { id, raw, result } = value;
         setEvaluations((prev) => {
           const selected = prev.find((item) => item.id === id);
-          selected && Object.assign(selected.detail, changeData);
+          selected &&
+            Object.assign(selected.detail, {
+              raw,
+              result: result.error ? `ERROR: ${result.error}` : result.data,
+            });
 
           return [...prev];
         });
@@ -84,10 +88,14 @@ export function Layout(): React.ReactElement {
         ((data = event.data.payload), data?.type === "re-transformation")
       ) {
         const value = hydrate(data.payload, data.repo);
-        const { id, ...changeData } = value;
+        const { id, transform, result } = value;
         setTransformations((prev) => {
           const selected = prev.find((item) => item.id === id);
-          selected && Object.assign(selected.detail, changeData);
+          selected &&
+            Object.assign(selected.detail, {
+              transform,
+              result: result.error ? `ERROR: ${result.error}` : result.data,
+            });
           return [...prev];
         });
       }