Skip to content

New Project > Select Repository #4443

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

Merged
merged 1 commit into from
Jun 23, 2021
Merged

New Project > Select Repository #4443

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
25 changes: 22 additions & 3 deletions components/dashboard/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ const CreateWorkspace = React.lazy(() => import(/* webpackPrefetch: true */ './s
const NewTeam = React.lazy(() => import(/* webpackPrefetch: true */ './teams/NewTeam'));
const JoinTeam = React.lazy(() => import(/* webpackPrefetch: true */ './teams/JoinTeam'));
const Members = React.lazy(() => import(/* webpackPrefetch: true */ './teams/Members'));
const NewProject = React.lazy(() => import(/* webpackPrefetch: true */ './projects/NewProject'));
const Projects = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Projects'));
const Project = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Project'));
const Prebuilds = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Prebuilds'));
const Settings = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Settings'));
const InstallGitHubApp = React.lazy(() => import(/* webpackPrefetch: true */ './prebuilds/InstallGitHubApp'));
const FromReferrer = React.lazy(() => import(/* webpackPrefetch: true */ './FromReferrer'));
const UserSearch = React.lazy(() => import(/* webpackPrefetch: true */ './admin/UserSearch'));
Expand Down Expand Up @@ -148,6 +152,7 @@ function App() {
<div className="container">
<Menu />
<Switch>
<Route path="/new" exact component={NewProject} />
<Route path="/setup" exact component={Setup} />
<Route path="/workspaces" exact component={Workspaces} />
<Route path="/account" exact component={Account} />
Expand Down Expand Up @@ -190,11 +195,25 @@ function App() {
<Route exact path={`/${team.slug}`}>
<Redirect to={`/${team.slug}/projects`} />
</Route>
<Route exact path={`/${team.slug}/members`} component={Members} />
<Route exact path={`/${team.slug}/projects`} component={Projects} />
<Route exact path={`/${team.slug}/:maybeProject/:subResource?`} render={(props) => {
const { maybeProject, subResource } = props.match.params;
if (maybeProject === "projects") {
return <Projects />;
}
if (maybeProject === "members") {
return <Members />;
}
if (subResource === "prebuilds") {
return <Prebuilds />;
}
if (subResource === "settings") {
return <Settings />;
}
return <Project />;
}} />
</Route>)}
<Route path="*" render={
(match) => {
(_match) => {

return isGitpodIo() ?
// delegate to our website to handle the request
Expand Down
150 changes: 97 additions & 53 deletions components/dashboard/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { User, TeamMemberInfo } from "@gitpod/gitpod-protocol";
import { useContext, useEffect, useState } from "react";
import { Link, useHistory } from "react-router-dom";
import { useLocation } from "react-router";
import { useLocation, useRouteMatch } from "react-router";
import { Location } from "history";
import gitpodIcon from './icons/gitpod.svg';
import CaretDown from "./icons/CaretDown.svg";
Expand Down Expand Up @@ -39,6 +39,14 @@ export default function Menu() {
const history = useHistory();
const location = useLocation();

const match = useRouteMatch<{ team: string, resource: string }>("/:team/:resource");
const projectName = (() => {
const resource = match?.params?.resource;
if (resource !== "projects" && resource !== "members") {
return resource;
}
})();

const userFullName = user?.fullName || user?.name || '...';
const showTeamsUI = user?.rolesOrPermissions?.includes('teams-and-projects') || window.location.hostname.endsWith('gitpod-dev.com') || window.location.hostname.endsWith('gitpod-io-dev.com');
const team = getCurrentTeam(location, teams);
Expand All @@ -58,32 +66,48 @@ export default function Menu() {
})();
}, [ teams ]);

const leftMenu = (!!team
? [
const leftMenu: Entry[] = (() => {
if (!team) {
return [
{
title: 'Workspaces',
link: '/workspaces',
alternatives: ['/']
},
{
title: 'Settings',
link: '/settings',
alternatives: settingsMenu.flatMap(e => e.link)
}
];
}
return projectName ? [
{
title: 'Projects',
link: `/${team.slug}/projects`,
title: 'Overview',
link: `/${team.slug}/${projectName}`,
alternatives: [`/${team.slug}`]
},
{
title: 'Members',
link: `/${team.slug}/members`
title: 'Prebuilds',
link: `/${team.slug}/${projectName}/prebuilds`
},
{
title: 'Settings',
link: `/${team.slug}/${projectName}/settings`
}
]
: [
] : [
{
title: 'Workspaces',
link: '/workspaces',
alternatives: ['/']
title: 'Projects',
link: `/${team.slug}/projects`,
alternatives: [`/${team.slug}`]
},
{
title: 'Settings',
link: '/settings',
alternatives: settingsMenu.flatMap(e => e.link)
title: 'Members',
link: `/${team.slug}/members`
}
]
);
const rightMenu = [
})();
const rightMenu: Entry[] = [
...(user?.rolesOrPermissions?.includes('admin') ? [{
title: 'Admin',
link: '/admin',
Expand All @@ -99,6 +123,61 @@ export default function Menu() {
}
];

const renderTeamMenu = () => {
return (
<div className="flex p-1 pl-3 ">
<div className="flex h-full rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 px-2 py-1">
<Link to={team ? `/${team.slug}/projects` : "/workspaces"}>

<span className="text-base text-gray-600 dark:text-gray-400 font-semibold">{team?.name || userFullName}</span>
</Link>
</div>
<div className="flex h-full rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 py-1">
<ContextMenu classes="w-64 left-0" menuEntries={[
{
title: userFullName,
customContent: <div className="w-full text-gray-400 flex flex-col">
<span className="text-gray-800 dark:text-gray-100 text-base font-semibold">{userFullName}</span>
<span className="">Personal Account</span>
</div>,
separator: true,
onClick: () => history.push("/"),
},
...(teams || []).map(t => ({
title: t.name,
customContent: <div className="w-full text-gray-400 flex flex-col">
<span className="text-gray-800 dark:text-gray-300 text-base font-semibold">{t.name}</span>
<span className="">{!!teamMembers[t.id]
? `${teamMembers[t.id].length} member${teamMembers[t.id].length === 1 ? '' : 's'}`
: '...'
}</span>
</div>,
separator: true,
onClick: () => history.push(`/${t.slug}`),
})).sort((a, b) => a.title.toLowerCase() > b.title.toLowerCase() ? 1 : -1),
{
title: 'Create a new team',
customContent: <div className="w-full text-gray-400 flex items-center">
<span className="flex-1 font-semibold">New Team</span>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14" className="w-3.5"><path fill="currentColor" fill-rule="evenodd" d="M7 0a1 1 0 011 1v5h5a1 1 0 110 2H8v5a1 1 0 11-2 0V8H1a1 1 0 010-2h5V1a1 1 0 011-1z" clip-rule="evenodd" /></svg>
</div>,
onClick: () => history.push("/new-team"),
}
]}>
<div className="flex h-full p-2 mt-0.5">
<img className="filter-grayscale m-auto" src={CaretDown} />
</div>
</ContextMenu>
</div>
{ projectName && (
<div className="flex h-full ml-2 py-1">
<span className="text-base text-gray-600 dark:text-gray-400 font-semibold">{projectName}</span>
</div>
)}
</div>
)
}

return <>
<header className="lg:px-28 px-10 flex flex-col pt-4 space-y-4">
<div className="flex">
Expand All @@ -108,42 +187,7 @@ export default function Menu() {
</Link>
<div className="ml-2 text-base">
{showTeamsUI
? <ContextMenu classes="w-64 left-0" menuEntries={[
{
title: userFullName,
customContent: <div className="w-full text-gray-400 flex flex-col">
<span className="text-gray-800 dark:text-gray-100 text-base font-semibold">{userFullName}</span>
<span className="">Personal Account</span>
</div>,
separator: true,
onClick: () => history.push("/"),
},
...(teams || []).map(t => ({
title: t.name,
customContent: <div className="w-full text-gray-400 flex flex-col">
<span className="text-gray-800 dark:text-gray-300 text-base font-semibold">{t.name}</span>
<span className="">{!!teamMembers[t.id]
? `${teamMembers[t.id].length} member${teamMembers[t.id].length === 1 ? '' : 's'}`
: '...'
}</span>
</div>,
separator: true,
onClick: () => history.push(`/${t.slug}`),
})).sort((a,b) => a.title.toLowerCase() > b.title.toLowerCase() ? 1 : -1),
{
title: 'Create a new team',
customContent: <div className="w-full text-gray-400 flex items-center">
<span className="flex-1 font-semibold">New Team</span>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14" className="w-3.5"><path fill="currentColor" fill-rule="evenodd" d="M7 0a1 1 0 011 1v5h5a1 1 0 110 2H8v5a1 1 0 11-2 0V8H1a1 1 0 010-2h5V1a1 1 0 011-1z" clip-rule="evenodd"/></svg>
</div>,
onClick: () => history.push("/new-team"),
}
]}>
<div className="flex p-1.5 pl-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800">
<span className="text-base text-gray-600 dark:text-gray-400 font-semibold">{team?.name || userFullName}</span>
<img className="m-2 filter-grayscale" src={CaretDown}/>
</div>
</ContextMenu>
? renderTeamMenu()
: <nav className="flex-1">
<ul className="flex flex-1 items-center justify-between text-base text-gray-700 space-x-2">
<li className="flex-1"></li>
Expand Down
3 changes: 3 additions & 0 deletions components/dashboard/src/icons/Plus.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions components/dashboard/src/icons/Switch.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions components/dashboard/src/icons/search.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading