orc-shared 5.10.2 → 5.99.0-dev.10

package/src/components/MaterialUI/Navigation/DropDownMenu.test.js

@@ -1,5 +1,4 @@
 import React from "react";
-import { Provider } from "react-redux";
 import ReactDOM from "react-dom";
 import sinon from "sinon";
 import { mount } from "enzyme";
@@ -14,7 +13,7 @@ describe("DropDownMenu", () => {
 	let store, menuItems, container;
 	beforeEach(() => {
 		menuItems = [
-			{ title: "asd", action: sinon.spy().named("action"), itemContext: "aContext" },
+			{ title: { id: "asd", defaultMessage: "asd" }, action: sinon.spy().named("action"), itemContext: "aContext" },
 			{ title: "asd2", action: sinon.spy().named("action"), itemContext: "myContext" },
 		];
 		store = {
@@ -73,9 +72,9 @@ describe("DropDownMenu", () => {
 		const payload = "payload";
 
 		ReactDOM.render(
-			<Provider store={store}>
+			<TestWrapper provider={{ store }} intlProvider>
 				<DropDownMenu payload={payload} menuItems={menuItems} />
-			</Provider>,
+			</TestWrapper>,
 			container,
 		);
 
@@ -98,9 +97,9 @@ describe("DropDownMenu", () => {
 		const payload = "payload";
 
 		const component = (
-			<Provider store={store}>
+			<TestWrapper provider={{ store }} intlProvider>
 				<DropDownMenu payload={payload} menuItems={menuItems} />
-			</Provider>
+			</TestWrapper>
 		);
 
 		const mountedComponent = mount(component);

package/src/components/MaterialUI/ScopeSelector/ScopeSelector.js

@@ -15,7 +15,6 @@ const useStyles = makeStyles(theme => ({
 		backgroundColor: theme.palette.grey.light,
 		border: `1px solid ${theme.palette.grey.borders}`,
 		boxShadow: "0 2px 4px rgba(0,0,0,0.5)",
-		width: theme.spacing(50),
 		display: "flex",
 	},
 	scopeContainer: {
@@ -65,7 +64,7 @@ const ScopeSelector = ({ show, getScope, selectedScope, closeSelector, filter, u
 	);
 
 	const scopeSelector = (
-		<Sidepanel className={classes.container} in={show} timeout={300}>
+		<Sidepanel className={classes.container} widthSpacing={50} in={show} timeout={300}>
 			<ClickAwayListener onClickAway={e => closeSelector(e)}>
 				{/* this div is required since ClickAwayListener child element should be able to hold ref */}
 				<div className={classes.scopeContainer}>{show ? scopeSelectorContent : null}</div>

package/src/components/MaterialUI/ScopeSelector/TreeItem.js

@@ -11,19 +11,6 @@ import { scopeTypes } from "./../../../constants";
 const useStyles = makeStyles(theme => ({
 	group: {
 		marginLeft: props => (props.isRootScope ? theme.spacing(1.2) : theme.spacing(3.2)),
-		// to hide unnecessary border part
-		// "& > div > div > :last-child": {
-		//   "&:after": {
-		//     content: "''",
-		//     backgroundColor: theme.palette.grey.light,
-		//     position: "absolute",
-		//     top: theme.spacing(1.2),
-		//     left: theme.spacing(-2.1),
-		//     height: "100%",
-		//     bottom: 0,
-		//     width: "1px",
-		//   },
-		// }
 	},
 	rootIconContainer: {
 		marginRight: 0,
@@ -73,33 +60,23 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-export const ScopeIcon = ({ type }) => {
+export const ScopeIcon = ({ type, scopeIconClass }) => {
 	const classes = useStyles();
 	const theme = useTheme();
 
-	const globalIcon = <Icon className={classes.scopeIcon} color="primary" fontSize="medium" id="global-scope" />;
-	const virtualIcon = (
-		<Icon className={classes.scopeIcon} themeColor={theme.palette.grey.dark} fontSize="medium" id="virtual-scope" />
-	);
-	const salesIcon = <Icon className={classes.scopeIcon} color="primary" fontSize="medium" id="sales-scope" />;
-	const dependentIcon = (
-		<Icon
-			className={classes.scopeIcon}
-			themeColor={theme.palette.success.main}
-			fontSize="medium"
-			id="dependent-scope"
-		/>
-	);
+	const iconClass = classNames(classes.scopeIcon, scopeIconClass);
 
 	switch (type) {
 		case scopeTypes.global:
-			return globalIcon;
+			return <Icon className={iconClass} color="primary" fontSize="medium" id="global-scope" />;
 		case scopeTypes.virtual:
-			return virtualIcon;
+			return <Icon className={iconClass} themeColor={theme.palette.grey.dark} fontSize="medium" id="virtual-scope" />;
 		case scopeTypes.sale:
-			return salesIcon;
+			return <Icon className={iconClass} color="primary" fontSize="medium" id="sales-scope" />;
 		case scopeTypes.dependant:
-			return dependentIcon;
+			return (
+				<Icon className={iconClass} themeColor={theme.palette.success.main} fontSize="medium" id="dependent-scope" />
+			);
 		default:
 			return null;
 	}

package/src/components/MaterialUI/Surfaces/Paper.js

@@ -13,7 +13,7 @@ const useStyle = makeStyles(theme => ({
 		},
 		"&::-webkit-scrollbar-thumb": {
 			background: theme.palette.grey.borders,
-			border: `5px transparent solid`,
+			border: `${theme.spacing(0.5)} transparent solid`,
 			backgroundClip: "padding-box",
 			borderRadius: theme.spacing(1.5),
 		},

package/src/components/MaterialUI/Surfaces/SectionExpansionPanel.js

@@ -69,6 +69,7 @@ const SectionExpansionPanel = ({
 	expansionPanelId,
 	expansionPanelProps,
 	expansionPanelActionsProps,
+	headerClassName,
 }) => {
 	if (isExpansionPanelProps(expansionPanelProps) === false) {
 		throw new TypeError("expansionPanelProps property is not of type ExpansionPanelProps");
@@ -122,7 +123,7 @@ const SectionExpansionPanel = ({
 				expandIcon={<Icon id="dropdown-chevron-down" />}
 				IconButtonProps={defaultSummaryStyles}
 				classes={{
-					root: classNames(classes.summaryRoot, constrained ? classes.constrainedSummaryRoot : ""),
+					root: classNames(classes.summaryRoot, headerClassName, constrained ? classes.constrainedSummaryRoot : ""),
 					expanded: classNames(classes.panelExpanded),
 					content: classNames(classes.summaryContent, constrained ? classes.constrainedSummaryContent : ""),
 					expandIcon: classNames(classes.summaryExpandIconRoot),

package/src/components/MaterialUI/muiThemes.js

@@ -1,3 +1,6 @@
+import "@fontsource/open-sans/latin.css";
+import "@fontsource/roboto-condensed/latin.css";
+
 import { createTheme } from "@material-ui/core/styles";
 import { alpha, darken } from "@material-ui/core/styles/colorManipulator";
 
@@ -32,7 +35,7 @@ const commonTheme = {
 		fontWeightBlack: 900,
 		button: {
 			fontFamily: '"Roboto Condensed", sans-serif',
-			fontWeight: 500,
+			fontWeight: 400,
 			fontSize: 13,
 			lineHeight: 1.0,
 			letterSpacing: "0.0em",

package/src/components/Navigation/Navigation.test.js

@@ -5,11 +5,6 @@ import Navigation from "./index";
 import TabBar from "../MaterialUI/Navigation/TabBar";
 import { TestWrapper, createMuiTheme } from "./../../utils/testUtils";
 
-jest.mock("./Tab", () => ({
-	__esModule: true,
-	default: require("../../utils/testUtils").PropStruct,
-}));
-
 const TestComp = () => <div />;
 const TestComp1 = () => <div />;
 const TestComp2 = () => <div />;