orc-shared 5.10.0-dev.2 → 5.10.0-dev.21

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

@@ -17,7 +17,10 @@ const withDeferredTooltip =
 			if (alwaysDisplay) {
 				setShouldBeTooltipped(true);
 			} else {
-				setShouldBeTooltipped(event.target.offsetWidth < event.target.scrollWidth);
+				setShouldBeTooltipped(
+					event.target.offsetWidth < event.target.scrollWidth || // for single line
+						event.target.scrollHeight > event.target.clientHeight,
+				); // for multiple lines
 			}
 		};
 

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

@@ -47,6 +47,33 @@ describe("withDeferredTooltip", () => {
 		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
 	});
 
+	it("Wraps passed component in Mui tooltip if mouse enter event was triggered and scrollHeight is bigger than clientHeight", () => {
+		const Wrapper = props => <ComponentToBeTooltipped {...props} />;
+
+		const TooltippedCompponent = withDeferredTooltip(Wrapper);
+
+		const mountedTooltippedComponent = shallow(<TooltippedCompponent titleValue="test" />);
+
+		const event = {
+			target: {
+				offsetWidth: 0,
+				scrollWidth: 0,
+				scrollHeight: 200,
+				clientHeight: 100,
+			},
+		};
+
+		mountedTooltippedComponent.find(Wrapper).invoke("onMouseEnter")(event);
+
+		let expected = (
+			<MuiTooltip>
+				<Wrapper />
+			</MuiTooltip>
+		);
+
+		expect(mountedTooltippedComponent.containsMatchingElement(expected), "to be true");
+	});
+
 	it("Does not wrap passed component in Mui tooltip if scrollWidth is same as offsetWidth", () => {
 		const Wrapper = props => <ComponentToBeTooltipped {...props} />;
 

package/src/components/MaterialUI/muiThemes.js

@@ -706,6 +706,7 @@ const setThemeOverrides = theme => ({
 			},
 			".Mui-error &": {
 				borderColor: theme.palette.error.main,
+				boxShadow: "none",
 			},
 		},
 		adornedStart: {

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

@@ -6,7 +6,8 @@ import { Provider } from "react-redux";
 import { MemoryRouter, Router } from "react-router-dom";
 import { createMemoryHistory } from "history";
 import sinon from "sinon";
-import { getStyledClassSelector } from "../../utils/testUtils";
+import { StylesProvider } from "@material-ui/core";
+import { getStyledClassSelector, generateClassName } from "../../utils/testUtils";
 import Tab, { PageTab } from "./Tab";
 import Bar, { TabBar, ScrollableBar, InnerBar, useTabScroll, StyledMenu, MenuButton } from "./Bar";
 
@@ -180,42 +181,44 @@ describe("Bar", () => {
 				}}
 			>
 				<Router history={history}>
-					<IntlProvider locale="en">
-						<Bar
-							module={{
-								icon: "test",
-								label: "A module",
-								href: "/Foo/modu",
-								mappedFrom: "/Foo/modu",
-							}}
-							pages={[
-								{
-									href: "/Foo/modu/1",
-									mappedFrom: "/Foo/modu/1",
-									label: "Page 1",
-									close: closers[0],
-								},
-								{
-									href: "/Foo/modu/2",
-									mappedFrom: "/Foo/modu/2",
-									label: "Page 2",
-									close: closers[1],
-								},
-								{
-									href: "/Foo/modu/3",
-									mappedFrom: "/Foo/modu/3",
-									label: "Page 3",
-									close: closers[2],
-								},
-								{
-									href: "/Foo/modu/4",
-									mappedFrom: "/Foo/modu/4",
-									label: "Page 4",
-									close: closers[3],
-								},
-							]}
-						/>
-					</IntlProvider>
+					<StylesProvider generateClassName={generateClassName}>
+						<IntlProvider locale="en">
+							<Bar
+								module={{
+									icon: "test",
+									label: "A module",
+									href: "/Foo/modu",
+									mappedFrom: "/Foo/modu",
+								}}
+								pages={[
+									{
+										href: "/Foo/modu/1",
+										mappedFrom: "/Foo/modu/1",
+										label: "Page 1",
+										close: closers[0],
+									},
+									{
+										href: "/Foo/modu/2",
+										mappedFrom: "/Foo/modu/2",
+										label: "Page 2",
+										close: closers[1],
+									},
+									{
+										href: "/Foo/modu/3",
+										mappedFrom: "/Foo/modu/3",
+										label: "Page 3",
+										close: closers[2],
+									},
+									{
+										href: "/Foo/modu/4",
+										mappedFrom: "/Foo/modu/4",
+										label: "Page 4",
+										close: closers[3],
+									},
+								]}
+							/>
+						</IntlProvider>
+					</StylesProvider>
 				</Router>
 			</Provider>,
 			root,
@@ -248,56 +251,58 @@ describe("Bar", () => {
 					}}
 				>
 					<MemoryRouter>
-						<IntlProvider locale="en">
-							<TabBar>
-								<Tab key="/Foo/modu" module icon="test" href="/Foo/modu" mappedFrom="/Foo/modu" label="A module" />
-								<ScrollableBar>
-									<Tab
-										key="/Foo/modu/1"
-										href="/Foo/modu/1"
-										mappedFrom="/Foo/modu/1"
-										label="Page 1"
-										close={closers[0]}
-										hide={false}
-									/>
-									<Tab
-										key="/Foo/modu/2"
-										href="/Foo/modu/2"
-										mappedFrom="/Foo/modu/2"
-										label="Page 2"
-										close={closers[1]}
-										hide={false}
-									/>
-									<Tab
-										key="/Foo/modu/3"
-										href="/Foo/modu/3"
-										mappedFrom="/Foo/modu/3"
-										label="Page 3"
-										close={closers[2]}
-										hide={true}
-									/>
-									<Tab
-										key="/Foo/modu/4"
-										href="/Foo/modu/4"
-										mappedFrom="/Foo/modu/4"
-										label="Page 4"
-										close={closers[3]}
-										hide={true}
-									/>
-								</ScrollableBar>
-								<StyledMenu
-									id="navigationTabs"
-									menuItems={[
-										{ label: "Page 1", id: "/Foo/modu/1" },
-										{ label: "Page 2", id: "/Foo/modu/2" },
-										{ label: "Page 3", id: "/Foo/modu/3" },
-										{ label: "Page 4", id: "/Foo/modu/4" },
-									]}
-								>
-									<MenuButton />
-								</StyledMenu>
-							</TabBar>
-						</IntlProvider>
+						<StylesProvider generateClassName={generateClassName}>
+							<IntlProvider locale="en">
+								<TabBar>
+									<Tab key="/Foo/modu" module icon="test" href="/Foo/modu" mappedFrom="/Foo/modu" label="A module" />
+									<ScrollableBar>
+										<Tab
+											key="/Foo/modu/1"
+											href="/Foo/modu/1"
+											mappedFrom="/Foo/modu/1"
+											label="Page 1"
+											close={closers[0]}
+											hide={false}
+										/>
+										<Tab
+											key="/Foo/modu/2"
+											href="/Foo/modu/2"
+											mappedFrom="/Foo/modu/2"
+											label="Page 2"
+											close={closers[1]}
+											hide={false}
+										/>
+										<Tab
+											key="/Foo/modu/3"
+											href="/Foo/modu/3"
+											mappedFrom="/Foo/modu/3"
+											label="Page 3"
+											close={closers[2]}
+											hide={true}
+										/>
+										<Tab
+											key="/Foo/modu/4"
+											href="/Foo/modu/4"
+											mappedFrom="/Foo/modu/4"
+											label="Page 4"
+											close={closers[3]}
+											hide={true}
+										/>
+									</ScrollableBar>
+									<StyledMenu
+										id="navigationTabs"
+										menuItems={[
+											{ label: "Page 1", id: "/Foo/modu/1" },
+											{ label: "Page 2", id: "/Foo/modu/2" },
+											{ label: "Page 3", id: "/Foo/modu/3" },
+											{ label: "Page 4", id: "/Foo/modu/4" },
+										]}
+									>
+										<MenuButton />
+									</StyledMenu>
+								</TabBar>
+							</IntlProvider>
+						</StylesProvider>
 					</MemoryRouter>
 				</Provider>,
 			);

package/src/components/Provision.js

@@ -43,13 +43,13 @@ const Provision = ({ store, theme = {}, muiTheme, children }) => {
 					<MuiThemeProvider theme={muiTheme}>
 						<React.Fragment>
 							<Head />
-							<Culture />
 							<GlobalStyle />
 							<Authenticate>
 								<React.Fragment>
 									<Fonts />
 									<DevPages>
 										<I18n>
+											<Culture />
 											{React.Children.only(children)}
 											<InternetExplorerWarningMessage />
 										</I18n>

package/src/components/TaskDetailsModal.test.js

@@ -78,9 +78,7 @@ describe("TaskDetailsModal", () => {
 		const expectedContent = (
 			<div>
 				<InformationItem label={sharedMessages.taskId}>1234</InformationItem>
-				<InformationItem label={sharedMessages.taskStatus}>
-					<Ignore />
-				</InformationItem>
+				<InformationItem label={sharedMessages.taskStatus} />
 				<InformationItem label={sharedMessages.taskLogs}>
 					<textarea />
 				</InformationItem>

package/src/constants.js

@@ -19,6 +19,7 @@ export const platformRoles = {
 	Editor: "Editor",
 	Reader: "Reader",
 	Recipient: "Recipient",
+	PasswordReset: "PasswordReset",
 };
 
 export const roleGroups = {