[server, dashboard] Remove enableDedicatedOnboardingFlow feature flag and replace is with getInstallationConfiguration.IsDedicatedInstallation

Author: geropl

components/dashboard/src/data/featureflag-query.ts

@@ -15,7 +15,6 @@ const featureFlags = {
     // Default to true to enable on gitpod dedicated until ff support is added for dedicated
     orgGitAuthProviders: true,
     userGitAuthProviders: false,
-    enableDedicatedOnboardingFlow: false,
     // Local SSH feature of VS Code Desktop Extension
     gitpod_desktop_use_local_ssh_proxy: false,
     enabledOrbitalDiscoveries: "",

components/dashboard/src/data/installation/default-workspace-image-query.ts

@@ -17,3 +17,14 @@ export const useInstallationDefaultWorkspaceImageQuery = () => {
         },
     });
 };
+
+export const useInstallationConfiguration = () => {
+    return useQuery({
+        queryKey: ["installation-configuration"],
+        staleTime: 1000 * 60 * 10, // 10 minute
+        queryFn: async () => {
+            const response = await installationClient.getInstallationConfiguration({});
+            return response.configuration;
+        },
+    });
+};

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

@@ -5,17 +5,18 @@
  */
 
 import { useQuery } from "@tanstack/react-query";
-import { useFeatureFlag } from "../data/featureflag-query";
 import { noPersistence } from "../data/setup";
 import { installationClient } from "../service/public-api";
 import { GetOnboardingStateRequest } from "@gitpod/public-api/lib/gitpod/v1/installation_pb";
+import { useInstallationConfiguration } from "../data/installation/default-workspace-image-query";
 
 /**
  * @description Returns a flage stating if the current installation still needs setup before it can be used. Also returns an isLoading indicator as the check is async
  */
 export const useNeedsSetup = () => {
     const { data: onboardingState, isLoading } = useOnboardingState();
-    const enableDedicatedOnboardingFlow = useFeatureFlag("enableDedicatedOnboardingFlow");
+    const { data: installationConfig } = useInstallationConfiguration();
+    const isDedicatedInstallation = !!installationConfig?.isDedicatedInstallation;
 
     // This needs to only be true if we've loaded the onboarding state
     let needsSetup = !isLoading && onboardingState && onboardingState.completed !== true;
@@ -25,14 +26,14 @@ export const useNeedsSetup = () => {
     }
 
     return {
-        needsSetup: enableDedicatedOnboardingFlow && needsSetup,
+        needsSetup: isDedicatedInstallation && needsSetup,
         // disabled queries stay in `isLoading` state, so checking feature flag here too
-        isLoading: enableDedicatedOnboardingFlow && isLoading,
+        isLoading: isDedicatedInstallation && isLoading,
     };
 };
 
 const useOnboardingState = () => {
-    const enableDedicatedOnboardingFlow = useFeatureFlag("enableDedicatedOnboardingFlow");
+    const { data: installationConfig } = useInstallationConfiguration();
 
     return useQuery(
         noPersistence(["onboarding-state"]),
@@ -42,7 +43,7 @@ const useOnboardingState = () => {
         },
         {
             // Only query if feature flag is enabled
-            enabled: enableDedicatedOnboardingFlow,
+            enabled: !!installationConfig?.isDedicatedInstallation,
         },
     );
 };

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

@@ -5,9 +5,9 @@
  */
 
 import { useQueryParams } from "../hooks/use-query-params";
-import { useFeatureFlag } from "../data/featureflag-query";
 import { useCallback, useState } from "react";
 import { isCurrentHostExcludedFromSetup, useNeedsSetup } from "./use-needs-setup";
+import { useInstallationConfiguration } from "../data/installation/default-workspace-image-query";
 
 const FORCE_SETUP_PARAM = "dedicated-setup";
 const FORCE_SETUP_PARAM_VALUE = "force";
@@ -21,7 +21,8 @@ export const useShowDedicatedSetup = () => {
     // again in case onboarding state isn't updated right away
     const [inProgress, setInProgress] = useState(false);
 
-    const enableDedicatedOnboardingFlow = useFeatureFlag("enableDedicatedOnboardingFlow");
+    const { data: installationConfig } = useInstallationConfiguration();
+    const enableDedicatedOnboardingFlow = !!installationConfig?.isDedicatedInstallation;
     const params = useQueryParams();
 
     const { needsSetup } = useNeedsSetup();

components/dashboard/src/menu/OrganizationSelector.tsx

@@ -11,10 +11,10 @@ import { useCurrentUser } from "../user-context";
 import { useCurrentOrg, useOrganizations } from "../data/organizations/orgs-query";
 import { useLocation } from "react-router";
 import { useOrgBillingMode } from "../data/billing-mode/org-billing-mode-query";
-import { useFeatureFlag } from "../data/featureflag-query";
 import { useIsOwner, useListOrganizationMembers, useHasRolePermission } from "../data/organizations/members-query";
 import { isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 import { OrganizationRole } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { useInstallationConfiguration } from "../data/installation/default-workspace-image-query";
 
 export default function OrganizationSelector() {
     const user = useCurrentUser();
@@ -25,7 +25,8 @@ export default function OrganizationSelector() {
     const hasMemberPermission = useHasRolePermission(OrganizationRole.MEMBER);
     const { data: billingMode } = useOrgBillingMode();
     const getOrgURL = useGetOrgURL();
-    const isDedicated = useFeatureFlag("enableDedicatedOnboardingFlow");
+    const { data: installationConfig } = useInstallationConfiguration();
+    const isDedicated = !!installationConfig?.isDedicatedInstallation;
 
     // we should have an API to ask for permissions, until then we duplicate the logic here
     const canCreateOrgs = user && !isOrganizationOwned(user) && !isDedicated;

components/dashboard/src/service/json-rpc-installation-client.ts

@@ -22,6 +22,8 @@ import {
     GetInstallationWorkspaceDefaultImageResponse,
     GetOnboardingStateRequest,
     GetOnboardingStateResponse,
+    GetInstallationConfigurationRequest,
+    GetInstallationConfigurationResponse,
 } from "@gitpod/public-api/lib/gitpod/v1/installation_pb";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { getGitpodService } from "./service";
@@ -130,4 +132,14 @@ export class JsonRpcInstallationClient implements PromiseClient<typeof Installat
             onboardingState: converter.toOnboardingState(info),
         });
     }
+
+    async getInstallationConfiguration(
+        request: Partial<GetInstallationConfigurationRequest>,
+        _options?: CallOptions | undefined,
+    ): Promise<GetInstallationConfigurationResponse> {
+        const config = await getGitpodService().server.getConfiguration();
+        return new GetInstallationConfigurationResponse({
+            configuration: converter.toInstallationConfiguration(config),
+        });
+    }
 }

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

@@ -31,6 +31,9 @@ service InstallationService {
 
   // GetOnboardingState returns the onboarding state of the installation.
   rpc GetOnboardingState(GetOnboardingStateRequest) returns (GetOnboardingStateResponse) {}
+
+  // GetInstallationConfiguration returns configuration of the installation.
+  rpc GetInstallationConfiguration(GetInstallationConfigurationRequest) returns (GetInstallationConfigurationResponse) {}
 }
 
 message GetOnboardingStateRequest {}
@@ -144,3 +147,11 @@ message BlockedEmailDomain {
 
   bool negative = 3;
 }
+
+message GetInstallationConfigurationRequest {}
+message GetInstallationConfigurationResponse {
+  InstallationConfiguration configuration = 1;
+}
+message InstallationConfiguration {
+  bool is_dedicated_installation = 1;
+}