refactor. props in UserHasAccess component

openmrs · Jul 6, 2022 · 87a89e1 · 87a89e1
1 parent bb61737
commit 87a89e1
Showing 1 changed file with 4 additions and 23 deletions.
diff --git a/packages/framework/esm-react-utils/src/UserHasAccess.tsx b/packages/framework/esm-react-utils/src/UserHasAccess.tsx
@@ -1,18 +1,15 @@
 /** @module @category API */
 import { getCurrentUser, LoggedInUser, userHasAccess } from "@openmrs/esm-api";
-import { InlineNotification } from "carbon-components-react";
 import React, { useEffect, useState } from "react";
 
-export interface UserHasAccessProps {
+interface UserHasAccessProps {
   privilege: string;
-  unauthorisedResponse?: string | undefined;
-  redirectUrl?: string | undefined;
+  unauthorisedResponse?: React.ReactNode | undefined;
 }
 
 export const UserHasAccess: React.FC<UserHasAccessProps> = ({
   privilege,
   unauthorisedResponse,
-  redirectUrl,
   children,
 }) => {
   const [user, setUser] = useState<LoggedInUser | null>(null);
@@ -26,23 +23,7 @@ export const UserHasAccess: React.FC<UserHasAccessProps> = ({
 
   if (user && userHasAccess(privilege, user)) {
     return <>{children}</>;
+  } else {
+    return unauthorisedResponse ? <>{unauthorisedResponse}</> : null;
   }
-
-  if (unauthorisedResponse) {
-    return (
-      <div className="omrs-inline-notifications-container">
-        <InlineNotification
-          title="Unauthorised"
-          subtitle={unauthorisedResponse}
-          kind="error"
-        />
-      </div>
-    );
-  }
-
-  if (redirectUrl) {
-    window.location.replace(redirectUrl);
-  }
-
-  return null;
 };