@agilemotion/oui-react-js 1.3.8 → 1.4.0

package/dist/view/Dashboard.js

@@ -23,131 +23,171 @@ var _RestUtils = require("../RestUtils");
 
 var _RouteActionHandler = _interopRequireDefault(require("../event/RouteActionHandler"));
 
-var _ApplicationContext = _interopRequireDefault(require("../ApplicationContext"));
+var _ApplicationManager = _interopRequireDefault(require("../ApplicationManager"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+var _Event = _interopRequireDefault(require("../event/Event"));
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+var _Observable = _interopRequireDefault(require("../event/Observable"));
 
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+var _EventType = _interopRequireDefault(require("../event/EventType"));
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+var _AlertBar = _interopRequireDefault(require("../components/AlertBar"));
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+const location = window.location.protocol + '//' + window.location.hostname;
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+const text = response => {
+  return response.text();
+};
 
-const location = window.location.protocol + "//" + window.location.hostname;
+const alertBarHandle = {};
 
 const DashboardCard = props => {
-  const _React$useState = _react.default.useState(null),
-        _React$useState2 = _slicedToArray(_React$useState, 2),
-        path = _React$useState2[0],
-        setPath = _React$useState2[1];
+  const [path, setPath] = _react.default.useState(null);
+
+  const [name, setName] = _react.default.useState(null);
+
+  const [displayType, setDisplayType] = _react.default.useState(null);
+
+  const {
+    settings
+  } = props;
+
+  const [id, setId] = _react.default.useState(props.settings.id);
 
-  const _React$useState3 = _react.default.useState(null),
-        _React$useState4 = _slicedToArray(_React$useState3, 2),
-        name = _React$useState4[0],
-        setName = _React$useState4[1];
+  const [content, setContent] = _react.default.useState(null);
 
-  const _React$useState5 = _react.default.useState(null),
-        _React$useState6 = _slicedToArray(_React$useState5, 2),
-        displayType = _React$useState6[0],
-        setDisplayType = _React$useState6[1];
+  const [ref] = _react.default.useState( /*#__PURE__*/_react.default.createRef());
 
-  const _React$useState7 = _react.default.useState( /*#__PURE__*/_react.default.createRef()),
-        _React$useState8 = _slicedToArray(_React$useState7, 1),
-        ref = _React$useState8[0];
+  _react.default.useEffect(() => {
+    const accessToken = sessionStorage.getItem('accessToken');
+    const idToken = sessionStorage.getItem('idToken');
+
+    if (path) {
+      let fetchConfig = {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'text/html',
+          'Accept': 'text/html',
+          'Authorization': 'Bearer ' + accessToken,
+          'idToken': idToken
+        }
+      };
+      /*trackPromise(
+          fetch(encodeURI(path), fetchConfig)
+              .then(text)
+              .then((data) => {
+                  setContent(data);
+              })
+              .catch((e) => {
+                  console.error(e);
+              })
+      );*/
+    }
+  }, [path]);
 
   _react.default.useEffect(() => {
     if (!path) {
       // TODO: Make the base URL dynamic
-      let url = location + _ApplicationContext.default.getBaseApiUrl() + _ApplicationContext.default.getUIConfigPath() + "/dashboard?version=1.0&id=" + props.settings.path;
+      let url = location + _ApplicationManager.default.getContextRoot() + _ApplicationManager.default.getUIConfigPath() + '/dashboard/get?version=1.0&id=' + settings.path;
       (0, _RestUtils.sendRequest)(url, data => {
-        let defaultDisplayType = !_Utils.default.isNull(props.settings.parameters.map.displayType) ? props.settings.parameters.map.displayType : data.defaultDisplayType;
+        let defaultDisplayType = !_Utils.default.isNull(settings.parameters.displayType) ? settings.parameters.displayType : data.defaultDisplayType;
 
         if (_Utils.default.isNull(defaultDisplayType)) {
-          console.error("Could not determine display type for dashboard");
+          console.error('Could not determine display type for dashboard');
           return;
         }
 
         setDisplayType(defaultDisplayType);
-        let defaultName = !_Utils.default.isNull(props.settings.parameters.map.dashboardName) ? props.settings.parameters.map.dashboardName : data.defaultDashboardName;
+        let defaultName = !_Utils.default.isNull(settings.parameters.dashboardName) ? settings.parameters.dashboardName : data.defaultDashboardName;
 
         if (_Utils.default.isNull(defaultDisplayType)) {
-          console.error("Could not determine a default name for dashboard");
+          console.error('Could not determine a default name for dashboard');
           return;
         }
 
         setName(defaultName);
-        setPath(data.url.replace('.html', "".concat(defaultDisplayType, ".html")));
+        const accessToken = sessionStorage.getItem('accessToken');
+        const idToken = sessionStorage.getItem('idToken');
+        setPath(location + _ApplicationManager.default.getContextRoot() + _ApplicationManager.default.getUIConfigPath() + '/html/get?version=1.0&id=' + data.contentPath + "-".concat(defaultDisplayType.toLowerCase(), ".html&access_token=").concat(accessToken, "&idToken=").concat(idToken));
       }, e => {
         console.error(e);
       });
     }
-  });
+  }, []);
 
   const saveDashboard = () => {
-    props.settings.parameters.type = "MapEntityDto";
-    props.settings.parameters.map.displayType = displayType;
-    props.settings.parameters.map.dashboardName = name;
-    let url = "".concat(location, "/api/v1/service/dashboard/save?path=").concat(props.settings.path, "&parameters=").concat(JSON.stringify(props.settings.parameters));
+    settings.parameters.displayType = displayType;
+    settings.parameters.dashboardName = name;
+    let data = {
+      id: settings.id,
+      path: settings.path,
+      parameters: settings.parameters
+    };
+    let url = "".concat(location + _ApplicationManager.default.getContextRoot(), "/system/api/v1/user/dashboard/save");
+    (0, _RestUtils.postData)(url, response => {
+      settings.id = response;
+      setId(response);
+      displayAlert('SUCCESS', 'Dashboard saved successfully');
+    }, e => {
+      console.log(e);
+      displayAlert('ERROR', _Utils.default.SYSTEM_ERROR_MESSAGE);
+    }, true, data);
+  };
 
-    if (!_Utils.default.isNull(props.settings.id)) {
-      url += "&id=" + props.settings.id;
-    }
+  const displayAlert = (messageType, messageText) => {
+    let message = {
+      messageType: messageType,
+      message: messageText
+    };
+    let event = new _Event.default(_ApplicationManager.default, '_sys_dashboard', message);
 
-    (0, _RestUtils.sendRequest)(url, data => {}, e => {
-      console.log(e);
-    });
+    _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);
   };
 
   const deleteDashboard = () => {
-    if (!_Utils.default.isNull(props.settings) && !_Utils.default.isNull(props.settings.id)) {
-      _ApplicationContext.default.openConfirmDialog('Are you sure you want to delete this dashboard?', result => {
+    if (!_Utils.default.isNull(settings) && !_Utils.default.isNull(settings.id)) {
+      _ApplicationManager.default.openConfirmDialog('Are you sure you want to delete this dashboard?', result => {
         if (result === true) {
-          let url = "".concat(location, "/agility/app/controller/dashboard/delete?id=").concat(props.settings.id);
-          (0, _RestUtils.sendRequest)(url, data => {
+          let url = "".concat(location + _ApplicationManager.default.getContextRoot(), "/system/api/v1/user/dashboard/delete/").concat(settings.id);
+          (0, _RestUtils.sendRequest)(url, () => {
             props.onDelete();
           }, e => {
             console.log(e);
           });
         }
       });
-    } else {
-      props.onDelete();
     }
   };
 
   return /*#__PURE__*/_react.default.createElement(_Paper.default, {
     style: {
       minWidth: '200px',
-      marginLeft: props.settings.first ? '0' : '16px',
+      marginLeft: settings.first ? '0' : '16px',
       minHeight: '40vh'
     },
-    className: "col",
+    className: 'col',
     ref: ref
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "row"
+    className: 'row'
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*"
+    className: 'col-*-*'
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledDropdown, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
     color: "default",
     "data-toggle": "dropdown",
     style: {
-      width: '12px',
-      height: '8px'
+      width: '32px',
+      height: '32px',
+      margin: '8px 8px 0 0'
     },
     nav: true
   }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     "aria-controls": "menu-list-grow",
     "aria-haspopup": "true",
     style: {
-      width: '8px'
+      width: '32px',
+      height: '32px'
     }
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "fa fa-ellipsis-v fa-xs",
@@ -155,25 +195,31 @@ const DashboardCard = props => {
     style: {
       padding: '3px'
     }
-  }))), " ", /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
+  }))), ' ', /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
     className: "dropdown-navbar",
     tag: "ul"
-  }, /*#__PURE__*/_react.default.createElement(_reactstrap.NavLink, {
+  },
+  /*#__PURE__*/
+
+  /*Disable this button if id is already saved. After creating dashboard properties such as filters, this button must remain enabled at all times*/
+  _react.default.createElement(_reactstrap.NavLink, {
     tag: "li"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     className: "nav-item",
     onClick: () => {
       saveDashboard();
-    }
-  }, "SAVE")), /*#__PURE__*/_react.default.createElement(_reactstrap.NavLink, {
+    },
+    disabled: !_Utils.default.isNull(id)
+  }, 'SAVE')), /*#__PURE__*/_react.default.createElement(_reactstrap.NavLink, {
     tag: "li"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     className: "nav-item",
     onClick: () => {
       deleteDashboard();
-    }
-  }, "DELETE"), " "))), " "), /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*",
+    },
+    disabled: _Utils.default.isNull(id)
+  }, 'DELETE'), ' '))), ' '), /*#__PURE__*/_react.default.createElement("div", {
+    className: 'col-*-*',
     style: {
       padding: '14px 0 0 12px'
     }
@@ -182,16 +228,16 @@ const DashboardCard = props => {
       fontSize: '24px'
     }
   }, name))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "row",
+    className: 'row',
     style: {
-      margin: "16px",
+      margin: '16px',
       width: '100%',
       height: '32vh',
       padding: '8px 32px 0 0'
     }
   }, !_Utils.default.isNull(path) ? /*#__PURE__*/_react.default.createElement("object", {
     data: path,
-    title: "",
+    type: "text/html",
     style: {
       width: '100%',
       height: '100%'
@@ -200,19 +246,13 @@ const DashboardCard = props => {
 };
 
 const WorkFlowCard = props => {
-  const _React$useState9 = _react.default.useState(null),
-        _React$useState10 = _slicedToArray(_React$useState9, 2),
-        sp = _React$useState10[0],
-        setSp = _React$useState10[1];
+  const [sp, setSp] = _react.default.useState(null);
 
-  const _React$useState11 = _react.default.useState(null),
-        _React$useState12 = _slicedToArray(_React$useState11, 2),
-        minW = _React$useState12[0],
-        setMinW = _React$useState12[1];
+  const [minW, setMinW] = _react.default.useState(null);
 
   const routeAction = {
-    "actionType": "route",
-    "parent": true
+    'actionType': 'route',
+    'parent': true
   };
 
   _react.default.useEffect(() => {
@@ -231,11 +271,11 @@ const WorkFlowCard = props => {
       margin: props.margin,
       height: '152px'
     },
-    className: "col"
+    className: 'col'
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "row"
+    className: 'row'
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*",
+    className: 'col-*-*',
     style: {
       width: '70%'
     }
@@ -257,7 +297,7 @@ const WorkFlowCard = props => {
       fontSize: '30px'
     }
   }, props.itemCount)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*",
+    className: 'col-*-*',
     style: {
       marginTop: '50px'
     }
@@ -269,147 +309,183 @@ const WorkFlowCard = props => {
     onClick: () => {
       routeAction.path = props.path;
 
-      _RouteActionHandler.default.execute(routeAction, null, props.viewRef, 'dashboard');
+      _RouteActionHandler.default.execute(routeAction, null, props.viewRef, '_sys_dashboard');
     }
   }, "View"))));
 };
 
 const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
-  const _React$useState13 = _react.default.useState(!_Utils.default.isNull(props.settings.userDashboards) ? props.settings.userDashboards : []),
-        _React$useState14 = _slicedToArray(_React$useState13, 1),
-        userDashboards = _React$useState14[0];
-
-  const _React$useState15 = _react.default.useState(null),
-        _React$useState16 = _slicedToArray(_React$useState15, 2),
-        taskSummary = _React$useState16[0],
-        setTaskSummary = _React$useState16[1];
-
-  const _React$useState17 = _react.default.useState(null),
-        _React$useState18 = _slicedToArray(_React$useState17, 2),
-        menuItems = _React$useState18[0],
-        setMenuItems = _React$useState18[1];
-
-  const _React$useState19 = _react.default.useState(null),
-        _React$useState20 = _slicedToArray(_React$useState19, 2),
-        cardRows = _React$useState20[0],
-        setCardRows = _React$useState20[1];
-
-  const _React$useState21 = _react.default.useState(null),
-        _React$useState22 = _slicedToArray(_React$useState21, 2),
-        cardsPerRow = _React$useState22[0],
-        setCardsPerRow = _React$useState22[1];
+  const [userDashboards] = _react.default.useState(!_Utils.default.isNull(_ApplicationManager.default.getDashboardSettings().userDashboards) ? _ApplicationManager.default.getDashboardSettings().userDashboards : []);
+
+  const [settings] = _react.default.useState(_ApplicationManager.default.getDashboardSettings());
+
+  const [taskSummary, setTaskSummary] = _react.default.useState(null);
+
+  const [menuItems, setMenuItems] = _react.default.useState(null);
+
+  const [cardRows, setCardRows] = _react.default.useState(null);
+
+  const [cardsPerRow, setCardsPerRow] = _react.default.useState(null);
 
   let dashboardCardCounter = 0;
   let keyCounter = 0;
   const api = {
     get id() {
-      return "dashboard";
-    }
+      return '_sys_dashboard';
+    },
 
+    getChildren: () => {
+      return [alertBarHandle];
+    },
+    getChild: id => {
+      if (id === 'dashboardAlert') {
+        return alertBarHandle;
+      }
+
+      return null;
+    }
   };
   const handle = {
-    "api": api
+    'api': api
   };
 
-  function setupCardRows(exclusion) {
+  function setupCardRows(exclusion, defaultCardsPerRow) {
     let row = null;
     let gridRows = [];
     dashboardCardCounter = 0;
+    let i = cardsPerRow ? cardsPerRow : defaultCardsPerRow;
 
-    var _iterator = _createForOfIteratorHelper(userDashboards),
-        _step;
+    for (const userDashboard of userDashboards) {
+      if (dashboardCardCounter++ % i === 0) {
+        row = [];
+        gridRows.push(row);
+      }
 
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const userDashboard = _step.value;
+      if (userDashboard !== exclusion) {
+        row.push(userDashboard);
+      }
+    }
 
-        if (dashboardCardCounter++ % cardsPerRow === 0) {
-          row = [];
-          gridRows.push(row);
-        }
+    let populatedRows = [];
 
-        if (userDashboard !== exclusion) {
-          row.push(userDashboard);
-        }
+    for (const gridRow of gridRows) {
+      if (gridRow.length > 0) {
+        populatedRows.push(gridRow);
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
 
-    for (var _i2 = 0, _gridRows = gridRows; _i2 < _gridRows.length; _i2++) {
-      const gridRow = _gridRows[_i2];
+    for (const gridRow of populatedRows) {
       gridRow[0].first = true;
     }
 
-    setCardRows(gridRows);
+    setCardRows(populatedRows);
   }
 
+  const getDashboardMenu = path => {
+    return new Promise(resolve => {
+      let service = {
+        url: '/ui/api/v1/menu/get',
+        parameters: [{
+          name: 'id',
+          value: path,
+          httpParameterType: 'QUERY_PARAMETER'
+        }, {
+          name: 'version',
+          value: 1.0,
+          httpParameterType: 'QUERY_PARAMETER'
+        }],
+        contentType: 'application/json'
+      };
+      (0, _RestUtils.invokeRest)(service, {
+        api: {
+          get id() {
+            return 'dashboard-menus';
+          }
+
+        }
+      }, 'dashboard-menus', result => {
+        resolve(result.menus);
+      }, e => {
+        console.error(e);
+        resolve(null);
+      }, null);
+    });
+  };
+
   _react.default.useEffect(() => {
-    let rpcConfig = {
-      "type": "remoteObjectProxy",
-      "procedureName": "getWorkFlowSummary",
-      "serviceId": "SYSTEM.WorkFlow"
-    };
+    /*let rpcConfig = {
+        "type": "rpc",
+        "procedureName": "getWorkFlowSummary",
+        "serviceId": "BPM.WorkFlow"
+    };*/
+    let cardsPerRow = 2;
 
     if (window.innerWidth < 400) {
-      setCardsPerRow(1);
-    } else {
-      setCardsPerRow(2);
+      cardsPerRow = 1;
     }
 
+    setCardsPerRow(cardsPerRow);
+
     if (_Utils.default.isNull(taskSummary)) {
-      (0, _RestUtils.invokeRpc)(rpcConfig, handle, "dashboard", result => {
+      (0, _RestUtils.sendRequest)("".concat(location + _ApplicationManager.default.getContextRoot(), "/bpm/api/v1/summary"), result => {
         if (!_Utils.default.isNull(result)) {
-          setTaskSummary(result.data);
+          setTaskSummary(result);
         }
       }, e => {
         console.error(e); // TODO : Show error message
-      }, null);
+      }, true, true);
     }
 
-    if (_Utils.default.isNull(menuItems) && !_Utils.default.isNull(props.settings.systemProfileDto.modules)) {
-      let dashboardMenuitems = [];
+    (0, _RestUtils.sendRequest)("".concat(location + _ApplicationManager.default.getContextRoot(), "/system/api/v1/user/dashboard/list"), dashboards => {
+      if (!_Utils.default.isNull(dashboards)) {
+        for (const dashboard of dashboards) {
+          userDashboards.push(dashboard);
+        }
 
-      for (let i = 0; i < props.settings.systemProfileDto.modules.length; i++) {
-        let module = props.settings.systemProfileDto.modules[i];
+        setupCardRows(null, cardsPerRow);
+      }
+    }, e => {
+      console.error(e); // TODO : Show error message
+    }, true, true);
+
+    if (_Utils.default.isNull(menuItems) && !_Utils.default.isNull(settings.systemProfileDto.modules)) {
+      let dashboardMenuitems = [];
 
-        if (!_Utils.default.isNull(module.dashBoardMenuBar)) {
-          for (let j = 0; j < module.dashBoardMenuBar.menus.length; j++) {
-            let menu = module.dashBoardMenuBar.menus[j];
+      for (let i = 0; i < settings.systemProfileDto.modules.length; i++) {
+        let module = settings.systemProfileDto.modules[i];
 
-            var _iterator2 = _createForOfIteratorHelper(menu.items),
-                _step2;
+        if (!_Utils.default.isNull(module.dashboardMenu)) {
+          getDashboardMenu(module.dashboardMenu).then(menus => {
+            if (menus) {
+              for (let j = 0; j < menus.length; j++) {
+                let menu = menus[j];
 
-            try {
-              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                const item = _step2.value;
-                dashboardMenuitems.push(item);
+                for (const item of menu.items) {
+                  dashboardMenuitems.push(item);
+                }
               }
-            } catch (err) {
-              _iterator2.e(err);
-            } finally {
-              _iterator2.f();
             }
-          }
+          }).catch(e => {});
         }
       }
 
       setMenuItems(dashboardMenuitems);
     }
 
-    if (!_Utils.default.isNull(props.settings) && !_Utils.default.isNull(userDashboards) && _Utils.default.isNull(cardRows) && !_Utils.default.isNull(cardsPerRow)) {
+    if (!_Utils.default.isNull(settings) && !_Utils.default.isNull(userDashboards) && _Utils.default.isNull(cardRows) && !_Utils.default.isNull(cardsPerRow)) {
       setupCardRows();
     }
-  });
+
+    _ApplicationManager.default.setDashboardView({
+      handle: handle
+    });
+  }, []);
 
   const addDashboardCard = item => {
     let path = item.eventHandlingConfig.subscriptions[0].actions[0].path;
     let settings = {};
     settings.path = path;
     settings.parameters = {};
-    settings.parameters.map = {};
     userDashboards.push(settings);
     setupCardRows();
   };
@@ -419,10 +495,10 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
     style: {
       margin: '4px 0 0 0'
     }
-  }, !_Utils.default.isNull(props.settings) ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "row"
+  }, !_Utils.default.isNull(settings) && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'row'
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*",
+    className: 'col-*-*',
     style: {
       padding: '14px',
       width: '120px'
@@ -432,7 +508,7 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
       fontSize: '24px'
     }
   }, "Dashboard")), /*#__PURE__*/_react.default.createElement("div", {
-    className: "col-*-*"
+    className: 'col-*-*'
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledDropdown, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
     color: "default",
     "data-toggle": "dropdown",
@@ -442,7 +518,7 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
     "aria-haspopup": "true"
   }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
     id: 'ADD'
-  }))), " ", !_Utils.default.isNull(menuItems) ? /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
+  }))), ' ', !_Utils.default.isNull(menuItems) ? /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
     className: "dropdown-navbar",
     right: true,
     tag: "ul"
@@ -454,14 +530,21 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
     onClick: () => {
       addDashboardCard(item);
     }
-  }, item.attributes.label, " "), " "))) : null), " ")), /*#__PURE__*/_react.default.createElement("div", {
+  }, item.attributes.label, ' '), ' '))) : null), ' ')), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       overflowY: 'auto',
       overflowX: 'hidden',
       maxHeight: 'calc(85vh - 4px)',
       padding: '0 4px 64px 0'
     }
-  }, !_Utils.default.isNull(taskSummary) ? /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_AlertBar.default, {
+    config: {
+      id: 'dashboardAlert'
+    },
+    handle: alertBarHandle,
+    ref: /*#__PURE__*/_react.default.createRef(),
+    viewId: '_sys_dashboard'
+  }), !_Utils.default.isNull(taskSummary) && /*#__PURE__*/_react.default.createElement("div", {
     className: 'row',
     style: {
       paddingRight: '16px',
@@ -472,18 +555,18 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
     title: 'Assigned to Me',
     itemCount: taskSummary.personalWorkItemCount,
     viewRef: ref,
-    path: 'workflow/personal-work-items.json'
+    path: '/workflow/personal-work-items.json'
   }), /*#__PURE__*/_react.default.createElement(WorkFlowCard, {
     margin: '0 0 16px 16px',
     title: 'Available',
     itemCount: taskSummary.groupWorkItemCount,
-    path: 'workflow/group-work-items.json'
+    path: '/workflow/group-work-items.json'
   }), /*#__PURE__*/_react.default.createElement(WorkFlowCard, {
     margin: '0 0 16px 16px',
     title: 'Due Today',
     itemCount: taskSummary.dueTodayItemCount,
-    path: 'workflow/due-today-work-items.json'
-  })) : null, /*#__PURE__*/_react.default.createElement("div", null, !_Utils.default.isNull(cardRows) ? cardRows.map(row => /*#__PURE__*/_react.default.createElement("div", {
+    path: '/workflow/due-today-work-items.json'
+  })), /*#__PURE__*/_react.default.createElement("div", null, !_Utils.default.isNull(cardRows) ? cardRows.map(row => /*#__PURE__*/_react.default.createElement("div", {
     className: 'row',
     style: {
       margin: '0 0 16px 0'
@@ -494,9 +577,11 @@ const Dashboard = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.
     index: dashboardCardCounter,
     key: dashboardCardCounter++,
     onDelete: () => {
+      userDashboards.splice(userDashboards.indexOf(userDashboard), 1);
+      console.log("\n\n\n\nUD : ", userDashboards);
       setupCardRows(userDashboard);
     }
-  })))) : null))) : null);
+  })))) : null))));
 }));
 
 var _default = Dashboard;