@agilemotion/oui-react-js 1.3.9 → 1.4.0

package/dist/{ApplicationContext.js → ApplicationManager.js}

@@ -37,9 +37,18 @@ const TEMPLATE_TOKEN_REGEX = new RegExp('(([$]{1}[{]{1})(([a-zA-Z0-9_$.@#{}[\\]]
 exports.TEMPLATE_TOKEN_REGEX = TEMPLATE_TOKEN_REGEX;
 const LEGEND_ARROW_ICON = " <i class=\"fa fa-arrow-right fa-xs\" aria-hidden=\"true\" style='color:__COLOR__'></i> ";
 exports.LEGEND_ARROW_ICON = LEGEND_ARROW_ICON;
+const applicationContext = {};
 
-class ApplicationContext {
+class ApplicationManager {
   constructor() {
+    _defineProperty(this, "addApplicationContextSubscription", subscription => {
+      return new Promise(resolve => {
+        _Observable.default.addApplicationContextSubscription(subscription);
+
+        resolve(applicationContext);
+      });
+    });
+
     _defineProperty(this, "setConfirmDialogHandler", controller => {
       this.props.confirmationDialogController = controller;
     });
@@ -56,16 +65,23 @@ class ApplicationContext {
       return this.props.applicationHistory;
     });
 
-    _defineProperty(this, "setViewPortHistory", history => {
-      this.props.viewPortHistory = history;
-    });
-
     _defineProperty(this, "getAppBarTitle", () => {
       return this.props.appBarTitle;
     });
 
     _defineProperty(this, "updateAppBarTitle", (viewId, title) => {
+      console.log('updateAppBarTitle VIEW LENGTH : ', this.views.length);
+
+      for (const view1 of this.views) {
+        console.log('updateAppBarTitle VIEW : ', view1.config.id);
+      }
+
       let view = this.getView(viewId);
+
+      if (!view) {
+        return;
+      }
+
       let legendIconArrow = LEGEND_ARROW_ICON.replace('__COLOR__', this.props.secondaryColor);
       let titleValue = '';
 
@@ -82,7 +98,7 @@ class ApplicationContext {
           }
         }
 
-        let legendValue = "<span>";
+        let legendValue = '<span>';
         let counter = 0;
 
         for (const navHistoryElement of this.navHistory) {
@@ -93,10 +109,10 @@ class ApplicationContext {
           }
         }
 
-        legendValue += "</span>";
+        legendValue += '</span>';
         this.props.appBarTitle = legendValue;
       } else if (!view.popUp) {
-        let legendPath = "";
+        let legendPath = '';
 
         for (let i = 0; i < this.graphs[0].initialNavHistoryDepth; i++) {
           legendPath += "".concat(this.navHistory[i].title);
@@ -127,6 +143,10 @@ class ApplicationContext {
       }
     });
 
+    _defineProperty(this, "setViewPortHistory", history => {
+      this.props.viewPortHistory = history;
+    });
+
     _defineProperty(this, "getViewPortHistory", () => {
       return this.props.viewPortHistory;
     });
@@ -158,7 +178,7 @@ class ApplicationContext {
 
     _defineProperty(this, "addFile", (domain, file) => {
       if (_Utils.default.isNull(domain)) {
-        console.error("Please specify file domain");
+        console.error('Please specify file domain');
         return;
       }
 
@@ -186,24 +206,42 @@ class ApplicationContext {
       }
     });
 
+    _defineProperty(this, "updateContext", values => {
+      _Observable.default.emitContextChangeEvent(applicationContext, values);
+
+      Object.keys(values).forEach(key => {
+        applicationContext[key] = values[key];
+      });
+    });
+
     _defineProperty(this, "addView", (view, path, forward) => {
       if (!view.popUp && !view.window) {
-        this.closeCurrentView(forward);
+        let topView = this.getTopAnchorView();
 
-        if (!forward) {
-          this.navHistory.pop();
+        if (topView) {
+          this.closeView(topView === null || topView === void 0 ? void 0 : topView.config.id);
         }
       } else {
         if (view.popUp) {
           this.props.confirmationDialogController.openPopupView(view);
         }
+
+        if (view.window) {
+          let topView = this.getTopWindowView();
+
+          if (topView) {
+            this.closeView(topView === null || topView === void 0 ? void 0 : topView.config.id);
+          }
+        }
       }
 
       if (view.parent) {
         this.navHistory.splice(0, this.navHistory.length);
 
         for (const contextView of this.views) {
-          if (!_Utils.default.isNull(contextView) && !_Utils.default.isNull(contextView.handle.api)) {
+          let shouldClose = view.window && contextView.window || !view.window && !contextView.window;
+
+          if (!_Utils.default.isNull(contextView) && !_Utils.default.isNull(contextView.handle.api) && shouldClose) {
             this.closeView(contextView.handle.api.id, forward);
           }
         }
@@ -211,51 +249,95 @@ class ApplicationContext {
 
       let historyElement = {};
       historyElement.viewId = view.config.id;
+      historyElement.parent = view.parent;
       historyElement.path = path;
       this.navHistory.push(historyElement);
       this.views.push(view);
-    });
 
-    _defineProperty(this, "getCurrentView", () => {
-      return this.views[this.views.length - 1];
-    });
+      if (view.window) {
+        _Observable.default.emitContextChangeEvent(applicationContext, {
+          windowView: view
+        });
 
-    _defineProperty(this, "closeCurrentView", forward => {
-      var _this$graphs;
+        applicationContext.windowView = view;
+      }
 
-      let currentView = this.views[this.views.length - 1];
+      let currentGraph = this.graphs.length > 0 ? this.graphs[this.graphs.length - 1] : null;
 
-      if (((_this$graphs = this.graphs[this.graphs.length - 1]) === null || _this$graphs === void 0 ? void 0 : _this$graphs.anchorView) !== currentView && !_Utils.default.isNull(currentView) && !_Utils.default.isNull(currentView.handle.api)) {
-        this.closeView(currentView.handle.api.id, forward);
+      if (!view.window && view.parent && currentGraph && currentGraph.config.isWindow) {
+        currentGraph.anchorView = view;
+        currentGraph.anchorHistoryElement = this.navHistory[this.navHistory.length - 1];
+        this.updateContext({
+          windowDisplayState: 'MINIMIZED'
+        });
       }
     });
 
+    _defineProperty(this, "closeAllViews", () => {
+      for (const view of this.views) {
+        this.closeView(view.config.id, false);
+      }
+
+      _Observable.default.emitContextChangeEvent(applicationContext, {
+        windowView: null
+      });
+
+      applicationContext.windowView = null;
+    });
+
     _defineProperty(this, "closeView", (viewId, forward) => {
-      _Observable.default.clearEventListeners(viewId);
+      let view = this.getView(viewId);
 
-      for (let i = 0; i < this.fileCache.length; i++) {
-        let cacheElement = this.fileCache[i];
+      if (view) {
+        if (!_Utils.default.isNull(view) && !_Utils.default.isNull(view.handle.api)) {
+          _Observable.default.clearEventListeners(viewId);
 
-        if (cacheElement.domain === viewId) {
-          this.fileCache.slice(i, 1);
-          break;
-        }
-      }
+          for (let i = 0; i < this.fileCache.length; i++) {
+            let cacheElement = this.fileCache[i];
 
-      let count = 0;
+            if (cacheElement.domain === viewId) {
+              this.fileCache.slice(i, 1);
+              break;
+            }
+          }
 
-      for (const view of this.views) {
-        if (view.handle.api.id === viewId) {
-          this.views.splice(count, 1);
+          let count = 0;
+
+          for (const view of this.views) {
+            if (view.handle.api.id === viewId) {
+              this.views.splice(count, 1);
+
+              if (!view.popUp && !view.parent && (_Utils.default.isNull(forward) || forward === false)) {
+                let viewIndex = this.navHistory.findIndex(h => h.viewId === viewId);
+
+                if (viewIndex >= 0) {
+                  this.navHistory.splice(viewIndex, 1);
+                }
+              } else if (view.popUp) {
+                this.props.confirmationDialogController.closePopupView();
+              }
+            }
+
+            count++;
+          }
+        }
+
+        let hasWindow = false;
 
-          if (!view.popUp && !view.parent && (_Utils.default.isNull(forward) || forward === false)) {
-            this.navHistory.pop();
-          } else if (view.popUp) {
-            this.props.confirmationDialogController.closePopupView();
+        for (const viewsElement of this.views) {
+          if (viewsElement.window) {
+            hasWindow = true;
+            break;
           }
         }
 
-        count++;
+        if (!hasWindow) {
+          _Observable.default.emitContextChangeEvent(applicationContext, {
+            windowView: null
+          });
+
+          applicationContext.windowView = null;
+        }
       }
     });
 
@@ -284,6 +366,10 @@ class ApplicationContext {
         if (id === 'view') {
           return view.handle.api;
         }
+      } else {
+        if (id === 'trainingScheduleCalendarEventForm') {
+          console.log('NO HANDLES');
+        }
       }
     });
 
@@ -298,8 +384,6 @@ class ApplicationContext {
         }
       }
 
-      let currentView;
-
       if (this.views.length === 0) {
         return this.getViewComponent(this.props.dashboardView, id);
       }
@@ -321,10 +405,10 @@ class ApplicationContext {
       if (!_Utils.default.isNull(matches)) {
         for (const match of matches) {
           let expresionContent = match.substring(match.indexOf('{') + 1, match.lastIndexOf('}'));
-          let expressionValue = "";
+          let expressionValue = '';
 
-          if (expresionContent.startsWith("$event.data") && !_Utils.default.isNull(eventData)) {
-            let props = expresionContent.replace("$event.data.", "").split(".");
+          if (expresionContent.startsWith('$event.data') && !_Utils.default.isNull(eventData)) {
+            let props = expresionContent.replace('$event.data.', '').split('.');
             let vo = eventData;
 
             for (const prop of props) {
@@ -346,7 +430,7 @@ class ApplicationContext {
     _defineProperty(this, "resolveExpressionValue", (expression, eventData = null) => {
       let paramExpression = expression.match(/\(([^)]*)\)/);
       let isEvent = expression.startsWith('$event.data');
-      let baseExpression = isEvent ? "$event.data" : !_Utils.default.isNull(paramExpression) && paramExpression.length > 0 ? expression.replace(paramExpression[0], '') : expression;
+      let baseExpression = isEvent ? '$event.data' : !_Utils.default.isNull(paramExpression) && paramExpression.length > 0 ? expression.replace(paramExpression[0], '') : expression;
       let expressionContent = baseExpression.substring(baseExpression.indexOf('{') + 1, baseExpression.indexOf('}'));
       let isComponent = baseExpression.startsWith('@#{');
       let isLib = baseExpression.startsWith('@@{');
@@ -360,7 +444,7 @@ class ApplicationContext {
 
         if (index > 0) {
           let propertyChain = expression.substring(index + expressionClosure.length);
-          let props = propertyChain.split(".");
+          let props = propertyChain.split('.');
 
           for (const prop of props) {
             if (_Utils.default.isNull(value)) {
@@ -377,10 +461,9 @@ class ApplicationContext {
 
         return value;
       } else if (isLib) {
-        if (idToken === 'view') {
-          idToken = this.getCurrentView().config.id + '_lib';
-        }
-
+        /*if (idToken === 'view') {
+            idToken = this.getCurrentView().config.id + '_lib';
+        }*/
         return this.libs[idToken];
       }
 
@@ -411,7 +494,7 @@ class ApplicationContext {
               scriptValue = null;
             }
 
-            let objKey = key === "valueExpression" ? "value" : key;
+            let objKey = key === 'valueExpression' ? 'value' : key;
             updated[objKey] = scriptValue !== null && scriptValue.instanceType === 'TypedValue' ? scriptValue.value : scriptValue;
 
             if (typeof updated[objKey] === 'undefined') {
@@ -455,7 +538,7 @@ class ApplicationContext {
 
         if (index > 0) {
           let propertyChain = expression.substring(index + expressionClosure.length);
-          let props = propertyChain.split(".");
+          let props = propertyChain.split('.');
 
           for (const prop of props) {
             if (_Utils.default.isNull(value)) {
@@ -472,7 +555,7 @@ class ApplicationContext {
       let val = null;
 
       if (_Utils.default.isNull(parameterConfig.value)) {
-        console.error("NULL parameter value expression in : " + JSON.stringify(parameterConfig));
+        console.error('NULL parameter value expression in : ' + JSON.stringify(parameterConfig));
         return null;
       }
 
@@ -513,10 +596,10 @@ class ApplicationContext {
     });
 
     _defineProperty(this, "getId", () => {
-      return "applicationContext";
+      return 'applicationManager';
     });
 
-    if (!ApplicationContext.instance) {
+    if (!ApplicationManager.instance) {
       this.views = [];
       this.props = {};
       this.listeners = [];
@@ -529,16 +612,16 @@ class ApplicationContext {
           return instance.getId();
         },
 
-        closeCurrentView() {
-          instance.closeCurrentView();
-        },
-
         refreshUserAvatar(avatar) {
           instance.refreshUserAvatar(avatar);
         },
 
-        alert(message, messageType) {
-          instance.alert(message, messageType);
+        alert(viewId, message, messageType) {
+          instance.alert(viewId, message, messageType);
+        },
+
+        removeLoadedGraph(routeToAnchor) {
+          instance.removeLoadedGraph(routeToAnchor);
         }
 
       };
@@ -549,10 +632,26 @@ class ApplicationContext {
         };
       }
 
-      ApplicationContext.instance = this;
+      ApplicationManager.instance = this;
     }
 
-    return ApplicationContext.instance;
+    return ApplicationManager.instance;
+  }
+
+  navigate(path) {
+    this.props.navigator(path);
+  }
+
+  setDashboardSettings(dashboardSettings) {
+    this.props.dashboardSettings = dashboardSettings;
+  }
+
+  getDashboardSettings() {
+    return this.props.dashboardSettings;
+  }
+
+  setNavigator(navigator) {
+    this.props.navigator = navigator;
   }
 
   setHasActiveMeeting(hasActiveMeeting) {
@@ -599,8 +698,8 @@ class ApplicationContext {
     this.listeners.push(listener);
   }
 
-  alert(message, messageType) {
-    let event = new _Event.default(this, this.getCurrentView().config.id, {
+  alert(viewId, message, messageType) {
+    let event = new _Event.default(this, this.getView(viewId).config.id, {
       messageType: messageType,
       message: message
     });
@@ -662,7 +761,7 @@ class ApplicationContext {
 
 
   isExpression(objValue) {
-    return objValue && objValue.toString().startsWith("$event.data") || !_Utils.default.isNull(objValue) && typeof objValue === 'string' && !_Utils.default.isNull(objValue.match(_DynamicJS.TEMPLATE_REGEX));
+    return objValue && objValue.toString().startsWith('$event.data') || !_Utils.default.isNull(objValue) && typeof objValue === 'string' && !_Utils.default.isNull(objValue.match(_DynamicJS.TEMPLATE_REGEX));
   }
   /**
    * Returns a view configuration with a particular id
@@ -673,39 +772,46 @@ class ApplicationContext {
   loadAnchor(graph) {
     this.navHistory.splice(graph.initialNavHistoryDepth - 1, this.navHistory.length);
     this.addView(graph.anchorView, graph.anchorHistoryElement.path, true);
-    this.getViewPortHistory().push("/switch");
-    this.getViewPortHistory().push("/view/" + graph.anchorView.config.id);
+    this.navigate('/view/unload');
+    this.navigate('/view/' + graph.anchorView.config.id);
   }
 
   removeLoadedGraph(routeBackToAnchor) {
     if (this.graphs.length > 0) {
-      this.closeCurrentView(false);
       let graph = this.graphs[this.graphs.length - 1];
+      let view = graph.config.isWindow ? this.getTopWindowView() : this.getTopAnchorView();
+      this.closeView(view.config.id, false);
 
       if (!_Utils.default.isNull(graph.anchorHistoryElement) && routeBackToAnchor) {
         this.loadAnchor(graph);
       }
 
       this.graphs.splice(0, this.graphs.length);
+
+      if (!_Utils.default.isNull(graph.anchorHistoryElement)) {
+        this.updateAppBarTitle(graph.anchorView.config.id, graph.anchorView.config.title);
+      }
     }
   }
 
-  loadGraph(isParent, isPopup, config, parameterValues) {
-    if (isParent && !isPopup) {
+  loadGraph(isParent, isPopup, isWindow, config, parameterValues) {
+    if (isParent && !isPopup && !isWindow) {
       this.navHistory.splice(0, this.navHistory.length);
 
       for (const contextView of this.views) {
         this.closeView(contextView.handle.api.id, false);
       }
 
-      this.getViewPortHistory().push("/switch");
+      this.getViewPortHistory().push('/switch');
     }
 
+    config.isWindow = isWindow;
     let graph = new _Graph.default(_Utils.default.parseConfig(config));
     graph.initialNavHistoryDepth = this.navHistory.length;
 
     if (this.navHistory.length > 0) {
-      graph.anchorView = this.getCurrentView();
+      graph.anchorView = this.getTopAnchorView(); //= this.getCurrentView();
+
       graph.anchorHistoryElement = this.navHistory[this.navHistory.length - 1];
     }
 
@@ -718,6 +824,22 @@ class ApplicationContext {
     this.graphs.push(graph);
   }
 
+  getTopAnchorView() {
+    for (let i = this.views.length - 1; i >= 0; i--) {
+      if (!this.views[i].window) {
+        return this.views[i];
+      }
+    }
+  }
+
+  getTopWindowView() {
+    for (let i = this.views.length - 1; i >= 0; i--) {
+      if (this.views[i].window) {
+        return this.views[i];
+      }
+    }
+  }
+
   signalGraph(id, event) {
     if (this.graphs.length > 0) {
       let graphToSignal = this.graphs[this.graphs.length - 1];
@@ -747,7 +869,7 @@ class ApplicationContext {
 
 }
 
-const instance = new ApplicationContext();
+const instance = new ApplicationManager();
 Object.freeze(instance);
 var _default = instance;
 exports.default = _default;

package/dist/BasicApp.js

@@ -27,6 +27,12 @@ var _core = require("@material-ui/core");
 
 var _ThemeProvider = _interopRequireDefault(require("@material-ui/styles/ThemeProvider"));
 
+var _reactRouter = require("react-router");
+
+var _WithRouter = _interopRequireDefault(require("./WithRouter"));
+
+var _ViewContainer = _interopRequireDefault(require("./components/layout/ViewContainer"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -48,67 +54,64 @@ const agilityTheme = (0, _core.createMuiTheme)({
   }
 });
 
-class BasicApp extends _react.Component {
-  render() {
-    return /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, {
-      basename: "/"
-    }, /*#__PURE__*/_react.default.createElement(_MuiThemeProvider.default, {
-      muiTheme: _themeDefault.default
-    }, /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
-      theme: agilityTheme
-    }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Switch, null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/",
-      exact: true,
-      component: this.props.home
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/home",
-      component: this.props.home
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/login",
-      render: props => /*#__PURE__*/_react.default.createElement(_LoginBasic.default, {
-        url: location + this.props.contextRoot + this.props.authUrl + "/login",
-        background: 'rgba(0, 0, 0, 0.65)',
-        textColor: this.props.loginTextColor,
-        footerLogo: this.props.footerLogo,
-        footerText: this.props.footerText,
-        footerWidth: this.props.footerWidth,
-        footerSplitterColor: this.props.footerSplitterColor,
-        title: this.props.loginTitle,
-        logo: this.props.logo
-      })
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/forgot-password",
-      render: () => /*#__PURE__*/_react.default.createElement(_ForgotPasswordBasic.default, {
-        url: location + this.props.contextRoot + this.props.authUrl + "/password/forgot",
-        background: 'rgba(0, 0, 0, 0.65)',
-        title: 'Business Agility',
-        logo: this.props.logo
-      })
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/reset-password",
-      render: () => /*#__PURE__*/_react.default.createElement(_ResetPasswordBasic.default, {
-        url: location + this.props.contextRoot + this.props.authUrl + "/password/confirmForgot",
-        background: 'rgba(0, 0, 0, 0.65)',
-        textColor: this.props.loginTextColor,
-        title: 'Business Agility',
-        logo: this.props.logo
-      })
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      path: "/change-password",
-      render: () => /*#__PURE__*/_react.default.createElement(_ChangePasswordBasic.default, {
-        url: location + this.props.contextRoot + this.props.authUrl + "/password/challenge",
-        background: 'rgba(0, 0, 0, 0.65)',
-        textColor: this.props.loginTextColor,
-        title: 'Business Agility',
-        logo: this.props.logo
-      })
-    }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Redirect, {
-      to: "/home"
-    })))));
-  }
-
-}
-
-var _default = (0, _reactRouterDom.withRouter)(BasicApp);
-
+const BasicApp = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
+
+  _react.default.useEffect(() => {
+    navigate("/");
+  }, []);
+
+  return /*#__PURE__*/_react.default.createElement(_MuiThemeProvider.default, {
+    muiTheme: _themeDefault.default
+  }, /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
+    theme: agilityTheme
+  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Routes, null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "/",
+    element: props.home
+  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "view/:id",
+    element: /*#__PURE__*/_react.default.createElement(_ViewContainer.default, null)
+  })), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "/login",
+    element: /*#__PURE__*/_react.default.createElement(_LoginBasic.default, {
+      url: location + props.contextRoot + props.authUrl + "/login",
+      background: 'rgba(0, 0, 0, 0.65)',
+      textColor: props.loginTextColor,
+      footerLogo: props.footerLogo,
+      footerText: props.footerText,
+      footerWidth: props.footerWidth,
+      footerSplitterColor: props.footerSplitterColor,
+      title: props.loginTitle,
+      logo: props.logo
+    })
+  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "/forgot-password",
+    element: /*#__PURE__*/_react.default.createElement(_ForgotPasswordBasic.default, {
+      url: location + props.contextRoot + props.authUrl + "/password/forgot",
+      background: 'rgba(0, 0, 0, 0.65)',
+      title: 'Business Agility',
+      logo: props.logo
+    })
+  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "/reset-password",
+    element: /*#__PURE__*/_react.default.createElement(_ResetPasswordBasic.default, {
+      url: location + props.contextRoot + props.authUrl + "/password/confirmForgot",
+      background: 'rgba(0, 0, 0, 0.65)',
+      textColor: props.loginTextColor,
+      title: 'Business Agility',
+      logo: props.logo
+    })
+  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    path: "/change-password",
+    element: /*#__PURE__*/_react.default.createElement(_ChangePasswordBasic.default, {
+      url: location + props.contextRoot + props.authUrl + "/password/challenge",
+      background: 'rgba(0, 0, 0, 0.65)',
+      textColor: props.loginTextColor,
+      title: 'Business Agility',
+      logo: props.logo
+    })
+  }))));
+};
+
+var _default = BasicApp;
 exports.default = _default;