[dashboard, server] Remove "sinlgeOrgMode"

Author: geropl

components/dashboard/src/Login.tsx

@@ -311,10 +311,7 @@ const LoginContent = ({
                         </LoginButton>
                     ))
                 )}
-                <SSOLoginForm
-                    onSuccess={authorizeSuccessful}
-                    singleOrgMode={!!authProviders.data && authProviders.data.length === 0}
-                />
+                <SSOLoginForm onSuccess={authorizeSuccessful} />
             </div>
             {errorMessage && <ErrorMessage imgSrc={exclamation} message={errorMessage} />}
         </div>

components/dashboard/src/dedicated-setup/use-needs-setup.ts

@@ -32,7 +32,7 @@ export const useNeedsSetup = () => {
     };
 };
 
-const useOnboardingState = () => {
+export const useOnboardingState = () => {
     const { data: installationConfig } = useInstallationConfiguration();
 
     return useQuery(

components/dashboard/src/login/SSOLoginForm.tsx

@@ -12,9 +12,9 @@ import { useOnBlurError } from "../hooks/use-onblur-error";
 import { openOIDCStartWindow } from "../provider-utils";
 import { useFeatureFlag } from "../data/featureflag-query";
 import { useLocation } from "react-router";
+import { useOnboardingState } from "../dedicated-setup/use-needs-setup";
 
 type Props = {
-    singleOrgMode?: boolean;
     onSuccess: () => void;
 };
 
@@ -27,8 +27,10 @@ function getOrgSlugFromPath(path: string) {
     return pathSegments[2];
 }
 
-export const SSOLoginForm: FC<Props> = ({ singleOrgMode, onSuccess }) => {
+export const SSOLoginForm: FC<Props> = ({ onSuccess }) => {
     const location = useLocation();
+    const { data: onboardingState } = useOnboardingState();
+    const singleOrgMode = (onboardingState?.organizationCountTotal || 0) < 2;
 
     const [orgSlug, setOrgSlug] = useState(
         getOrgSlugFromPath(location.pathname) || window.localStorage.getItem("sso-org-slug") || "",

components/gitpod-db/src/team-db.ts

@@ -18,7 +18,7 @@ export const TeamDB = Symbol("TeamDB");
 export interface TeamDB extends TransactionalDB<TeamDB> {
     findTeams(
         offset: number,
-        limit: number,
+        limit: number | undefined,
         orderBy: keyof Team,
         orderDir: "ASC" | "DESC",
         searchTerm?: string,

components/gitpod-db/src/typeorm/team-db-impl.ts

@@ -58,7 +58,7 @@ export class TeamDBImpl extends TransactionalDBImpl<TeamDB> implements TeamDB {
 
     public async findTeams(
         offset: number,
-        limit: number,
+        limit: number | undefined,
         orderBy: keyof Team,
         orderDir: "DESC" | "ASC",
         searchTerm?: string,
@@ -70,7 +70,11 @@ export class TeamDBImpl extends TransactionalDBImpl<TeamDB> implements TeamDB {
                 searchTerm: `%${searchTerm}%`,
             });
         }
-        queryBuilder = queryBuilder.andWhere("markedDeleted = 0").skip(offset).take(limit).orderBy(orderBy, orderDir);
+        queryBuilder = queryBuilder.andWhere("markedDeleted = 0").skip(offset);
+        if (limit) {
+            queryBuilder = queryBuilder.take(limit);
+        }
+        queryBuilder = queryBuilder.orderBy(orderBy, orderDir);
 
         const [rows, total] = await queryBuilder.getManyAndCount();
         return { total, rows };

components/gitpod-protocol/src/gitpod-service.ts

@@ -489,11 +489,10 @@ export namespace GitpodServer {
          * Whether this Gitpod instance is already configured with SSO.
          */
         readonly isCompleted: boolean;
-
         /**
-         * Whether this Gitpod instance has at least one org.
+         * Total number of organizations.
          */
-        readonly hasAnyOrg: boolean;
+        readonly organizationCountTotal: number;
     }
 }
 

components/public-api/gitpod/v1/installation.proto

@@ -42,7 +42,11 @@ message GetOnboardingStateResponse {
 }
 
 message OnboardingState {
+  // Whether at least one organization has completed the onboarding
   bool completed = 1;
+
+  // The total number of organizations
+  int32 organization_count_total = 2;
 }
 
 message GetInstallationWorkspaceDefaultImageRequest {}