orc-shared 1.5.0-dev.13 → 1.5.0-dev.15

package/dist/actions/navigation.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.setRoute = exports.setHrefConfig = exports.setCurrentPrependPath = exports.setClosingTabHandlerActions = exports.removeTab = exports.mapHref = exports.SET_ROUTE = exports.SET_HREF_CONFIG = exports.SET_CURRENT_PREPEND_PATH = exports.SET_CLOSING_TAB_HANDLER_ACTIONS = exports.REMOVE_TAB = exports.MAP_HREF = void 0;
+exports.setRoute = exports.setHrefConfig = exports.setCurrentPrependPath = exports.setClosingTabHandlerActions = exports.removeTab = exports.removeModuleTabs = exports.mapHref = exports.SET_ROUTE = exports.SET_HREF_CONFIG = exports.SET_CURRENT_PREPEND_PATH = exports.SET_CLOSING_TAB_HANDLER_ACTIONS = exports.REMOVE_TAB = exports.REMOVE_MODULE_TABS = exports.MAP_HREF = void 0;
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
@@ -57,6 +57,17 @@ var removeTab = function removeTab(module, path) {
   };
 };
 exports.removeTab = removeTab;
+var REMOVE_MODULE_TABS = "REMOVE_MODULE_TABS";
+exports.REMOVE_MODULE_TABS = REMOVE_MODULE_TABS;
+var removeModuleTabs = function removeModuleTabs(module) {
+  return {
+    type: REMOVE_MODULE_TABS,
+    payload: {
+      module: module
+    }
+  };
+};
+exports.removeModuleTabs = removeModuleTabs;
 var SET_HREF_CONFIG = "SET_HREF_CONFIG";
 exports.SET_HREF_CONFIG = SET_HREF_CONFIG;
 var setHrefConfig = function setHrefConfig(prependPath, prependHref, otherConfigs) {
@@ -105,6 +116,8 @@ exports.setClosingTabHandlerActions = setClosingTabHandlerActions;
   reactHotLoader.register(mapHref, "mapHref", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(REMOVE_TAB, "REMOVE_TAB", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(removeTab, "removeTab", "/home/vsts/work/1/s/src/actions/navigation.js");
+  reactHotLoader.register(REMOVE_MODULE_TABS, "REMOVE_MODULE_TABS", "/home/vsts/work/1/s/src/actions/navigation.js");
+  reactHotLoader.register(removeModuleTabs, "removeModuleTabs", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(SET_HREF_CONFIG, "SET_HREF_CONFIG", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(setHrefConfig, "setHrefConfig", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(SET_CURRENT_PREPEND_PATH, "SET_CURRENT_PREPEND_PATH", "/home/vsts/work/1/s/src/actions/navigation.js");
@@ -129,6 +142,8 @@ exports.setClosingTabHandlerActions = setClosingTabHandlerActions;
   reactHotLoader.register(mapHref, "mapHref", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(REMOVE_TAB, "REMOVE_TAB", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(removeTab, "removeTab", "/home/vsts/work/1/s/src/actions/navigation.js");
+  reactHotLoader.register(REMOVE_MODULE_TABS, "REMOVE_MODULE_TABS", "/home/vsts/work/1/s/src/actions/navigation.js");
+  reactHotLoader.register(removeModuleTabs, "removeModuleTabs", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(SET_HREF_CONFIG, "SET_HREF_CONFIG", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(setHrefConfig, "setHrefConfig", "/home/vsts/work/1/s/src/actions/navigation.js");
   reactHotLoader.register(SET_CURRENT_PREPEND_PATH, "SET_CURRENT_PREPEND_PATH", "/home/vsts/work/1/s/src/actions/navigation.js");

package/dist/components/MaterialUI/hocs/withDeferredTooltip.js

@@ -5,7 +5,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
 var _propertyValidator = require("../../../utils/propertyValidator");
-var _excluded = ["titleValue", "alwaysDisplay"];
+var _excluded = ["titleValue", "alwaysDisplay", "tooltipClasses"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
@@ -39,6 +39,7 @@ var withDeferredTooltip = function withDeferredTooltip(Comp) {
   return __signature__(__signature__(function (_ref) {
     var titleValue = _ref.titleValue,
       alwaysDisplay = _ref.alwaysDisplay,
+      tooltipClasses = _ref.tooltipClasses,
       props = _objectWithoutProperties(_ref, _excluded);
     var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -62,6 +63,7 @@ var withDeferredTooltip = function withDeferredTooltip(Comp) {
     if (shouldBeTooltipped === false) return defaultComponent;
     return /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
       arrow: true,
+      classes: tooltipClasses != null ? tooltipClasses : null,
       title: titleValue,
       disableHoverListener: false,
       disableFocusListener: true,

package/dist/reducers/navigation.js

@@ -83,6 +83,22 @@ var navigationReducer = function navigationReducer(state, action) {
           s.deleteIn(["tabIndex", remainingSection]);
         }
       });
+    case _navigation.REMOVE_MODULE_TABS:
+      return state.withMutations(function (s) {
+        var module = action.payload.module;
+        s.deleteIn(["moduleTabs", module]);
+        s.deleteIn(["closingTabsHandlerActions", module]);
+        s.get("tabIndex").keySeq().forEach(function (key) {
+          if (key.startsWith(module)) {
+            s.deleteIn(["tabIndex", key]);
+          }
+        });
+        s.get("mappedHrefs").keySeq().forEach(function (key) {
+          if (key.startsWith(module)) {
+            s.deleteIn(["mappedHrefs", key]);
+          }
+        });
+      });
     case _navigation.SET_HREF_CONFIG:
       return state.set("config", _immutable.default.fromJS(action.payload));
     case _navigation.SET_CURRENT_PREPEND_PATH:

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.5.0-dev.13",
+	"version": "1.5.0-dev.15",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/actions/navigation.js

@@ -25,6 +25,13 @@ export const removeTab = (module, path) => ({
 	payload: { module, path },
 });
 
+export const REMOVE_MODULE_TABS = "REMOVE_MODULE_TABS";
+
+export const removeModuleTabs = module => ({
+	type: REMOVE_MODULE_TABS,
+	payload: { module },
+});
+
 export const SET_HREF_CONFIG = "SET_HREF_CONFIG";
 
 export const setHrefConfig = (prependPath, prependHref, otherConfigs = {}) => ({

package/src/actions/navigation.test.js

@@ -5,6 +5,8 @@ import {
 	SET_HREF_CONFIG,
 	setClosingTabHandlerActions,
 	SET_CLOSING_TAB_HANDLER_ACTIONS,
+	removeModuleTabs,
+	REMOVE_MODULE_TABS,
 } from "./navigation";
 
 describe("removeTab", () => {
@@ -18,6 +20,16 @@ describe("removeTab", () => {
 		}));
 });
 
+describe("removeModuleTabs", () => {
+	it("creates a remove module tabs action", () =>
+		expect(removeModuleTabs, "when called with", ["module"], "to equal", {
+			type: REMOVE_MODULE_TABS,
+			payload: {
+				module: "module",
+			},
+		}));
+});
+
 describe("setHrefConfig", () => {
 	it("set href config action", () =>
 		expect(setHrefConfig, "when called with", ["/:scope/", "/scope/"], "to equal", {

package/src/components/MaterialUI/hocs/withDeferredTooltip.js

@@ -8,7 +8,7 @@ import { isString, isObject, isStringNullOrWhitespace, isReactComponent } from "
 
 const withDeferredTooltip =
 	Comp =>
-	({ titleValue, alwaysDisplay, ...props }) => {
+	({ titleValue, alwaysDisplay, tooltipClasses, ...props }) => {
 		const [shouldBeTooltipped, setShouldBeTooltipped] = useState(false);
 
 		const defaultComponent = <Comp onMouseEnter={event => makeComponentTooltipped(event)} {...props} />;
@@ -32,6 +32,7 @@ const withDeferredTooltip =
 		return (
 			<MuiTooltip
 				arrow
+				classes={tooltipClasses ?? null}
 				title={titleValue}
 				disableHoverListener={false}
 				disableFocusListener={true}

package/src/components/MaterialUI/hocs/withDeferredTooltip.test.js

@@ -155,4 +155,56 @@ describe("withDeferredTooltip", () => {
 
 		expect(wrapper.prop("onMouseEnter"), "to be", undefined);
 	});
+
+	it("Always displays passed title in tooltip with tooltip classes when specified", () => {
+		const Wrapper = props => <ComponentToBeTooltipped {...props} />;
+
+		const TooltippedCompponent = withDeferredTooltip(Wrapper);
+
+		const mountedTooltippedComponent = shallow(
+			<TooltippedCompponent alwaysDisplay titleValue="test" tooltipClasses={{ classTest: "testMyMojo" }} />,
+		);
+
+		const event = {
+			target: {
+				offsetWidth: 100,
+				scrollWidth: 100,
+			},
+		};
+
+		mountedTooltippedComponent.find(Wrapper).invoke("onMouseEnter")(event);
+
+		let expected = (
+			<MuiTooltip title="test" classes={{ classTest: "testMyMojo" }}>
+				<Wrapper />
+			</MuiTooltip>
+		);
+
+		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
+	});
+
+	it("Always displays passed title in tooltip without tooltip classes when not specified", () => {
+		const Wrapper = props => <ComponentToBeTooltipped {...props} />;
+
+		const TooltippedCompponent = withDeferredTooltip(Wrapper);
+
+		const mountedTooltippedComponent = shallow(<TooltippedCompponent alwaysDisplay titleValue="test" />);
+
+		const event = {
+			target: {
+				offsetWidth: 100,
+				scrollWidth: 100,
+			},
+		};
+
+		mountedTooltippedComponent.find(Wrapper).invoke("onMouseEnter")(event);
+
+		let expected = (
+			<MuiTooltip title="test" classes={null}>
+				<Wrapper />
+			</MuiTooltip>
+		);
+
+		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
+	});
 });

package/src/reducers/navigation.js

@@ -6,6 +6,7 @@ import {
 	SET_HREF_CONFIG,
 	SET_CURRENT_PREPEND_PATH,
 	SET_CLOSING_TAB_HANDLER_ACTIONS,
+	REMOVE_MODULE_TABS,
 } from "../actions/navigation";
 import { getAllAfterPrependHref } from "../utils/parseHelper";
 import { APPLICATION_SCOPE_HAS_CHANGED } from "../actions/scopes";
@@ -73,6 +74,29 @@ const navigationReducer = (state = initialState, action) => {
 					s.deleteIn(["tabIndex", remainingSection]);
 				}
 			});
+		case REMOVE_MODULE_TABS:
+			return state.withMutations(s => {
+				const { module } = action.payload;
+
+				s.deleteIn(["moduleTabs", module]);
+				s.deleteIn(["closingTabsHandlerActions", module]);
+
+				s.get("tabIndex")
+					.keySeq()
+					.forEach(key => {
+						if (key.startsWith(module)) {
+							s.deleteIn(["tabIndex", key]);
+						}
+					});
+
+				s.get("mappedHrefs")
+					.keySeq()
+					.forEach(key => {
+						if (key.startsWith(module)) {
+							s.deleteIn(["mappedHrefs", key]);
+						}
+					});
+			});
 		case SET_HREF_CONFIG:
 			return state.set("config", Immutable.fromJS(action.payload));
 		case SET_CURRENT_PREPEND_PATH:

package/src/reducers/navigation.test.js

@@ -6,6 +6,7 @@ import {
 	setHrefConfig,
 	setCurrentPrependPath,
 	setClosingTabHandlerActions,
+	removeModuleTabs,
 } from "../actions/navigation";
 import reducer from "./navigation";
 import { applicationScopeHasChanged } from "../actions/scopes";
@@ -295,6 +296,43 @@ describe("Navigation reducer", () => {
 		});
 	});
 
+	describe("REMOVE_MODULE_TABS", () => {
+		it("can remove module tabs", () => {
+			const oldState = Immutable.fromJS({
+				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
+				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
+				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
+				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
+				config: { prependPath: "/:scope/" },
+			});
+			const action = removeModuleTabs("test");
+			const newState = reducer(oldState, action);
+			return expect(newState, "not to be", oldState).and(
+				"to equal",
+				Immutable.fromJS({
+					moduleTabs: { another: [1, 2, 3] },
+					closingTabsHandlerActions: { another: [] },
+					tabIndex: { another: {} },
+					mappedHrefs: { another2: {} },
+					config: { prependPath: "/:scope/" },
+				}),
+			);
+		});
+
+		it("does nothing if the module to remove is not found", () => {
+			const oldState = Immutable.fromJS({
+				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
+				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
+				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
+				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
+				config: { prependPath: "/:scope/" },
+			});
+			const action = removeModuleTabs("unknown");
+			const newState = reducer(oldState, action);
+			return expect(newState, "to be", oldState);
+		});
+	});
+
 	describe("SET_HREF_CONFIG", () => {
 		it("update href config in navigation state", () => {
 			const oldState = Immutable.fromJS({