Skip to content

Commit 51eeef4

Browse files
committed
[dashboard] show error message on new project for Bitbucket-only users
Fixes #6345
1 parent 64f4da8 commit 51eeef4

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

components/dashboard/src/projects/NewProject.tsx

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ export default function NewProject() {
4545
setProvider("gitlab.com");
4646
} else if (user.identities.find(i => i.authProviderId === "Public-GitHub")) {
4747
setProvider("github.com");
48+
} else if (user.identities.find(i => i.authProviderId == "Public-Bitbucket")) {
49+
setProvider("bitbucket.org");
4850
}
4951
}
5052
}, [user]);
@@ -85,7 +87,7 @@ export default function NewProject() {
8587
}, [selectedAccount]);
8688

8789
useEffect(() => {
88-
if (!provider) {
90+
if (!provider || isBitbucket()) {
8991
return;
9092
}
9193
(async () => {
@@ -100,9 +102,10 @@ export default function NewProject() {
100102
}, [provider]);
101103

102104
const isGitHub = () => provider === "github.com";
105+
const isBitbucket = () => provider == "bitbucket.org";
103106

104107
const updateReposInAccounts = async (installationId?: string) => {
105-
if (!provider) {
108+
if (!provider || isBitbucket()) {
106109
return [];
107110
}
108111
try {
@@ -159,7 +162,7 @@ export default function NewProject() {
159162
}
160163

161164
const createProject = async (teamOrUser: Team | User, selectedRepo: string) => {
162-
if (!provider) {
165+
if (!provider || isBitbucket()) {
163166
return;
164167
}
165168
const repo = reposInAccounts.find(r => r.account === selectedAccount && r.path === selectedRepo);
@@ -388,17 +391,25 @@ export default function NewProject() {
388391
</>)
389392
};
390393

391-
return (<div className="flex flex-col w-96 mt-24 mx-auto items-center">
392-
<h1>New Project</h1>
393-
<p className="text-gray-500 text-center text-base">Select a Git repository on <strong>{provider}</strong>. (<a className="gp-link cursor-pointer" onClick={() => setShowGitProviders(true)}>change</a>)</p>
394+
if (isBitbucket()) {
395+
return (<div className="flex flex-col w-96 mt-24 mx-auto items-center">
396+
<h1>We are still working working on Bitbucket support for Projects</h1>
397+
<p className="text-gray-500 text-center text-base">Continue to <a href="/workspaces" className="gp-link">workspaces</a>, or login with <a href={gitpodHostUrl.asApiLogout().toString()} className="gp-link">GitHub</a> or <a href={gitpodHostUrl.asApiLogout().toString()} className="gp-link">GitLab</a> to use Projects</p>
398+
</div>);
394399

395-
{!selectedRepo && renderSelectRepository()}
400+
} else {
401+
return (<div className="flex flex-col w-96 mt-24 mx-auto items-center">
402+
<h1>New Project</h1>
403+
<p className="text-gray-500 text-center text-base">Select a Git repository on <strong>{provider}</strong>. (<a className="gp-link cursor-pointer" onClick={() => setShowGitProviders(true)}>change</a>)</p>
396404

397-
{selectedRepo && !selectedTeamOrUser && renderSelectTeam()}
405+
{!selectedRepo && renderSelectRepository()}
398406

399-
{selectedRepo && selectedTeamOrUser && (<div></div>)}
407+
{selectedRepo && !selectedTeamOrUser && renderSelectTeam()}
400408

401-
</div>);
409+
{selectedRepo && selectedTeamOrUser && (<div></div>)}
410+
411+
</div>);
412+
}
402413

403414
}
404415

components/dashboard/src/settings/Integrations.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function GitProviders() {
155155
setUser(user);
156156
}
157157

158-
const doAuthorize = async (host: string, scopes?: string[]) => {
158+
const ª = async (host: string, scopes?: string[]) => {
159159
try {
160160
await openAuthorizeWindow({
161161
host,

0 commit comments

Comments
 (0)