orc-shared 1.2.0-dev.1 → 1.2.0-dev.5

package/dist/components/Modules.js

@@ -25,6 +25,12 @@ var _modules = require("../actions/modules");
 
 var _settings = require("../selectors/settings");
 
+var _modules2 = require("../selectors/modules");
+
+var _urlPattern = _interopRequireDefault(require("url-pattern"));
+
+var _constants = require("../constants");
+
 var _excluded = ["customPath"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -69,42 +75,50 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
   return a;
 };
 
+var rerouteOnScopeAndModule = function rerouteOnScopeAndModule(history, currentRoute, scope, module) {
+  var params = {
+    scope: scope
+  };
+  var pattern = new _urlPattern.default("/:scope/".concat(module));
+  var href = pattern.stringify(params);
+
+  if (currentRoute !== href) {
+    history.push(href);
+  }
+};
+
 var Module = (0, _withErrorBoundary.default)("Module")(__signature__(__signature__(function (_ref) {
-  var config = _ref.config,
+  var id = _ref.id,
+      config = _ref.config,
       path = _ref.path,
       error = _ref.error,
       location = _ref.location,
       match = _ref.match,
       modulePrependPath = _ref.modulePrependPath;
-  var currentRoute = (0, _reactRedux.useSelector)(_navigation.selectRouteHref);
   var history = (0, _reactRouterDom.useHistory)();
-
-  var hideSelector = function hideSelector(state) {
-    var _config$hide;
-
-    return typeof config.hide === "function" ? config.hide(state) : (_config$hide = config.hide) != null ? _config$hide : false;
-  };
-
-  var isHidden = (0, _reactRedux.useSelector)(hideSelector);
+  var scope = (0, _reactRedux.useSelector)(_navigation.getCurrentScopeFromRoute);
+  var currentRoute = (0, _reactRedux.useSelector)(_navigation.selectRouteHref);
+  var moduleInfo = (0, _reactRedux.useSelector)(_modules2.getScopeModuleInformationSelector);
+  var isVisible = moduleInfo.scope != null && moduleInfo.visibleModules.length > 0 && moduleInfo.visibleModules.includes(id);
 
   _react.default.useEffect(function () {
-    if (isHidden === true && currentRoute.includes(match.url)) {
-      history.push("/");
-    } // eslint-disable-next-line react-hooks/exhaustive-deps
-
-  }, [isHidden, currentRoute, match.url]);
+    if (moduleInfo.scope != null && scope === moduleInfo.scope && moduleInfo.visibleModules.length > 0 && !isVisible) {
+      rerouteOnScopeAndModule(history, currentRoute, moduleInfo.scope, moduleInfo.visibleModules[0]);
+    }
+  }, [history, scope, isVisible, currentRoute, moduleInfo.scope, moduleInfo.visibleModules]);
 
   return /*#__PURE__*/_react.default.createElement(_FullPage.default, {
     path: path,
     config: config,
     location: location,
     match: match,
-    modulePrependPath: modulePrependPath
+    modulePrependPath: modulePrependPath,
+    isVisible: isVisible
   });
-}, "useSelector{currentRoute}\nuseHistory{history}\nuseSelector{isHidden}\nuseEffect{}", function () {
-  return [_reactRedux.useSelector, _reactRouterDom.useHistory, _reactRedux.useSelector];
-}), "useSelector{currentRoute}\nuseHistory{history}\nuseSelector{isHidden}\nuseEffect{}", function () {
-  return [_reactRedux.useSelector, _reactRouterDom.useHistory, _reactRedux.useSelector];
+}, "useHistory{history}\nuseSelector{scope}\nuseSelector{currentRoute}\nuseSelector{moduleInfo}\nuseEffect{}", function () {
+  return [_reactRouterDom.useHistory, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
+}), "useHistory{history}\nuseSelector{scope}\nuseSelector{currentRoute}\nuseSelector{moduleInfo}\nuseEffect{}", function () {
+  return [_reactRouterDom.useHistory, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
 }));
 exports.Module = Module;
 
@@ -112,26 +126,76 @@ var getHrefFromPath = function getHrefFromPath(path, scope) {
   return path.replace(":scope", scope);
 };
 
-var Modules = function Modules(_ref2) {
-  var modules = _ref2.modules,
-      _ref2$pathConfig = _ref2.pathConfig;
-  _ref2$pathConfig = _ref2$pathConfig === void 0 ? {} : _ref2$pathConfig;
+var CheckModuleVisibility = function CheckModuleVisibility(_ref2) {
+  var _moduleInfo$scope;
+
+  var id = _ref2.id,
+      config = _ref2.config,
+      moduleInfo = _ref2.moduleInfo;
+  var dispatch = (0, _reactRedux.useDispatch)();
+  var applicationModules = (0, _reactRedux.useSelector)(_settings.getApplicationModulesSelector);
+  var scopeFromRoute = (0, _reactRedux.useSelector)(_navigation.getCurrentScopeFromRoute);
+
+  var hideSelector = function hideSelector(state) {
+    return typeof config.hide === "function" ? config.hide(state) : function () {
+      var _config$hide;
+
+      return (_config$hide = config.hide) != null ? _config$hide : false;
+    };
+  };
+
+  var isHidden = (0, _reactRedux.useSelector)(hideSelector((_moduleInfo$scope = moduleInfo.scope) != null ? _moduleInfo$scope : scopeFromRoute));
+  var moduleScope = moduleInfo.scope;
+  var moduleIsVisible = isHidden === false && !moduleInfo.visibleModules.includes(id);
+
+  _react.default.useEffect(function () {
+    // We need to wait for the ROUTE to be set the first time in the Redux/Store before to set module's visibility
+    if (scopeFromRoute !== null || applicationModules.includes(_constants.overtureModule.System)) {
+      if (moduleScope == null) {
+        dispatch((0, _modules.initializeFirstModuleScope)(scopeFromRoute));
+      }
+
+      if (moduleIsVisible) {
+        dispatch((0, _modules.setModuleAsVisible)(id));
+      }
+    }
+  }, [moduleScope, moduleIsVisible, dispatch, id, scopeFromRoute, applicationModules]);
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+};
+
+__signature__(CheckModuleVisibility, "useDispatch{dispatch}\nuseSelector{applicationModules}\nuseSelector{scopeFromRoute}\nuseSelector{isHidden}\nuseEffect{}", function () {
+  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
+});
+
+__signature__(CheckModuleVisibility, "useDispatch{dispatch}\nuseSelector{applicationModules}\nuseSelector{scopeFromRoute}\nuseSelector{isHidden}\nuseEffect{}", function () {
+  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
+});
 
-  var customPath = _ref2$pathConfig.customPath,
-      otherConfigs = _objectWithoutProperties(_ref2$pathConfig, _excluded);
+var Modules = function Modules(_ref3) {
+  var modules = _ref3.modules,
+      _ref3$pathConfig = _ref3.pathConfig;
+  _ref3$pathConfig = _ref3$pathConfig === void 0 ? {} : _ref3$pathConfig;
+
+  var customPath = _ref3$pathConfig.customPath,
+      otherConfigs = _objectWithoutProperties(_ref3$pathConfig, _excluded);
 
   var dispatch = (0, _reactRedux.useDispatch)();
-  var scope = (0, _reactRedux.useSelector)(_navigation.getCurrentScope);
+  var currentScope = (0, _reactRedux.useSelector)(_navigation.getCurrentScope);
   var isAuthorizedScope = (0, _reactRedux.useSelector)(_scope.isCurrentScopeAuthorizedSelector);
   var defaultScope = (0, _reactRedux.useSelector)(_settings.defaultScopeSelector);
   var history = (0, _reactRouterDom.useHistory)();
   var location = (0, _reactRouterDom.useLocation)();
+  var currentRoute = (0, _reactRedux.useSelector)(_navigation.selectRouteHref);
+  var moduleInfo = (0, _reactRedux.useSelector)(_modules2.getScopeModuleInformationSelector);
+  var firstModuleName = Object.keys(modules)[0];
+  var destinationModule = moduleInfo.routingPerformed === false && moduleInfo.scope != null && moduleInfo.visibleModules.length > 0 && moduleInfo.moduleName != null ? moduleInfo.visibleModules.includes(moduleInfo.moduleName) ? moduleInfo.moduleName : moduleInfo.visibleModules[0] : null;
   var scopePath = "/:scope/";
   var prependPath = customPath || scopePath;
-  var prependHref = getHrefFromPath(prependPath, scope);
+  var prependHref = getHrefFromPath(prependPath, currentScope);
   Object.keys(otherConfigs).forEach(function (key) {
     var moduleConfig = otherConfigs[key];
-    moduleConfig.prependHref = getHrefFromPath(moduleConfig.prependPath, scope);
+    moduleConfig.prependHref = getHrefFromPath(moduleConfig.prependPath, currentScope);
   });
   (0, _react.useEffect)(function () {
     dispatch((0, _navigation2.setHrefConfig)(prependPath, prependHref, otherConfigs));
@@ -144,27 +208,43 @@ var Modules = function Modules(_ref2) {
     };
   };
 
-  var firstModuleName = Object.keys(modules)[0];
   (0, _react.useEffect)(function () {
     var pathname = location.pathname,
         search = location.search;
 
-    if (!isAuthorizedScope && pathname.includes(scope) && defaultScope) {
-      history.push(pathname.replace(scope, defaultScope) + search);
+    if (!isAuthorizedScope && pathname.includes(currentScope) && defaultScope) {
+      history.push(pathname.replace(currentScope, defaultScope) + search);
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [isAuthorizedScope, defaultScope, history, scope]);
+  }, [isAuthorizedScope, defaultScope, history, currentScope]);
 
   _react.default.useEffect(function () {
     dispatch((0, _modules.setModulesStructure)(modules));
   }, [dispatch, modules]);
 
+  (0, _react.useEffect)(function () {
+    if (destinationModule != null) {
+      rerouteOnScopeAndModule(history, currentRoute, moduleInfo.scope, destinationModule);
+      dispatch((0, _modules.setRoutingPerformed)());
+    }
+  }, [dispatch, history, moduleInfo.scope, destinationModule, currentRoute]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Navigation.default, {
     modules: modules
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Switch, null, Object.entries(modules).map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        name = _ref4[0],
-        module = _ref4[1];
+  }), Object.entries(modules).map(function (_ref4) {
+    var _ref5 = _slicedToArray(_ref4, 2),
+        name = _ref5[0],
+        module = _ref5[1];
+
+    return /*#__PURE__*/_react.default.createElement(CheckModuleVisibility, {
+      key: name,
+      id: name,
+      config: module,
+      moduleInfo: moduleInfo
+    });
+  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Switch, null, Object.entries(modules).map(function (_ref6) {
+    var _ref7 = _slicedToArray(_ref6, 2),
+        name = _ref7[0],
+        module = _ref7[1];
 
     var moduleConfig = getModuleConfig(name);
     var path = "".concat(moduleConfig.prependPath).concat(name);
@@ -173,6 +253,7 @@ var Modules = function Modules(_ref2) {
       path: path,
       render: function render(route) {
         return /*#__PURE__*/_react.default.createElement(Module, _extends({
+          id: name,
           modulePrependPath: moduleConfig.prependPath,
           config: module,
           path: path
@@ -186,12 +267,12 @@ var Modules = function Modules(_ref2) {
 
 exports.Modules = Modules;
 
-__signature__(Modules, "useDispatch{dispatch}\nuseSelector{scope}\nuseSelector{isAuthorizedScope}\nuseSelector{defaultScope}\nuseHistory{history}\nuseLocation{location}\nuseEffect{}\nuseEffect{}\nuseEffect{}", function () {
-  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRouterDom.useHistory, _reactRouterDom.useLocation];
+__signature__(Modules, "useDispatch{dispatch}\nuseSelector{currentScope}\nuseSelector{isAuthorizedScope}\nuseSelector{defaultScope}\nuseHistory{history}\nuseLocation{location}\nuseSelector{currentRoute}\nuseSelector{moduleInfo}\nuseEffect{}\nuseEffect{}\nuseEffect{}\nuseEffect{}", function () {
+  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRouterDom.useHistory, _reactRouterDom.useLocation, _reactRedux.useSelector, _reactRedux.useSelector];
 });
 
-__signature__(Modules, "useDispatch{dispatch}\nuseSelector{scope}\nuseSelector{isAuthorizedScope}\nuseSelector{defaultScope}\nuseHistory{history}\nuseLocation{location}\nuseEffect{}\nuseEffect{}\nuseEffect{}", function () {
-  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRouterDom.useHistory, _reactRouterDom.useLocation];
+__signature__(Modules, "useDispatch{dispatch}\nuseSelector{currentScope}\nuseSelector{isAuthorizedScope}\nuseSelector{defaultScope}\nuseHistory{history}\nuseLocation{location}\nuseSelector{currentRoute}\nuseSelector{moduleInfo}\nuseEffect{}\nuseEffect{}\nuseEffect{}\nuseEffect{}", function () {
+  return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRouterDom.useHistory, _reactRouterDom.useLocation, _reactRedux.useSelector, _reactRedux.useSelector];
 });
 
 var _default = Modules;
@@ -207,8 +288,10 @@ exports.default = _default3;
     return;
   }
 
+  reactHotLoader.register(rerouteOnScopeAndModule, "rerouteOnScopeAndModule", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(Module, "Module", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(getHrefFromPath, "getHrefFromPath", "/home/vsts/work/1/s/src/components/Modules.js");
+  reactHotLoader.register(CheckModuleVisibility, "CheckModuleVisibility", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(Modules, "Modules", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/Modules.js");
 })();
@@ -229,8 +312,10 @@ exports.default = _default3;
     return;
   }
 
+  reactHotLoader.register(rerouteOnScopeAndModule, "rerouteOnScopeAndModule", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(Module, "Module", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(getHrefFromPath, "getHrefFromPath", "/home/vsts/work/1/s/src/components/Modules.js");
+  reactHotLoader.register(CheckModuleVisibility, "CheckModuleVisibility", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(Modules, "Modules", "/home/vsts/work/1/s/src/components/Modules.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/Modules.js");
 })();

package/dist/components/MultiSelector.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.MultiSelector = exports.SelectedValue = void 0;
+exports.default = exports.SelectedValue = exports.MultiSelector = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 

package/dist/components/Navigation/Bar.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.MenuButton = exports.StyledMenu = exports.useTabScroll = exports.ScrollableBar = exports.InnerBar = exports.TabBar = void 0;
+exports.useTabScroll = exports.default = exports.TabBar = exports.StyledMenu = exports.ScrollableBar = exports.MenuButton = exports.InnerBar = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 

package/dist/components/Navigation/Tab.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.CloseIcon = exports.TabText = exports.ModuleIcon = exports.TabLink = exports.ModuleTab = exports.PageTab = void 0;
+exports.default = exports.TabText = exports.TabLink = exports.PageTab = exports.ModuleTab = exports.ModuleIcon = exports.CloseIcon = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 

package/dist/components/Navigation/useNavigationState.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.useNavigationState = exports.getPageData = void 0;
+exports.useNavigationState = exports.getPageData = exports.default = void 0;
 
 var _reactRedux = require("react-redux");
 

package/dist/components/Placeholder.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.PlaceholderSubtitle = exports.PlaceholderTitle = exports.PlaceholderIcon = exports.PlaceholderBox = void 0;
+exports.default = exports.PlaceholderTitle = exports.PlaceholderSubtitle = exports.PlaceholderIcon = exports.PlaceholderBox = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Routing/FullPage.js

@@ -34,7 +34,8 @@ var FullPage = function FullPage(_ref) {
       config = _ref.config,
       location = _ref.location,
       match = _ref.match,
-      modulePrependPath = _ref.modulePrependPath;
+      modulePrependPath = _ref.modulePrependPath,
+      isVisible = _ref.isVisible;
   var component = config.component,
       componentProps = config.componentProps,
       _config$pages = config.pages,
@@ -63,6 +64,7 @@ var FullPage = function FullPage(_ref) {
     subpages: subpages,
     location: location,
     match: match,
+    isVisible: isVisible,
     modulePrependPath: modulePrependPath
   });
 };

package/dist/components/Routing/Page.js

@@ -60,10 +60,12 @@ var Page = function Page(_ref) {
       pages = _ref$pages === void 0 ? {} : _ref$pages,
       _ref$subpages = _ref.subpages,
       subpages = _ref$subpages === void 0 ? {} : _ref$subpages,
-      modulePrependPath = _ref.modulePrependPath;
+      modulePrependPath = _ref.modulePrependPath,
+      _ref$isVisible = _ref.isVisible,
+      isVisible = _ref$isVisible === void 0 ? true : _ref$isVisible;
   var WrappedView = (0, _react.useMemo)(function () {
-    return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(View));
-  }, [path, View]);
+    return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(View, isVisible));
+  }, [path, View, isVisible]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactRouter.Switch, null, Object.entries(pages).map(function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         subpath = _ref3[0],

package/dist/components/Routing/Segment.js

@@ -43,7 +43,7 @@ var Segment = function Segment(_ref) {
       componentProps = config.componentProps;
   var path = location.pathname;
   var View = (0, _react.useMemo)(function () {
-    return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(component, componentProps));
+    return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(component, true, componentProps));
   }, [path, component, componentProps]);
   return /*#__PURE__*/_react.default.createElement(View, {
     location: location,

package/dist/components/Routing/SegmentPage.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.SegmentItem = exports.Item = exports.List = exports.Wrapper = void 0;
+exports.default = exports.Wrapper = exports.SegmentItem = exports.List = exports.Item = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Routing/withWaypointing.js

@@ -41,7 +41,11 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
   return a;
 };
 
-var withWaypointing = function withWaypointing(Comp, componentProps) {
+var withWaypointing = function withWaypointing(Comp, isVisible, componentProps) {
+  if (isVisible === void 0) {
+    isVisible = true;
+  }
+
   if (componentProps === void 0) {
     componentProps = {};
   }
@@ -72,7 +76,7 @@ var withWaypointing = function withWaypointing(Comp, componentProps) {
     };
 
     (0, _useLoader.default)(loadActions, cutout);
-    return /*#__PURE__*/_react.default.createElement(Comp, _extends({}, props, componentProps));
+    return isVisible ? /*#__PURE__*/_react.default.createElement(Comp, _extends({}, props, componentProps)) : null;
   }, "useLocation{location}\nuseLoader{}", function () {
     return [_reactRouterDom.useLocation, _useLoader.default];
   }), "useLocation{location}\nuseLoader{}", function () {

package/dist/components/Scope/ScopeNode.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.ScopeNode = exports.ContentLabel = exports.ScopeText = exports.ScopeIcon = void 0;
+exports.default = exports.ScopeText = exports.ScopeNode = exports.ScopeIcon = exports.ContentLabel = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Scope/Selector.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Selector = exports.SelectorPanel = exports.SearchInput = exports.InputBox = exports.Wrapper = void 0;
+exports.default = exports.Wrapper = exports.SelectorPanel = exports.Selector = exports.SearchInput = exports.InputBox = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Scope/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Scope = exports.SCOPE_SELECTOR_NAME = exports.ScopeBar = exports.Bar = void 0;
+exports.default = exports.ScopeBar = exports.Scope = exports.SCOPE_SELECTOR_NAME = exports.Bar = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 

package/dist/components/Scope/useScopeConfirmationModalState.js

@@ -19,9 +19,7 @@ var _view = require("../../selectors/view");
 
 var _constants = require("../../constants");
 
-var _reactRouterDom = require("react-router-dom");
-
-var _urlPattern = _interopRequireDefault(require("url-pattern"));
+var _modules = require("../../actions/modules");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -112,28 +110,21 @@ var ExecuteClosingTabHandlerActions = /*#__PURE__*/function () {
 
 var useApplicationScopeChanger = function useApplicationScopeChanger(closingTabHandlerActions) {
   var dispatch = (0, _reactRedux.useDispatch)();
-  var history = (0, _reactRouterDom.useHistory)();
   var moduleName = (0, _useSelectorAndUnwrap.default)(_navigation.selectCurrentModuleName);
   return function (previousScope, newScope) {
-    var params = {
-      scope: newScope
-    }; // did not find a more reliable way to get the URL for the first tab of the module
-
-    var pattern = new _urlPattern.default("/:scope/".concat(moduleName));
-    var href = pattern.stringify(params);
-    history.push(href);
     ExecuteClosingTabHandlerActions(closingTabHandlerActions).then(function () {
-      return dispatch((0, _scopes.applicationScopeHasChanged)(previousScope, newScope));
+      dispatch((0, _modules.setNewScopeAndModuleName)(newScope, moduleName));
+      dispatch((0, _scopes.applicationScopeHasChanged)(previousScope, newScope));
     });
   };
 };
 
-__signature__(useApplicationScopeChanger, "useDispatch{dispatch}\nuseHistory{history}\nuseSelectorAndUnwrap{moduleName}", function () {
-  return [_reactRedux.useDispatch, _reactRouterDom.useHistory, _useSelectorAndUnwrap.default];
+__signature__(useApplicationScopeChanger, "useDispatch{dispatch}\nuseSelectorAndUnwrap{moduleName}", function () {
+  return [_reactRedux.useDispatch, _useSelectorAndUnwrap.default];
 });
 
-__signature__(useApplicationScopeChanger, "useDispatch{dispatch}\nuseHistory{history}\nuseSelectorAndUnwrap{moduleName}", function () {
-  return [_reactRedux.useDispatch, _reactRouterDom.useHistory, _useSelectorAndUnwrap.default];
+__signature__(useApplicationScopeChanger, "useDispatch{dispatch}\nuseSelectorAndUnwrap{moduleName}", function () {
+  return [_reactRedux.useDispatch, _useSelectorAndUnwrap.default];
 });
 
 var useScopeConfirmationModalState = function useScopeConfirmationModalState() {

package/dist/components/Scope/useScopeData.js

@@ -5,16 +5,10 @@ exports.default = void 0;
 
 var _reactRedux = require("react-redux");
 
-var _useLoader = _interopRequireDefault(require("../../hooks/useLoader"));
-
 var _utils = require("../../utils");
 
 var _scope = require("../../selectors/scope");
 
-var _scopes = require("../../actions/scopes");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
@@ -47,19 +41,16 @@ var buildDefaultNodeState = function buildDefaultNodeState(current, getScope) {
 var useScopeData = function useScopeData() {
   var currentScope = (0, _utils.unwrapImmutable)((0, _reactRedux.useSelector)(_scope.currentScopeSelector));
   var getScope = (0, _reactRedux.useSelector)(_scope.scopeGetter);
-  (0, _useLoader.default)((0, _scopes.getScopes)(), function () {
-    return currentScope.name;
-  });
   var defaultNodeState = buildDefaultNodeState(currentScope, getScope);
   return [currentScope, defaultNodeState, getScope];
 };
 
-__signature__(useScopeData, "useSelector{}\nuseSelector{getScope}\nuseLoader{}", function () {
-  return [_reactRedux.useSelector, _reactRedux.useSelector, _useLoader.default];
+__signature__(useScopeData, "useSelector{}\nuseSelector{getScope}", function () {
+  return [_reactRedux.useSelector, _reactRedux.useSelector];
 });
 
-__signature__(useScopeData, "useSelector{}\nuseSelector{getScope}\nuseLoader{}", function () {
-  return [_reactRedux.useSelector, _reactRedux.useSelector, _useLoader.default];
+__signature__(useScopeData, "useSelector{}\nuseSelector{getScope}", function () {
+  return [_reactRedux.useSelector, _reactRedux.useSelector];
 });
 
 var _default = useScopeData;

package/dist/components/Scope/useScopeSelect.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.useScopeSelect = void 0;
+exports.useScopeSelect = exports.default = void 0;
 
 var _reactRedux = require("react-redux");
 

package/dist/components/Selector.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Selector = exports.Placeholder = exports.Option = exports.Dropdown = exports.SelectedValue = exports.SelectBox = exports.Wrapper = exports.InnerSelect = void 0;
+exports.default = exports.Wrapper = exports.Selector = exports.SelectedValue = exports.SelectBox = exports.Placeholder = exports.Option = exports.InnerSelect = exports.Dropdown = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 

package/dist/components/Spritesheet.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.IconBlock = exports.Wrapper = void 0;
+exports.default = exports.Wrapper = exports.IconBlock = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Switch.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Switch = exports.ContainedCheckbox = exports.Caption = exports.Wrapper = void 0;
+exports.default = exports.Wrapper = exports.Switch = exports.ContainedCheckbox = exports.Caption = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Text.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.ptLabel = exports.Placeholder = void 0;
+exports.ptLabel = exports.default = exports.Placeholder = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/ToastList.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.ToastList = exports.Toast = exports.CloseIcon = exports.ToastIcon = exports.ToastBox = void 0;
+exports.default = exports.ToastList = exports.ToastIcon = exports.ToastBox = exports.Toast = exports.CloseIcon = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Toolbar.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Toolbar = exports.toolComponents = exports.ToolbarLabel = exports.Spacer = exports.Separator = exports.ToolbarRadio = exports.ToolbarRadioWrapper = exports.ToolbarInput = exports.ToolbarButton = exports.ToolGroup = exports.Bar = void 0;
+exports.toolComponents = exports.default = exports.ToolbarRadioWrapper = exports.ToolbarRadio = exports.ToolbarLabel = exports.ToolbarInput = exports.ToolbarButton = exports.Toolbar = exports.ToolGroup = exports.Spacer = exports.Separator = exports.Bar = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Treeview/Label.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.Label = exports.NonIndicator = exports.BeforeIndicator = exports.Indicator = void 0;
+exports.NonIndicator = exports.Label = exports.Indicator = exports.BeforeIndicator = void 0;
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 

package/dist/components/Treeview/Leaf.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.Leaf = exports.Root = void 0;
+exports.Root = exports.Leaf = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 

package/dist/components/Treeview/Node.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.Node = exports.RootNode = exports.LeafNode = exports.TreeContext = void 0;
+exports.default = exports.TreeContext = exports.RootNode = exports.Node = exports.LeafNode = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/dist/components/Treeview/settings.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.branchHeight = exports.branchLength = exports.branchIndent = void 0;
+exports.branchLength = exports.branchIndent = exports.branchHeight = void 0;
 
 var _utils = require("../../utils");