@entur-partner/common 5.3.1 → 6.0.0

package/dist/PermissionCheckedRoute.d.ts

@@ -1,7 +1,7 @@
 import { BusinessCapability } from '@entur-partner/permission-client-node';
 import React from 'react';
-import { RouteComponentProps, RouteProps } from 'react-router-dom';
-interface PermissionCheckedRouteProps extends RouteComponentProps, Omit<RouteProps, 'location'> {
+import { PathRouteProps } from 'react-router-dom';
+interface PermissionCheckedRouteProps extends PathRouteProps, Omit<PathRouteProps, 'location'> {
     actualPermissions: BusinessCapability[];
     all?: BusinessCapability[];
     oneOf?: BusinessCapability[];

package/dist/UserMenu.d.ts

@@ -1,5 +1,5 @@
 import './UserMenu.scss';
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { Environment } from './environment';
 interface UserMenuProps {
     userName: string;
@@ -19,4 +19,8 @@ interface UserMenuProps {
     onNavigateToMyProfile: () => void;
 }
 export declare const UserMenu: FC<UserMenuProps>;
+export declare const VersionCustomOverflowMenuItems: React.FC<{
+    title: string;
+    setOpen: (isOpen: boolean) => void;
+}>;
 export {};

package/dist/common.cjs.development.js

@@ -347,7 +347,6 @@ var UserMenu = function UserMenu(_ref) {
       showVersionItem = _ref.showVersionItem,
       showMyProfileItem = _ref.showMyProfileItem,
       onNavigateToMyProfile = _ref.onNavigateToMyProfile;
-  var history = reactRouterDom.useHistory();
   var triggerClassList = cx__default["default"](['eps-user-menu__trigger-button', className]);
 
   var _useState = React.useState(false),
@@ -388,19 +387,10 @@ var UserMenu = function UserMenu(_ref) {
   }, React__default["default"].createElement(icons.UKIcon, {
     size: "1rem",
     inline: true
-  })), messages.switchLanguage), showVersionItem && messages.appVersion && React__default["default"].createElement(CustomOverflowMenuItem, {
-    onClick: function onClick() {
-      history.push('/app-version');
-      setOpen(false);
-    },
-    className: "eps-overflow-menu__item"
-  }, React__default["default"].createElement("span", {
-    "aria-hidden": true
-  }, React__default["default"].createElement(icons.ChannelsIcon, {
-    className: "eps-version-icon",
-    size: "1rem",
-    inline: true
-  })), messages.appVersion), showMyProfileItem && messages.myProfile && React__default["default"].createElement(reactRouterDom.Link, {
+  })), messages.switchLanguage), showVersionItem && messages.appVersion && React__default["default"].createElement(VersionCustomOverflowMenuItems, {
+    title: messages.appVersion,
+    setOpen: setOpen
+  }), showMyProfileItem && messages.myProfile && React__default["default"].createElement(reactRouterDom.Link, {
     to: "/permission-admin/my-profile",
     style: {
       textDecoration: 'none'
@@ -488,6 +478,26 @@ var CustomOverflowMenuItem = function CustomOverflowMenuItem(props) {
   }, props));
 };
 
+var VersionCustomOverflowMenuItems = function VersionCustomOverflowMenuItems(_ref3) {
+  var title = _ref3.title,
+      setOpen = _ref3.setOpen;
+  var navigate = reactRouterDom.useNavigate(); // Hide useNavigate from standalone micro-frontends because it is not under RouterProvider
+
+  return React__default["default"].createElement(CustomOverflowMenuItem, {
+    onClick: function onClick() {
+      navigate('/app-version');
+      setOpen(false);
+    },
+    className: "eps-overflow-menu__item"
+  }, React__default["default"].createElement("span", {
+    "aria-hidden": true
+  }, React__default["default"].createElement(icons.ChannelsIcon, {
+    className: "eps-version-icon",
+    size: "1rem",
+    inline: true
+  })), title);
+};
+
 function elementContainsEventTarget(element, event) {
   if (!element) {
     return false;
@@ -940,41 +950,25 @@ var RouteLeavingGuard = function RouteLeavingGuard(_ref) {
       shouldBlockNavigation = _ref.shouldBlockNavigation,
       rest = _objectWithoutPropertiesLoose(_ref, _excluded$2);
 
-  var history = reactRouterDom.useHistory();
-
-  var _useState = React.useState('ALLOW'),
-      status = _useState[0],
-      setStatus = _useState[1];
-
-  var _useState2 = React.useState(history.location),
-      lastLocation = _useState2[0],
-      setLastLocation = _useState2[1];
-
-  var closeModal = function closeModal() {
-    setStatus('ALLOW');
-  };
-
-  var allowNavigation = function allowNavigation(nextLocation) {
-    if (shouldBlockNavigation(nextLocation) && status === 'ALLOW') {
-      setStatus('BLOCKED');
-      setLastLocation(nextLocation);
-      return false;
+  util.assertIsDefined(reactRouterDom.useInRouterContext() ? true : undefined, "RouteLeavingGuard must be used within a data router.");
+  var blocker = reactRouterDom.useBlocker(function (_ref2) {
+    var currentLocation = _ref2.currentLocation,
+        nextLocation = _ref2.nextLocation;
+    return currentLocation.pathname !== nextLocation.pathname && shouldBlockNavigation(nextLocation);
+  });
+  return React__default["default"].createElement(ConfirmModal, _extends({
+    onDismiss: function onDismiss() {
+      if (blocker.state === 'blocked') {
+        blocker.reset();
+      }
+    },
+    open: blocker.state === 'blocked',
+    onConfirm: function onConfirm() {
+      if (blocker.state === 'blocked') {
+        blocker.proceed();
+      }
     }
-
-    return true;
-  };
-
-  var handleConfirm = function handleConfirm() {
-    history.push(lastLocation.pathname);
-  };
-
-  return React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(reactRouterDom.Prompt, {
-    message: allowNavigation
-  }), React__default["default"].createElement(ConfirmModal, _extends({
-    onDismiss: closeModal,
-    open: status === 'BLOCKED',
-    onConfirm: handleConfirm
-  }, rest), children));
+  }, rest), children);
 };
 
 var Pager = function Pager(_ref) {
@@ -1044,19 +1038,11 @@ var PermissionCheckedRoute = function PermissionCheckedRoute(_ref) {
       onReject = _ref.onReject,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
 
-  var redirect = React__default["default"].createElement(reactRouterDom.Redirect, {
-    to: {
-      pathname: '/unauthorized',
-      state: {
-        from: props.location
-      }
-    }
-  });
   return React__default["default"].createElement(PermissionCheck, {
     permissions: actualPermissions,
     all: all,
     oneOf: oneOf,
-    fallback: onReject ? onReject : redirect
+    fallback: onReject != null ? onReject : reactRouterDom.redirect('/unauthorized')
   }, React__default["default"].createElement(reactRouterDom.Route, _extends({}, props), children));
 };