Skip to content

fix: resolve React hydration errors preventing app startup #342

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

Open
EnthusiAD wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve React hydration errors preventing app startup #342

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
9 changes: 5 additions & 4 deletions src/components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import { getFossologyVersion } from "@/services/info";
import { getSessionStorage, setSessionStorage } from "@/shared/storageHelper";

const Footer = () => {
const [version, setVersion] = useState(
getSessionStorage("fossologyVersion") || null
);
const [version, setVersion] = useState(null);

const fetchVersion = () => {
return getFossologyVersion()
Expand All @@ -36,7 +34,10 @@ const Footer = () => {
};

useEffect(() => {
if (!version) {
const storedVersion = getSessionStorage("fossologyVersion");
if (storedVersion) {
setVersion(storedVersion);
} else {
fetchVersion();
}
}, []);
Expand Down
31 changes: 25 additions & 6 deletions src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ export default function Header() {
const [isHelpOpen, setIsHelpOpen] = useState(false);
const [isGroupOpen, setIsGroupOpen] = useState(false);
const [isGroupSelectOpen, setIsGroupSelectOpen] = useState(false);
const [isAuthenticated, setIsAuthenticated] = useState(false);
const [userIsAdmin, setUserIsAdmin] = useState(false);
const [userName, setUserName] = useState("");
const [groups, setGroups] = useState([]);

const isHomeActive = pathname === routes.home;

Expand All @@ -74,6 +78,21 @@ export default function Header() {
const isHelpActive = (isHelpOpen || pathname.startsWith("/help"));

useEffect(() => {
const authStatus = isAuth();
setIsAuthenticated(authStatus);
setUserIsAdmin(isAdmin());
if (authStatus) {
try {
setUserName(getUserName());
const groupsData = getAllGroups();
if (groupsData) {
setGroups(groupsData);
}
} catch (error) {
console.error("Failed to get user name:", error);
}
}

const defaultGroup =
getLocalStorage("currentGroup") ||
getLocalStorage("user")?.default_group;
Expand All @@ -94,7 +113,7 @@ export default function Header() {
{/* Navigation Menu */}
<nav className="hidden md:flex">
<Link href={routes.home} className={clsx("flex items-center h-13 p-4 justify-between", !isHomeActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Home</Link>
{isAuth() && (
{isAuthenticated && (
<>
<Link href={routes.search} className={clsx("flex items-center h-13 p-4 justify-between", !isSearchActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Search</Link>
<Link href={routes.browse} className={clsx("flex items-center h-13 p-4 justify-between", !isBrowseActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Browse</Link>
Expand Down Expand Up @@ -158,7 +177,7 @@ export default function Header() {
<DropdownMenuItem asChild className="focus:bg-[#EDEDED] focus:text-gray-900 focus:font-bold">
<Link href={routes.jobs.myRecentJobs}>My Recent Jobs</Link>
</DropdownMenuItem>
{isAdmin() && (
{userIsAdmin && (
<DropdownMenuItem asChild className="focus:bg-[#EDEDED] focus:text-gray-900 focus:font-bold">
<Link href={routes.jobs.allRecentJobs}>All Recent Jobs</Link>
</DropdownMenuItem>
Expand Down Expand Up @@ -241,7 +260,7 @@ export default function Header() {
</DropdownMenu>

{/* Admin Dropdown */}
{isAdmin() && (
{userIsAdmin && (
<DropdownMenu open={isAdminOpen} onOpenChange={setIsAdminOpen}>
<DropdownMenuTrigger
onClick={(e) => {
Expand Down Expand Up @@ -473,7 +492,7 @@ export default function Header() {
{/* Right Side Icons */}
<div className="flex items-center gap-6 text-sm text-gray-800">
{/* Group Dropdown */}
{getAllGroups() && (
{groups.length > 0 && (
<DropdownMenu open={isGroupOpen} onOpenChange={setIsGroupOpen}>
<DropdownMenuTrigger
onClick={(e) => {
Expand Down Expand Up @@ -537,7 +556,7 @@ export default function Header() {

{isGroupSelectOpen && (
<div className="mt-1 border rounded-[4px] border-[#CECECE] shadow bg-white overflow-hidden">
{getAllGroups().map((group) => (
{groups.map((group) => (
<div
key={group.id}
onClick={() => {
Expand All @@ -558,7 +577,7 @@ export default function Header() {

{/* User Info */}
<div className="text-sm mt-2">
<span className="font-semibold">User:</span> {getUserName()}
<span className="font-semibold">User:</span> {userName}
</div>

{/* Logout Button */}
Expand Down