Merge branch 'info-ui' of https://github.com/brown-dash/Dash-Web into info-ui

1 files changed, 13 insertions, 28 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoState.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoState.tsx
index bf47820a1..3c19ef4e9 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoState.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoState.tsx
@@ -3,18 +3,11 @@ import { observer } from 'mobx-react';
 import './CollectionFreeFormView.scss';
 import React = require('react');
 
-export type infoArc = {
-    events: () => any;
-    actions: (arg?: any) => any;
+export type infoState = {
+    Message: string;
+    Events: () => any;
+    Actions: (arg?: any) => any;
 };
-export class infoState {
-    Message: string = '';
-    Arcs: infoArc[] = [];
-    constructor(message: string, arcs: infoArc[]) {
-        this.Message = message;
-        this.Arcs = arcs;
-    }
-}
 
 export interface CollectionFreeFormInfoStateProps {
     state: infoState;
@@ -22,28 +15,20 @@ export interface CollectionFreeFormInfoStateProps {
 
 @observer
 export class CollectionFreeFormInfoState extends React.Component<CollectionFreeFormInfoStateProps> {
-    _disposers: IReactionDisposer[] = [];
+    _disposer: IReactionDisposer | undefined;
+
+    clearState = () => this._disposer?.();
+    initState = () => (this._disposer = reaction(this.props.state.Events, this.props.state.Actions, { fireImmediately: true }));
+
     componentDidMount(): void {
-        this._disposers = this.props.state.Arcs.map(arc =>
-            reaction(
-                () => arc.events(),
-                args => arc.actions(args),
-                { fireImmediately: true }
-            )
-        );
+        this.initState();
     }
     componentWillUpdate() {
-        this._disposers.map(disposer => disposer());
-        this._disposers = this.props.state.Arcs.map(arc =>
-            reaction(
-                () => arc.events(),
-                args => arc.actions(args),
-                { fireImmediately: true }
-            )
-        );
+        this.clearState();
+        this.initState();
     }
     componentWillUnmount(): void {
-        this._disposers.map(disposer => disposer());
+        this.clearState();
     }
     render() {
         return <div className="infoUI">{this.props.state.Message}</div>;