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

[dashboard] keep team selection #13318

Merged
merged 1 commit into from
Sep 28, 2022
Merged

[dashboard] keep team selection #13318

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
4 changes: 2 additions & 2 deletions components/dashboard/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Redirect, Route, Switch } from "react-router";

import { Login } from "./Login";
import { UserContext } from "./user-context";
import { TeamsContext } from "./teams/teams-context";
import { getSelectedTeamSlug, TeamsContext } from "./teams/teams-context";
import { ThemeContext } from "./theme-context";
import { getGitpodService } from "./service/service";
import { shouldSeeWhatsNew, WhatsNew } from "./whatsnew/WhatsNew";
Expand Down Expand Up @@ -179,7 +179,7 @@ function App() {
const isRoot = window.location.pathname === "/" && hash === "";
if (isRoot) {
try {
const teamSlug = localStorage.getItem("team-selection");
const teamSlug = getSelectedTeamSlug();
if (teams.some((t) => t.slug === teamSlug)) {
history.push(`/t/${teamSlug}`);
}
Expand Down
47 changes: 15 additions & 32 deletions components/dashboard/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { countries } from "countries-list";
import gitpodIcon from "./icons/gitpod.svg";
import { getGitpodService, gitpodHostUrl } from "./service/service";
import { UserContext } from "./user-context";
import { TeamsContext, getCurrentTeam } from "./teams/teams-context";
import { TeamsContext, getCurrentTeam, getSelectedTeamSlug } from "./teams/teams-context";
import getSettingsMenu from "./settings/settings-menu";
import { getAdminMenu } from "./admin/admin-menu";
import ContextMenu from "./components/ContextMenu";
Expand Down Expand Up @@ -92,13 +92,6 @@ export default function Menu() {

const userFullName = user?.fullName || user?.name || "...";

{
// updating last team selection
try {
localStorage.setItem("team-selection", team ? team.slug : "");
} catch {}
}

// Hide most of the top menu when in a full-page form.
const isMinimalUI = inResource(location.pathname, ["new", "teams/new", "open"]);
const isWorkspacesUI = inResource(location.pathname, ["workspaces"]);
Expand Down Expand Up @@ -260,33 +253,23 @@ export default function Menu() {
const onFeedbackFormClose = () => {
setFeedbackFormVisible(false);
};
const isTeamLevelActive = !projectSlug && !isWorkspacesUI && !isAdminUI && teamOrUserSlug;
const renderTeamMenu = () => {
const classes =
"flex h-full text-base py-0 " +
(!projectSlug && !isWorkspacesUI && !isAdminUI && teamOrUserSlug
? "text-gray-50 bg-gray-800 dark:text-gray-900 dark:bg-gray-50 border-gray-700"
: "text-gray-500 bg-gray-50 dark:bg-gray-800 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 dark:border-gray-700");
(isTeamLevelActive
? "text-gray-50 bg-gray-800 dark:bg-gray-50 dark:text-gray-900 border-gray-700 dark:border-gray-200"
: "text-gray-500 bg-gray-50 dark:bg-gray-800 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 dark:border-gray-700");
return (
<div className="flex p-1 pl-3">
{projectSlug && (
<Link to={team ? `/t/${team.slug}/projects` : `/projects`}>
<span
className={`${classes} rounded-tl-2xl rounded-bl-2xl dark:border-gray-700 border-r pl-3 pr-2 py-1 bg-gray-50 font-semibold`}
>
{team?.name || userFullName}
</span>
</Link>
)}
{!projectSlug && (
<Link to={team ? `/t/${team.slug}/projects` : `/projects`}>
<span
className={`${classes} rounded-tl-2xl rounded-bl-2xl dark:border-gray-200 border-r pl-3 pr-2 py-1 bg-gray-50 font-semibold`}
>
{team?.name || userFullName}
</span>
</Link>
)}
<div className={`${classes} rounded-tr-2xl rounded-br-2xl dark:border-gray-700 px-1 bg-gray-50`}>
<Link to={getSelectedTeamSlug() ? `/t/${getSelectedTeamSlug()}/projects` : `/projects`}>
<span
className={`${classes} rounded-tl-2xl rounded-bl-2xl border-r pl-3 pr-2 py-1 bg-gray-50 font-semibold`}
>
{teams?.find((t) => t.slug === getSelectedTeamSlug())?.name || userFullName}
Copy link
Contributor

@gtsiolis gtsiolis Sep 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

issue: I can no longer select personal account, although you get redirected to the projects of the personal account when you select your personal account from the dropdown. 😭

Copy link
Contributor

Choose a reason for hiding this comment

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

issue: Going from workspaces back to the team-scope always goes back to the personal account projects, regardless what the selected team scope is. This should get you back to the projects of the last selected team, right?

</span>
</Link>
<div className={`${classes} rounded-tr-2xl rounded-br-2xl px-1`}>
<ContextMenu
customClasses="w-64 left-0"
menuEntries={[
Expand All @@ -300,7 +283,7 @@ export default function Menu() {
<span className="">Personal Account</span>
</div>
),
active: !team,
active: getSelectedTeamSlug() === "",
separator: true,
link: "/projects",
},
Expand All @@ -321,7 +304,7 @@ export default function Menu() {
</span>
</div>
),
active: team && team.id === t.id,
active: getSelectedTeamSlug() === t.slug,
separator: true,
link: `/t/${t.slug}`,
}))
Expand Down
15 changes: 12 additions & 3 deletions components/dashboard/src/teams/teams-context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,18 @@ export const TeamsContextProvider: React.FC = ({ children }) => {
};

export function getCurrentTeam(location: Location<any>, teams?: Team[]): Team | undefined {
const slug = location.pathname.startsWith("/t/") ? location.pathname.split("/")[2] : undefined;
if (!slug || !teams) {
if (!teams) {
return;
}
return teams.find((t) => t.slug === slug);
const slug = location.pathname.startsWith("/t/") ? location.pathname.split("/")[2] : undefined;
if (slug === undefined && ["projects", "usage", "settings"].indexOf(location.pathname.split("/")[1]) === -1) {
return undefined;
}
const team = teams.find((t) => t.slug === slug);
localStorage.setItem("team-selection", team?.slug || "");
return team;
}

export function getSelectedTeamSlug(): string {
return localStorage.getItem("team-selection") || "";
}