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

package/dist/components/AppFrame/Preferences.js

@@ -1,16 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.createGetUpdater = exports.clickOutsideHandler = exports.Wrapper = exports.Preferences = exports.PrefPanel = exports.PrefForm = exports.PrefButton = exports.PREFS_NAME = exports.Header = exports.Footer = void 0;
+exports.stateEventUpdater = exports.default = exports.clickOutsideHandler = exports.Wrapper = exports.Preferences = exports.PREFS_NAME = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _reactRedux = require("react-redux");
+var _reactIntl = require("react-intl");
+var _styles = require("@material-ui/core/styles");
+var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 var _utils = require("../../utils");
 var _Sidepanel = _interopRequireDefault(require("../Sidepanel"));
-var _Button = _interopRequireDefault(require("../Button"));
-var _Text = _interopRequireDefault(require("../Text"));
-var _Form = require("../Form/Form");
-var _FieldElements = _interopRequireDefault(require("../Form/FieldElements"));
 var _useViewState3 = _interopRequireDefault(require("../../hooks/useViewState"));
 var _view = require("../../actions/view");
 var _locale = require("../../actions/locale");
@@ -21,6 +19,9 @@ var _settings = require("../../selectors/settings");
 var _withClickOutside = _interopRequireDefault(require("../../hocs/withClickOutside"));
 var _versionInfo = require("../../actions/versionInfo");
 var _sharedMessages = _interopRequireDefault(require("./../../sharedMessages"));
+var _SelectProps = _interopRequireDefault(require("../MaterialUI/Inputs/SelectProps"));
+var _InformationItem = _interopRequireDefault(require("../MaterialUI/DataDisplay/PredefinedElements/InformationItem"));
+var _Select = _interopRequireDefault(require("../MaterialUI/Inputs/Select"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -30,11 +31,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
 })();
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 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."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -48,52 +44,104 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
   return a;
 };
 var PREFS_NAME = exports.PREFS_NAME = "__prefsDialog";
-var PrefPanel = exports.PrefPanel = (0, _styledComponents.default)(_Sidepanel.default).withConfig({
-  displayName: "Preferences__PrefPanel",
-  componentId: "sc-1fqlcmy-0"
-})(["background-color:#f7f7f7;border-left:1px solid ", ";border-top:1px solid ", ";border-top-left-radius:5px;top:40px;box-shadow:-3px 2px 5px 0px rgba(0,0,0,0.2);z-index:9998;"], (0, _utils.getThemeProp)(["colors", "borderLight"], "#cccccc"), (0, _utils.getThemeProp)(["colors", "borderLight"], "#cccccc"));
-var Wrapper = exports.Wrapper = (0, _withClickOutside.default)(_styledComponents.default.div.withConfig({
-  displayName: "Preferences__Wrapper",
-  componentId: "sc-1fqlcmy-1"
-})(["display:flex;flex-direction:column;height:100%;"]));
-var Header = exports.Header = _styledComponents.default.div.withConfig({
-  displayName: "Preferences__Header",
-  componentId: "sc-1fqlcmy-2"
-})(["flex:0 0 auto;border-bottom:1px solid ", ";border-top-left-radius:5px;padding:15px 30px;height:18px;font-size:15px;font-family:", ";text-transform:uppercase;color:", ";background-color:#ffffff;"], (0, _utils.getThemeProp)(["colors", "borderLight"], "#cccccc"), (0, _utils.getThemeProp)(["fonts", "header"], "sans-serif"), (0, _utils.getThemeProp)(["colors", "application", "base"], "#ccc"));
-var PrefForm = exports.PrefForm = _styledComponents.default.div.withConfig({
-  displayName: "Preferences__PrefForm",
-  componentId: "sc-1fqlcmy-3"
-})(["flex:1 1 auto;display:flex;flex-direction:column;padding:20px 30px;font-size:12px;"]);
-var Footer = exports.Footer = _styledComponents.default.div.withConfig({
-  displayName: "Preferences__Footer",
-  componentId: "sc-1fqlcmy-4"
-})(["flex:0 0 auto;display:flex;align-items:center;justify-content:flex-end;background-color:#ffffff;border-top:1px solid ", ";padding-right:10px;height:60px;"], (0, _utils.getThemeProp)(["colors", "borderLight"], "#cccccc"));
-var PrefButton = exports.PrefButton = (0, _styledComponents.default)(_Button.default).withConfig({
-  displayName: "Preferences__PrefButton",
-  componentId: "sc-1fqlcmy-5"
-})(["margin-right:20px;min-width:110px;"]);
-var createGetUpdater = exports.createGetUpdater = (0, _utils.memoize)(function (update) {
-  return (0, _utils.memoize)(function (name) {
-    return function (value) {
-      return update(name, value);
-    };
-  });
+var useStyles = (0, _styles.makeStyles)(function (theme) {
+  return {
+    prefPanel: {
+      backgroundColor: "#f7f7f7",
+      borderLeft: "1px solid ".concat(theme.palette.grey.borders),
+      borderTop: "1px solid ".concat(theme.palette.grey.borders),
+      borderTopLeftRadius: "5px",
+      top: "40px",
+      boxShadow: "-3px 2px 5px 0px rgba(0, 0, 0, 0.2)",
+      zIndex: 9998,
+      transition: "right 400ms ease-out"
+    },
+    header: {
+      flex: "0 0 auto",
+      borderBottom: "1px solid ".concat(theme.palette.grey.borders),
+      borderTopLeftRadius: "5px",
+      padding: "15px 30px",
+      height: "18px",
+      fontSize: "15px",
+      fontFamily: theme.typography.button.fontFamily,
+      textTransform: "uppercase",
+      color: theme.palette.primary.main,
+      backgroundColor: "#ffffff"
+    },
+    prefForm: {
+      flex: "1 1 auto",
+      display: "flex",
+      flexDirection: "column",
+      padding: "20px 30px",
+      fontSize: "12px"
+    },
+    footer: {
+      flex: "0 0 auto",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "flex-end",
+      backgroundColor: "#ffffff",
+      borderTop: "1px solid ".concat(theme.palette.grey.borders),
+      paddingRight: "10px",
+      height: "60px"
+    },
+    prefButton: {
+      marginRight: "20px",
+      minWidth: "110px"
+    },
+    wrapper: {
+      display: "flex",
+      flexDirection: "column",
+      height: "100%"
+    }
+  };
+});
+var Wrapper = exports.Wrapper = (0, _withClickOutside.default)(_react.default.forwardRef(__signature__(__signature__(function (_ref, ref) {
+  var children = _ref.children;
+  var classes = useStyles();
+  return /*#__PURE__*/_react.default.createElement("div", {
+    ref: ref,
+    className: classes.wrapper
+  }, children);
+}, "useStyles{classes}", function () {
+  return [useStyles];
+}), "useStyles{classes}", function () {
+  return [useStyles];
+})));
+var stateEventUpdater = exports.stateEventUpdater = (0, _utils.memoize)(function (update, key) {
+  return function (value) {
+    return update(key, value);
+  };
 });
 var usePreferenceSetup = function usePreferenceSetup() {
+  var _viewState$language, _viewState$applicatio;
   var dispatch = (0, _reactRedux.useDispatch)();
   var _useViewState = (0, _useViewState3.default)(PREFS_NAME),
     _useViewState2 = _slicedToArray(_useViewState, 2),
     viewState = _useViewState2[0],
     updateViewState = _useViewState2[1];
+  var initialLanguage = (0, _reactRedux.useSelector)(_locale2.currentLocaleOrDefault);
+  var initialApplication = (0, _reactRedux.useSelector)(_settings.defaultAppId) || "";
+  var languageSelectProps = new _SelectProps.default();
+  languageSelectProps.set(_SelectProps.default.propNames.value, (_viewState$language = viewState.language) != null ? _viewState$language : initialLanguage);
+  languageSelectProps.set(_SelectProps.default.propNames.disabled, false);
+  languageSelectProps.set(_SelectProps.default.propNames.positionOverride, {
+    disablePortal: true
+  });
+  languageSelectProps.set(_SelectProps.default.propNames.update, stateEventUpdater(updateViewState, "language"));
+  var applicationSelectProps = new _SelectProps.default();
+  applicationSelectProps.set(_SelectProps.default.propNames.value, (_viewState$applicatio = viewState.application) != null ? _viewState$applicatio : initialApplication);
+  applicationSelectProps.set(_SelectProps.default.propNames.disabled, false);
+  applicationSelectProps.set(_SelectProps.default.propNames.positionOverride, {
+    disablePortal: true
+  });
+  applicationSelectProps.set(_SelectProps.default.propNames.update, stateEventUpdater(updateViewState, "application"));
   return {
     show: viewState.show,
-    values: _objectSpread({
-      language: (0, _reactRedux.useSelector)(_locale2.currentLocaleOrDefault),
-      application: (0, _reactRedux.useSelector)(_settings.defaultAppId) || ""
-    }, viewState),
-    getUpdater: createGetUpdater(updateViewState),
     languageOptions: (0, _utils.unwrapImmutable)((0, _reactRedux.useSelector)(_locale2.cultureOptionList)),
+    languageSelectProps: languageSelectProps,
     applicationOptions: (0, _utils.unwrapImmutable)((0, _reactRedux.useSelector)(_applications2.localizedAppOptionSelector)),
+    applicationSelectProps: applicationSelectProps,
     clear: function clear() {
       return dispatch((0, _view.setValue)(PREFS_NAME, {
         show: false
@@ -115,10 +163,10 @@ var usePreferenceSetup = function usePreferenceSetup() {
     }
   };
 };
-__signature__(usePreferenceSetup, "useDispatch{dispatch}\nuseViewState{[viewState, updateViewState]}\nuseSelector{}\nuseSelector{}\nuseSelector{}\nuseSelector{}", function () {
+__signature__(usePreferenceSetup, "useDispatch{dispatch}\nuseViewState{[viewState, updateViewState]}\nuseSelector{initialLanguage}\nuseSelector{}\nuseSelector{}\nuseSelector{}", function () {
   return [_reactRedux.useDispatch, _useViewState3.default, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
 });
-__signature__(usePreferenceSetup, "useDispatch{dispatch}\nuseViewState{[viewState, updateViewState]}\nuseSelector{}\nuseSelector{}\nuseSelector{}\nuseSelector{}", function () {
+__signature__(usePreferenceSetup, "useDispatch{dispatch}\nuseViewState{[viewState, updateViewState]}\nuseSelector{initialLanguage}\nuseSelector{}\nuseSelector{}\nuseSelector{}", function () {
   return [_reactRedux.useDispatch, _useViewState3.default, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector, _reactRedux.useSelector];
 });
 var clickOutsideHandler = exports.clickOutsideHandler = function clickOutsideHandler(e) {
@@ -126,57 +174,56 @@ var clickOutsideHandler = exports.clickOutsideHandler = function clickOutsideHan
   e.stopPropagation();
 };
 var Preferences = exports.Preferences = function Preferences() {
+  var classes = useStyles();
   var _usePreferenceSetup = usePreferenceSetup(),
     show = _usePreferenceSetup.show,
-    getUpdater = _usePreferenceSetup.getUpdater,
     save = _usePreferenceSetup.save,
     clear = _usePreferenceSetup.clear,
     languageOptions = _usePreferenceSetup.languageOptions,
+    languageSelectProps = _usePreferenceSetup.languageSelectProps,
     applicationOptions = _usePreferenceSetup.applicationOptions,
-    values = _usePreferenceSetup.values;
-  return /*#__PURE__*/_react.default.createElement(PrefPanel, {
+    applicationSelectProps = _usePreferenceSetup.applicationSelectProps;
+  return /*#__PURE__*/_react.default.createElement(_Sidepanel.default, {
     in: show,
     width: "380px",
-    timeout: 400
+    timeout: 400,
+    className: classes.prefPanel
   }, /*#__PURE__*/_react.default.createElement(Wrapper, {
     onClickOutside: clickOutsideHandler
-  }, /*#__PURE__*/_react.default.createElement(Header, null, /*#__PURE__*/_react.default.createElement(_Text.default, {
-    message: _sharedMessages.default.preferences
-  })), /*#__PURE__*/_react.default.createElement(PrefForm, null, /*#__PURE__*/_react.default.createElement(_Form.FormContext.Provider, {
-    value: {
-      values: values
-    }
-  }, /*#__PURE__*/_react.default.createElement(_FieldElements.default, {
-    fields: [{
-      label: _sharedMessages.default.displayLanguage,
-      type: "Selector",
-      name: "language",
-      options: languageOptions
-    }, {
-      label: _sharedMessages.default.defaultApp,
-      type: "Selector",
-      name: "application",
-      options: applicationOptions
-    }],
-    getUpdater: getUpdater
-  }))), /*#__PURE__*/_react.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(PrefButton, {
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.header
+  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.preferences)), /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.prefForm
+  }, /*#__PURE__*/_react.default.createElement(_InformationItem.default, {
+    label: _sharedMessages.default.displayLanguage
+  }, /*#__PURE__*/_react.default.createElement(_Select.default, {
+    options: languageOptions,
+    selectProps: languageSelectProps
+  })), /*#__PURE__*/_react.default.createElement(_InformationItem.default, {
+    label: _sharedMessages.default.defaultApp
+  }, /*#__PURE__*/_react.default.createElement(_Select.default, {
+    options: applicationOptions,
+    selectProps: applicationSelectProps
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.footer
+  }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     id: "cancelPrefs",
-    onClick: clear
-  }, /*#__PURE__*/_react.default.createElement(_Text.default, {
-    message: _sharedMessages.default.cancel
-  })), /*#__PURE__*/_react.default.createElement(PrefButton, {
+    onClick: clear,
+    className: classes.prefButton,
+    variant: "outlined"
+  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.cancel)), /*#__PURE__*/_react.default.createElement(_Button.default, {
     id: "savePrefs",
-    primary: true,
-    onClick: save
-  }, /*#__PURE__*/_react.default.createElement(_Text.default, {
-    message: _sharedMessages.default.save
-  })))));
+    onClick: save,
+    className: classes.prefButton,
+    variant: "outlined",
+    color: "primary"
+  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.save)))));
 };
-__signature__(Preferences, "usePreferenceSetup{{ show, getUpdater, save, clear, languageOptions, applicationOptions, values }}", function () {
-  return [usePreferenceSetup];
+__signature__(Preferences, "useStyles{classes}\nusePreferenceSetup{{ show, save, clear, languageOptions, languageSelectProps, applicationOptions, applicationSelectProps }}", function () {
+  return [useStyles, usePreferenceSetup];
 });
-__signature__(Preferences, "usePreferenceSetup{{ show, getUpdater, save, clear, languageOptions, applicationOptions, values }}", function () {
-  return [usePreferenceSetup];
+__signature__(Preferences, "useStyles{classes}\nusePreferenceSetup{{ show, save, clear, languageOptions, languageSelectProps, applicationOptions, applicationSelectProps }}", function () {
+  return [useStyles, usePreferenceSetup];
 });
 var _default = Preferences;
 var _default2 = _default;
@@ -188,13 +235,9 @@ var _default3 = exports.default = _default2;
     return;
   }
   reactHotLoader.register(PREFS_NAME, "PREFS_NAME", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefPanel, "PrefPanel", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(Wrapper, "Wrapper", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(Header, "Header", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefForm, "PrefForm", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(Footer, "Footer", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefButton, "PrefButton", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(createGetUpdater, "createGetUpdater", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
+  reactHotLoader.register(stateEventUpdater, "stateEventUpdater", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(usePreferenceSetup, "usePreferenceSetup", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(clickOutsideHandler, "clickOutsideHandler", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(Preferences, "Preferences", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
@@ -212,13 +255,9 @@ var _default3 = exports.default = _default2;
     return;
   }
   reactHotLoader.register(PREFS_NAME, "PREFS_NAME", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefPanel, "PrefPanel", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(Wrapper, "Wrapper", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(Header, "Header", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefForm, "PrefForm", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(Footer, "Footer", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(PrefButton, "PrefButton", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
-  reactHotLoader.register(createGetUpdater, "createGetUpdater", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
+  reactHotLoader.register(stateEventUpdater, "stateEventUpdater", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(usePreferenceSetup, "usePreferenceSetup", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(clickOutsideHandler, "clickOutsideHandler", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");
   reactHotLoader.register(Preferences, "Preferences", "/home/vsts/work/1/s/src/components/AppFrame/Preferences.js");

package/dist/components/AppFrame/Sidebar.js

@@ -1,18 +1,15 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.MenuToggle = exports.Logo = exports.EnhancedMenuItem = exports.Bar = void 0;
+exports.default = exports.MenuToggle = exports.Logo = exports.EnhancedMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _styles = require("@material-ui/core/styles");
 var _reactRouterDom = require("react-router-dom");
-var _utils = require("../../utils");
 var _navigation = require("../../selectors/navigation");
 var _MenuItem = _interopRequireDefault(require("./MenuItem"));
 var _modules = require("../../selectors/modules");
 var _excluded = ["id"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -31,24 +28,40 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var Bar = exports.Bar = _styledComponents.default.div.withConfig({
-  displayName: "Sidebar__Bar",
-  componentId: "sc-9mojly-0"
-})(["box-sizing:border-box;padding-top:60px;height:calc(100% - 40px);width:200px;display:flex;flex-direction:column;justify-content:flex-start;color:", ";"], (0, _utils.getThemeProp)(["colors", "textMedium"], "#999999"));
-var MenuToggle = exports.MenuToggle = (0, _styledComponents.withTheme)(function (_ref) {
+var useStyles = (0, _styles.makeStyles)(function (theme) {
+  return {
+    bar: {
+      boxSizing: "border-box",
+      paddingTop: "60px",
+      height: "calc(100% - 40px)",
+      width: "200px",
+      display: "flex",
+      flexDirection: "column",
+      justifyContent: "flex-start",
+      color: theme.palette.text.hint
+    },
+    logoSvg: {
+      flex: "0 0 auto",
+      margin: "auto 12.5px 7px",
+      height: "25px",
+      width: "25px",
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      fill: "#666666"
+    }
+  };
+});
+var MenuToggle = exports.MenuToggle = function MenuToggle(_ref) {
   var open = _ref.open,
-    toggle = _ref.toggle,
-    theme = _ref.theme;
+    toggle = _ref.toggle;
   return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
     id: "sidebarMenuToggle",
     menuToggle: true,
     open: open,
-    icon: (open ? (0, _utils.getThemeProp)(["icons", "sidebarOpen"], "layers") : (0, _utils.getThemeProp)(["icons", "sidebarClosed"], "menu"))({
-      theme: theme
-    }),
+    icon: open ? "collapse" : "expand",
     onClick: toggle
   });
-});
+};
 var useEnhancement = function useEnhancement(id) {
   var location = (0, _reactRouterDom.useLocation)();
   var prependHref = (0, _reactRedux.useSelector)(_navigation.selectPrependHrefConfig)(id);
@@ -79,17 +92,21 @@ __signature__(EnhancedMenuItem, "useSelector{defaultModule}\nuseEnhancement{}",
 __signature__(EnhancedMenuItem, "useSelector{defaultModule}\nuseEnhancement{}", function () {
   return [_reactRedux.useSelector, useEnhancement];
 });
-var LogoSvg = _styledComponents.default.svg.withConfig({
-  displayName: "Sidebar__LogoSvg",
-  componentId: "sc-9mojly-1"
-})(["flex:0 0 auto;margin:auto 12.5px 7px;height:25px;width:25px;fill-rule:evenodd;clip-rule:evenodd;fill:#666666;"]);
 var Logo = exports.Logo = function Logo() {
-  return /*#__PURE__*/_react.default.createElement(LogoSvg, {
-    viewBox: "0 0 354 354"
+  var classes = useStyles();
+  return /*#__PURE__*/_react.default.createElement("svg", {
+    viewBox: "0 0 354 354",
+    className: classes.logoSvg
   }, /*#__PURE__*/_react.default.createElement("g", null, /*#__PURE__*/_react.default.createElement("path", {
     d: "M0 241.41c0-65.49 50.53-111.98 119.66-111.98s119.25 46.49 119.25 111.98c0 65.49-50.13 111.97-119.25 111.97S0 306.9 0 241.41Zm175.04 0c0-37.6-23.85-60.23-55.38-60.23s-55.79 22.64-55.79 60.23c0 37.59 24.26 60.23 55.79 60.23 31.53 0 55.38-22.64 55.38-60.23Zm178.1-76.35h-77.48c0-48.29-39.29-87.58-87.58-87.58V0c91.02 0 165.07 74.05 165.07 165.06h-.01Z"
   })));
 };
+__signature__(Logo, "useStyles{classes}", function () {
+  return [useStyles];
+});
+__signature__(Logo, "useStyles{classes}", function () {
+  return [useStyles];
+});
 var Sidebar = function Sidebar(_ref3) {
   var open = _ref3.open,
     toggle = _ref3.toggle,
@@ -97,8 +114,10 @@ var Sidebar = function Sidebar(_ref3) {
     modules = _ref3$modules === void 0 ? [] : _ref3$modules,
     _ref3$activeModules = _ref3.activeModules,
     activeModules = _ref3$activeModules === void 0 ? [] : _ref3$activeModules;
-  return /*#__PURE__*/_react.default.createElement(Bar, {
-    open: open
+  var classes = useStyles();
+  return /*#__PURE__*/_react.default.createElement("div", {
+    open: open,
+    className: classes.bar
   }, /*#__PURE__*/_react.default.createElement(MenuToggle, {
     open: open,
     toggle: toggle
@@ -112,6 +131,12 @@ var Sidebar = function Sidebar(_ref3) {
     }));
   }), /*#__PURE__*/_react.default.createElement(Logo, null));
 };
+__signature__(Sidebar, "useStyles{classes}", function () {
+  return [useStyles];
+});
+__signature__(Sidebar, "useStyles{classes}", function () {
+  return [useStyles];
+});
 var _default = Sidebar;
 var _default2 = _default;
 var _default3 = exports.default = _default2;
@@ -121,11 +146,10 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(Bar, "Bar", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(MenuToggle, "MenuToggle", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(useEnhancement, "useEnhancement", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(EnhancedMenuItem, "EnhancedMenuItem", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
-  reactHotLoader.register(LogoSvg, "LogoSvg", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(Logo, "Logo", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(Sidebar, "Sidebar", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
@@ -141,11 +165,10 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(Bar, "Bar", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(MenuToggle, "MenuToggle", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(useEnhancement, "useEnhancement", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(EnhancedMenuItem, "EnhancedMenuItem", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
-  reactHotLoader.register(LogoSvg, "LogoSvg", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(Logo, "Logo", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(Sidebar, "Sidebar", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/AppFrame/Sidebar.js");

package/dist/components/AppFrame/Topbar.js

@@ -1,12 +1,11 @@
 "use strict";
 
 exports.__esModule = true;
-exports.useMenuProps = exports.default = exports.Wrapper = exports.Menu = exports.CurrentApp = exports.AppLogo = exports.AppLabel = exports.AppBox = void 0;
+exports.useMenuProps = exports.default = exports.Menu = exports.CurrentApp = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _reactRedux = require("react-redux");
 var _reactIntl = require("react-intl");
-var _utils = require("../../utils");
+var _styles = require("@material-ui/core/styles");
 var _authentication = require("../../selectors/authentication");
 var _view = require("../../actions/view");
 var _authentication2 = require("../../actions/authentication");
@@ -36,10 +35,37 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var Wrapper = exports.Wrapper = _styledComponents.default.div.withConfig({
-  displayName: "Topbar__Wrapper",
-  componentId: "sc-15ckfuy-0"
-})(["height:40px;color:", ";display:flex;justify-content:space-between;"], (0, _utils.getThemeProp)(["colors", "textMedium"], "#999999"));
+var useStyles = (0, _styles.makeStyles)(function (theme) {
+  return {
+    wrapper: {
+      height: "40px",
+      color: theme.palette.text.hint,
+      display: "flex",
+      justifyContent: "space-between"
+    },
+    appBox: {
+      height: "100%",
+      display: "flex",
+      flex: 1,
+      alignItems: "stretch"
+    },
+    appLabel: {
+      backgroundColor: "#000000",
+      color: theme.palette.primary.light,
+      fontFamily: theme.typography.button.fontFamily,
+      fontSize: "14px",
+      textTransform: "uppercase",
+      paddingRight: "20px",
+      paddingLeft: "6px",
+      display: "flex",
+      alignItems: "center"
+    },
+    appLogo: {
+      height: "30px",
+      marginRight: "10px"
+    }
+  };
+});
 var useMenuProps = exports.useMenuProps = function useMenuProps() {
   var intl = (0, _reactIntl.useIntl)();
   var dispatch = (0, _reactRedux.useDispatch)();
@@ -90,29 +116,23 @@ __signature__(Menu, "useMenuProps{{ menuLabel, ...menuProps }}", function () {
 __signature__(Menu, "useMenuProps{{ menuLabel, ...menuProps }}", function () {
   return [useMenuProps];
 });
-var AppBox = exports.AppBox = _styledComponents.default.div.withConfig({
-  displayName: "Topbar__AppBox",
-  componentId: "sc-15ckfuy-1"
-})(["height:100%;display:flex;flex:1;align-items:stretch;"]);
-var AppLabel = exports.AppLabel = _styledComponents.default.div.withConfig({
-  displayName: "Topbar__AppLabel",
-  componentId: "sc-15ckfuy-2"
-})(["background-color:#000000;color:", ";font-family:", ";font-size:14px;text-transform:uppercase;padding-right:20px;padding-left:6px;display:flex;align-items:center;"], (0, _utils.getThemeProp)(["colors", "application", "primary"], "#ffffff"), (0, _utils.getThemeProp)(["fonts", "header"], "sans-serif"));
-var AppLogo = exports.AppLogo = _styledComponents.default.img.attrs(function () {
-  return {
-    alt: ""
-  };
-}).withConfig({
-  displayName: "Topbar__AppLogo",
-  componentId: "sc-15ckfuy-3"
-})(["height:30px;margin-right:10px;"]);
 var CurrentApp = exports.CurrentApp = function CurrentApp(_ref) {
   var displayName = _ref.displayName,
     iconUri = _ref.iconUri;
-  return /*#__PURE__*/_react.default.createElement(AppLabel, null, /*#__PURE__*/_react.default.createElement(AppLogo, {
-    src: iconUri
+  var classes = useStyles();
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.appLabel
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: iconUri,
+    className: classes.appLogo
   }), displayName);
 };
+__signature__(CurrentApp, "useStyles{classes}", function () {
+  return [useStyles];
+});
+__signature__(CurrentApp, "useStyles{classes}", function () {
+  return [useStyles];
+});
 CurrentApp.displayName = "CurrentApp";
 var Topbar = function Topbar(_ref2) {
   var applications = _ref2.applications,
@@ -121,15 +141,26 @@ var Topbar = function Topbar(_ref2) {
     onClick = _ref2.onClick,
     helpUrl = _ref2.helpUrl,
     config = _objectWithoutProperties(_ref2, _excluded2);
-  return /*#__PURE__*/_react.default.createElement(Wrapper, {
-    onClick: onClick
-  }, /*#__PURE__*/_react.default.createElement(AppBox, null, /*#__PURE__*/_react.default.createElement(_ApplicationSelector.default, {
+  var classes = useStyles();
+  return /*#__PURE__*/_react.default.createElement("div", {
+    onClick: onClick,
+    className: classes.wrapper,
+    "data-test-id": "wrapper"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.appBox
+  }, /*#__PURE__*/_react.default.createElement(_ApplicationSelector.default, {
     applications: applications,
     applicationId: applicationId
   }), /*#__PURE__*/_react.default.createElement(CurrentApp, currentApplication || {})), /*#__PURE__*/_react.default.createElement(Menu, config), /*#__PURE__*/_react.default.createElement(_Help.default, {
     helpUrl: helpUrl
   }));
 };
+__signature__(Topbar, "useStyles{classes}", function () {
+  return [useStyles];
+});
+__signature__(Topbar, "useStyles{classes}", function () {
+  return [useStyles];
+});
 var _default = Topbar;
 var _default2 = _default;
 var _default3 = exports.default = _default2;
@@ -139,12 +170,9 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(Wrapper, "Wrapper", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(useMenuProps, "useMenuProps", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(Menu, "Menu", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppBox, "AppBox", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppLabel, "AppLabel", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppLogo, "AppLogo", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(CurrentApp, "CurrentApp", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(Topbar, "Topbar", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
@@ -160,12 +188,9 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(Wrapper, "Wrapper", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
+  reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(useMenuProps, "useMenuProps", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(Menu, "Menu", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppBox, "AppBox", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppLabel, "AppLabel", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
-  reactHotLoader.register(AppLogo, "AppLogo", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(CurrentApp, "CurrentApp", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(Topbar, "Topbar", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/AppFrame/Topbar.js");