@agilemotion/oui-react-js 1.3.2 → 1.3.3

package/dist/ApplicationContext.js

@@ -46,8 +46,8 @@ exports.LEGEND_ARROW_ICON = LEGEND_ARROW_ICON;
 
 class ApplicationContext {
   constructor() {
-    _defineProperty(this, "setConfirmDialogHandler", handler => {
-      this.props.dialogHandler = handler;
+    _defineProperty(this, "setConfirmDialogHandler", controller => {
+      this.props.confirmationDialogController = controller;
     });
 
     _defineProperty(this, "registerLibrary", (name, lib) => {
@@ -133,7 +133,8 @@ class ApplicationContext {
           }
         }
 
-        this.props.appBarTitle = "".concat(legendPath).concat(legendIconArrow, "<span>").concat(this.graphs[0].title, "</span>");
+        legendPath = legendPath.length > 0 ? legendPath + legendIconArrow : '';
+        this.props.appBarTitle = "".concat(legendPath, "<span>").concat(this.graphs[0].title, "</span>");
         this.graphs[0].setCurrentNodeTitle(titleValue);
       }
 
@@ -242,7 +243,7 @@ class ApplicationContext {
           this.navHistory.pop();
         }
       } else {
-        this.props.dialogHandler.openPopupView(view);
+        this.props.confirmationDialogController.openPopupView(view);
       }
 
       if (view.parent) {
@@ -254,7 +255,10 @@ class ApplicationContext {
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
             const contextView = _step5.value;
-            this.closeView(contextView.handle.api.id, forward);
+
+            if (!_Utils.default.isNull(contextView) && !_Utils.default.isNull(contextView.handle.api)) {
+              this.closeView(contextView.handle.api.id, forward);
+            }
           }
         } catch (err) {
           _iterator5.e(err);
@@ -277,7 +281,7 @@ class ApplicationContext {
     _defineProperty(this, "closeCurrentView", forward => {
       let currentView = this.views[this.views.length - 1];
 
-      if (!_Utils.default.isNull(currentView)) {
+      if (!_Utils.default.isNull(currentView) && !_Utils.default.isNull(currentView.handle.api)) {
         this.closeView(currentView.handle.api.id, forward);
       }
     });
@@ -309,7 +313,7 @@ class ApplicationContext {
             if (!view.popUp && !view.parent && (_Utils.default.isNull(forward) || forward === false)) {
               this.navHistory.pop();
             } else if (view.popUp) {
-              this.props.dialogHandler.closePopupView();
+              this.props.confirmationDialogController.closePopupView();
             }
           }
 
@@ -434,21 +438,23 @@ class ApplicationContext {
       return template;
     });
 
-    _defineProperty(this, "resolveExpressionValue", expression => {
+    _defineProperty(this, "resolveExpressionValue", (expression, eventData = null) => {
       let paramExpression = expression.match(/\(([^)]*)\)/);
-      let baseExpression = !_Utils.default.isNull(paramExpression) && paramExpression.length > 0 ? expression.replace(paramExpression[0], '') : expression;
+      let isEvent = expression.startsWith('$event.data');
+      let baseExpression = isEvent ? "$event.data" : !_Utils.default.isNull(paramExpression) && paramExpression.length > 0 ? expression.replace(paramExpression[0], '') : expression;
       let expresionContent = baseExpression.substring(baseExpression.indexOf('{') + 1, baseExpression.indexOf('}'));
       let isComponent = baseExpression.startsWith('@#{');
       let isLib = baseExpression.startsWith('@@{');
       let tokens = expresionContent.split('.');
       let idToken = tokens[0];
 
-      if (isComponent) {
-        let value = this.resolveComponentApi(expresionContent);
-        let index = expression.indexOf('}.');
+      if (isComponent || isEvent) {
+        let value = isEvent ? eventData : this.resolveComponentApi(expresionContent);
+        let expressionClosure = isEvent ? 'data.' : '}.';
+        let index = expression.indexOf(expressionClosure);
 
         if (index > 0) {
-          let propertyChain = expression.substring(index + 2);
+          let propertyChain = expression.substring(index + expressionClosure.length);
           let props = propertyChain.split(".");
 
           var _iterator11 = _createForOfIteratorHelper(props),
@@ -540,7 +546,42 @@ class ApplicationContext {
       }
     });
 
-    _defineProperty(this, "resolveParameterValue", parameterConfig => {
+    _defineProperty(this, "resolveParameterValue", (parameterConfig, eventData = null) => {
+      let expression = parameterConfig.value.toString();
+      let isEvent = expression.startsWith('$event.data');
+
+      if (isEvent) {
+        let value = eventData;
+        let expressionClosure = 'data.';
+        let index = expression.indexOf(expressionClosure);
+
+        if (index > 0) {
+          let propertyChain = expression.substring(index + expressionClosure.length);
+          let props = propertyChain.split(".");
+
+          var _iterator12 = _createForOfIteratorHelper(props),
+              _step12;
+
+          try {
+            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+              const prop = _step12.value;
+
+              if (_Utils.default.isNull(value)) {
+                return null;
+              }
+
+              value = value[prop];
+            }
+          } catch (err) {
+            _iterator12.e(err);
+          } finally {
+            _iterator12.f();
+          }
+        }
+
+        return value;
+      }
+
       let val = null;
 
       if (_Utils.default.isNull(parameterConfig.value)) {
@@ -681,21 +722,21 @@ class ApplicationContext {
   }
 
   refreshUserAvatar(avatar) {
-    var _iterator12 = _createForOfIteratorHelper(this.listeners),
-        _step12;
+    var _iterator13 = _createForOfIteratorHelper(this.listeners),
+        _step13;
 
     try {
-      for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-        const listener = _step12.value;
+      for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+        const listener = _step13.value;
 
         if (listener.type === AVATAR_LISTENER_TYPE) {
           listener.handler(avatar);
         }
       }
     } catch (err) {
-      _iterator12.e(err);
+      _iterator13.e(err);
     } finally {
-      _iterator12.f();
+      _iterator13.f();
     }
   }
 
@@ -709,11 +750,15 @@ class ApplicationContext {
   }
 
   openConfirmDialog(message, resultCallback) {
-    return this.props.dialogHandler.openDialog(message, resultCallback);
+    return this.props.confirmationDialogController.openDialog(message, {
+      execute: result => {
+        resultCallback(result);
+      }
+    });
   }
 
   isExpression(objValue) {
-    return !_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
@@ -732,7 +777,11 @@ class ApplicationContext {
     if (this.graphs.length > 0) {
       this.closeCurrentView(false);
       let graph = this.graphs[this.graphs.length - 1];
-      this.loadAnchor(graph);
+
+      if (!_Utils.default.isNull(graph.anchorHistoryElement)) {
+        this.loadAnchor(graph);
+      }
+
       this.graphs.splice(0, this.graphs.length);
     }
   }
@@ -741,18 +790,18 @@ class ApplicationContext {
     if (isParent && !isPopup) {
       this.navHistory.splice(0, this.navHistory.length);
 
-      var _iterator13 = _createForOfIteratorHelper(this.views),
-          _step13;
+      var _iterator14 = _createForOfIteratorHelper(this.views),
+          _step14;
 
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          const contextView = _step13.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          const contextView = _step14.value;
           this.closeView(contextView.handle.api.id, false);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator13.f();
+        _iterator14.f();
       }
 
       this.getViewPortHistory().push("/switch");
@@ -768,18 +817,18 @@ class ApplicationContext {
 
     graph.init();
 
-    var _iterator14 = _createForOfIteratorHelper(parameterValues),
-        _step14;
+    var _iterator15 = _createForOfIteratorHelper(parameterValues),
+        _step15;
 
     try {
-      for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-        const parameterValue = _step14.value;
+      for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+        const parameterValue = _step15.value;
         graph.model[parameterValue.name] = parameterValue.value;
       }
     } catch (err) {
-      _iterator14.e(err);
+      _iterator15.e(err);
     } finally {
-      _iterator14.f();
+      _iterator15.f();
     }
 
     this.graphs.push(graph);
@@ -789,12 +838,12 @@ class ApplicationContext {
     if (this.graphs.length > 0) {
       let graphToSignal = this.graphs[this.graphs.length - 1];
 
-      var _iterator15 = _createForOfIteratorHelper(this.graphs),
-          _step15;
+      var _iterator16 = _createForOfIteratorHelper(this.graphs),
+          _step16;
 
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          const graph = _step15.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          const graph = _step16.value;
 
           if (id === graph.id) {
             graphToSignal = graph;
@@ -802,9 +851,9 @@ class ApplicationContext {
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator15.f();
+        _iterator16.f();
       }
 
       graphToSignal.signal(event);

package/dist/BasicAppHome.js

@@ -29,6 +29,8 @@ var _core = require("@material-ui/core");
 
 var _ThemeProvider = _interopRequireDefault(require("@material-ui/styles/ThemeProvider"));
 
+var _RestUtils = require("./RestUtils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -54,7 +56,7 @@ class BasicAppHome extends _react.Component {
       dashboardSettings: null,
       message: "",
       open: false,
-      avatarUrl: null,
+      avatarUrl: location + this.props.contextRoot + this.props.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken"),
       tokenRefreshMonitorStarted: false
     };
   }
@@ -121,14 +123,18 @@ class BasicAppHome extends _react.Component {
   }
 
   logout() {
-    sessionStorage.removeItem("accessToken");
-    sessionStorage.removeItem("refreshToken");
-    sessionStorage.removeItem("idToken");
-    sessionStorage.removeItem("lastLogin");
-
-    _ApplicationContext.default.clear();
-
-    this.props.history.push('/login');
+    (0, _RestUtils.sendRequest)(location + this.props.contextRoot + this.props.authUrl + "/logout", response => {
+      sessionStorage.removeItem("accessToken");
+      sessionStorage.removeItem("refreshToken");
+      sessionStorage.removeItem("idToken");
+      sessionStorage.removeItem("lastLogin");
+
+      _ApplicationContext.default.clear();
+
+      this.props.history.push('/login');
+    }, e => {
+      console.error('Error loging out');
+    }, true);
   }
 
   render() {
@@ -152,7 +158,7 @@ class BasicAppHome extends _react.Component {
         this.logout();
       },
       settings: this.state.dashboardSettings,
-      avatar: !_Utils.default.isNull(this.state.avatarUrl) ? this.state.avatarUrl : null,
+      avatar: this.state.avatarUrl,
       logo: this.state.dashboardSettings.logo,
       appLogoPath: this.props.appLogoPath
     })) : null), /*#__PURE__*/_react.default.createElement(_LoadingIndicator.default, {

package/dist/BusinessPortalApp.js

@@ -9,10 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 require("./BusinessPortalApp.css");
 
-var _themeDefault = _interopRequireDefault(require("./theme-default"));
-
-var _MuiThemeProvider = _interopRequireDefault(require("material-ui/styles/MuiThemeProvider"));
-
 var _reactRouterDom = require("react-router-dom");
 
 var _LoginBusinessPortal = _interopRequireDefault(require("./view/security/LoginBusinessPortal"));
@@ -23,10 +19,6 @@ var _ResetPasswordBasic = _interopRequireDefault(require("./view/security/ResetP
 
 var _ChangePasswordBasic = _interopRequireDefault(require("./view/security/ChangePasswordBasic"));
 
-var _core = require("@material-ui/core");
-
-var _ThemeProvider = _interopRequireDefault(require("@material-ui/styles/ThemeProvider"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -34,28 +26,11 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const location = window.location.protocol + "//" + window.location.hostname;
-const agilityTheme = (0, _core.createMuiTheme)({
-  palette: {
-    primary: {
-      main: '#015588'
-    },
-    secondary: {
-      main: '#000099'
-    },
-    white: {
-      main: '#ffffff'
-    }
-  }
-});
 
 class BusinessPortalApp 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,
@@ -66,46 +41,46 @@ class BusinessPortalApp extends _react.Component {
     }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
       path: "/login",
       render: props => /*#__PURE__*/_react.default.createElement(_LoginBusinessPortal.default, {
-        url: location + this.props.contextRoot + this.props.authUrl + "/login",
-        background: '#fafafa',
-        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
+        url: location + this.props.contextRoot + this.props.implConfig.authUrl + "/login",
+        background: this.props.implConfig.loginBackgroundColor,
+        textColor: this.props.implConfig.loginTextColor,
+        footerLogo: this.props.implConfig.footerLogo,
+        footerText: this.props.implConfig.footerText,
+        footerWidth: this.props.implConfig.footerWidth,
+        footerSplitterColor: this.props.implConfig.footerSplitterColor,
+        title: this.props.implConfig.loginTitle,
+        logo: this.props.implConfig.appLogo
       })
     }), /*#__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: '#fafafa',
-        textColor: this.props.loginTextColor,
-        title: this.props.loginTitle,
-        logo: this.props.logo
+        url: location + this.props.implConfig.contextRoot + this.props.implConfig.authUrl + "/password/forgot",
+        background: this.props.implConfig.loginBackgroundColor,
+        textColor: this.props.implConfig.loginTextColor,
+        title: this.props.implConfig.loginTitle,
+        logo: this.props.implConfig.appLogo
       })
     }), /*#__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: '#fafafa',
-        textColor: this.props.loginTextColor,
-        title: this.props.loginTitle,
-        logo: this.props.logo
+        url: location + this.props.implConfig.contextRoot + this.props.implConfig.authUrl + "/password/confirmForgot",
+        background: this.props.implConfig.loginBackgroundColor,
+        textColor: this.props.implConfig.loginTextColor,
+        title: this.props.implConfig.loginTitle,
+        logo: this.props.implConfig.appLogo
       })
     }), /*#__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: '#fafafa',
-        textColor: this.props.loginTextColor,
-        title: this.props.loginTitle,
-        logo: this.props.logo
+        url: location + this.props.implConfig.contextRoot + this.props.implConfig.authUrl + "/password/challenge",
+        background: this.props.implConfig.loginBackgroundColor,
+        textColor: this.props.implConfig.loginTextColor,
+        title: this.props.implConfig.loginTitle,
+        logo: this.props.implConfig.appLogo
       })
     }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Redirect, {
       to: "/home"
-    })))));
+    })));
   }
 
 }