Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go team... banner for no role case #206

Merged
merged 1 commit into from
Nov 20, 2023
Merged

go team... banner for no role case #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions src/services/ui/src/components/UsaBanner/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { GovernmentBuildingIcon } from "../GovernmentBuildingIcon";
import UsFlag from "@/assets/us_flag_small.png";
import { useMediaQuery } from "@/hooks";
import { useUserContext } from "../Context/userContext";
import { useLoaderData } from "react-router-dom";

export const UsaBanner = () => {
const [isOpen, setIsOpen] = useState(false);
Expand All @@ -21,6 +22,7 @@ export const UsaBanner = () => {
return false;
}
}, []);
const { error } = useLoaderData() as { error: string };
return (
<>
<div className="bg-[#f0f0f0]">
Expand Down Expand Up @@ -72,22 +74,8 @@ export const UsaBanner = () => {
</div>
</button>
)}
{hasRole && (
<div className="w-full px-4 py-1 lg:px-8 text-xs mx-auto flex gap-2 items-center justify-center bg-red-200 ">
<p className="text-center text-base">
You do not have access to view the entire application.{" "}
<a
rel="noreferrer"
href="https://test.home.idm.cms.gov/"
target="_blank"
className="text-blue-600 inline no-underline"
>
Please visit IDM
</a>{" "}
to request the appropriate user role(s).
</p>
</div>
)}
{hasRole && <NoRole />}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so hasrole present <NoRole/> that doesnt make sense

{error?.length > 0 && <NoRole />}

{isOpen && (
<div className="flex flex-col gap-3 px-3 mt-3 sm:flex-row max-w-screen-lg mx-auto pb-4">
Expand Down Expand Up @@ -139,3 +127,22 @@ export const MiniLock = () => {
</svg>
);
};

const NoRole = () => {
return (
<div className="w-full px-4 py-1 lg:px-8 text-xs mx-auto flex gap-2 items-center justify-center bg-red-200 ">
<p className="text-center text-base">
You do not have access to view the entire application.{" "}
<a
rel="noreferrer"
href="https://test.home.idm.cms.gov/"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be an envar

target="_blank"
className="text-blue-600 inline no-underline"
>
Please visit IDM
</a>{" "}
to request the appropriate user role(s).
</p>
</div>
);
};
12 changes: 11 additions & 1 deletion src/services/ui/src/pages/welcome/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,22 @@ import OneMacLogo from "@/assets/onemac_logo.svg";
import * as Heroicons from "@heroicons/react/24/outline";
import { QueryClient } from "@tanstack/react-query";
import { getUser } from "@/api/useGetUser";
import { Link } from "react-router-dom";
import { Link, redirect, useLoaderData } from "react-router-dom";
import { Button } from "@/components/Inputs";
import { ROUTES, FAQ_TARGET } from "@/routes";

export const loader = (queryClient: QueryClient) => {
return async () => {
const queryString = window.location.search;
// Parse the query string to get URL parameters
const queryParams = new URLSearchParams(queryString);
// Access specific parameters
const errorDescription = queryParams.get("error_description");
const error = queryParams.get("error");
if (errorDescription || error) {
console.error("Authentication Error:", { errorDescription, error });
return { error };
}
if (!queryClient.getQueryData(["user"])) {
return await queryClient.fetchQuery({
queryKey: ["user"],
Expand Down
Loading