Revert "[dashboard] disable Bitbucket integration on gitpod.io"

This reverts commit 0867669.
gitpod-io · May 10, 2022 · c7350f1 · c7350f1
1 parent 0867669
commit c7350f1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/components/dashboard/src/App.tsx b/components/dashboard/src/App.tsx
@@ -45,7 +45,6 @@ import {
 import { refreshSearchData } from "./components/RepositoryFinder";
 import { StartWorkspaceModal } from "./workspaces/StartWorkspaceModal";
 import { parseProps } from "./start/StartWorkspace";
-import { isGitpodIo } from "./utils";
 
 const Setup = React.lazy(() => import(/* webpackPrefetch: true */ "./Setup"));
 const Workspaces = React.lazy(() => import(/* webpackPrefetch: true */ "./workspaces/Workspaces"));
@@ -85,6 +84,15 @@ function Loading() {
     return <></>;
 }
 
+function isGitpodIo() {
+    return (
+        window.location.hostname === "gitpod.io" ||
+        window.location.hostname === "gitpod-staging.com" ||
+        window.location.hostname.endsWith("gitpod-dev.com") ||
+        window.location.hostname.endsWith("gitpod-io-dev.com")
+    );
+}
+
 function isWebsiteSlug(pathName: string) {
     const slugs = [
         "about",

diff --git a/components/dashboard/src/admin/License.tsx b/components/dashboard/src/admin/License.tsx
@@ -19,7 +19,6 @@ import { ReactComponent as CheckSvg } from "../images/check.svg";
 import { ReactComponent as LinkSvg } from "../images/external-link.svg";
 import SolidCard from "../components/SolidCard";
 import Card from "../components/Card";
-import { isGitpodIo } from "../utils";
 
 export default function License() {
     const { license, setLicense } = useContext(LicenseContext);
@@ -213,3 +212,7 @@ function communityPlan(userCount: number, seats: number, fallbackAllowed: boolea
 
     return [licenseLevel("Community"), additionalLicenseInfo("Free"), alertMessage(aboveLimit)];
 }
+
+function isGitpodIo() {
+    return window.location.hostname === "gitpod.io" || window.location.hostname === "gitpod-staging.com";
+}
diff --git a/components/dashboard/src/admin/Settings.tsx b/components/dashboard/src/admin/Settings.tsx
@@ -13,7 +13,6 @@ import { getGitpodService } from "../service/service";
 import { adminMenu } from "./admin-menu";
 import { useEffect, useState } from "react";
 import InfoBox from "../components/InfoBox";
-import { isGitpodIo } from "../utils";
 
 export default function Settings() {
     const { adminSettings, setAdminSettings } = useContext(AdminContext);
@@ -70,3 +69,7 @@ export default function Settings() {
         </div>
     );
 }
+
+function isGitpodIo() {
+    return window.location.hostname === "gitpod.io" || window.location.hostname === "gitpod-staging.com";
+}
diff --git a/components/dashboard/src/settings/Integrations.tsx b/components/dashboard/src/settings/Integrations.tsx
@@ -21,7 +21,6 @@ import { PaymentContext } from "../payment-context";
 import { openAuthorizeWindow } from "../provider-utils";
 import { getGitpodService, gitpodHostUrl } from "../service/service";
 import { UserContext } from "../user-context";
-import { isGitpodIo } from "../utils";
 import { SelectAccountModal } from "./SelectAccountModal";
 import getSettingsMenu from "./settings-menu";
 
@@ -765,7 +764,7 @@ export function GitIntegrationModal(
                             >
                                 <option value="GitHub">GitHub</option>
                                 <option value="GitLab">GitLab</option>
-                                {!isGitpodIo() && <option value="Bitbucket">Bitbucket</option>}
+                                <option value="Bitbucket">Bitbucket</option>
                                 <option value="BitbucketServer">Bitbucket Server</option>
                             </select>
                         </div>

diff --git a/components/dashboard/src/utils.ts b/components/dashboard/src/utils.ts
@@ -48,12 +48,3 @@ export const poll = async <T>(
         }
     }
 };
-
-export function isGitpodIo() {
-    return (
-        window.location.hostname === "gitpod.io" ||
-        window.location.hostname === "gitpod-staging.com" ||
-        window.location.hostname.endsWith("gitpod-dev.com") ||
-        window.location.hostname.endsWith("gitpod-io-dev.com")
-    );
-}