[dashboard] Fix user preferences workspace timeouts alert (#20619)

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

components/dashboard/src/data/organizations/default-org-timeout-query.ts

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { WORKSPACE_TIMEOUT_DEFAULT_LONG, WORKSPACE_TIMEOUT_DEFAULT_SHORT } from "@gitpod/gitpod-protocol";
+import { useOrgBillingMode } from "../billing-mode/org-billing-mode-query";
+
+/**
+ * Returns the default workspace timeout for an organization based on their billing mode (does not take into account the organization's own settings)
+ */
+export const useDefaultOrgTimeoutQuery = () => {
+    const { data: billingMode } = useOrgBillingMode();
+
+    const isPaidOrDedicated =
+        billingMode?.mode === "none" || (billingMode?.mode === "usage-based" && billingMode?.paid);
+
+    return isPaidOrDedicated ? WORKSPACE_TIMEOUT_DEFAULT_LONG : WORKSPACE_TIMEOUT_DEFAULT_SHORT;
+};

components/dashboard/src/teams/TeamPolicies.tsx

@@ -31,6 +31,7 @@ import { WorkspaceClassesEnterpriseCallout } from "./policies/WorkspaceClassesEn
 import { EditorOptions } from "./policies/EditorOptions";
 import { RolePermissionsRestrictions } from "./policies/RoleRestrictions";
 import { OrgWorkspaceClassesOptions } from "./policies/OrgWorkspaceClassesOptions";
+import { useDefaultOrgTimeoutQuery } from "../data/organizations/default-org-timeout-query";
 
 export default function TeamPoliciesPage() {
     useDocumentTitle("Organization Settings - Policies");
@@ -46,6 +47,8 @@ export default function TeamPoliciesPage() {
     const [allowTimeoutChangeByMembers, setAllowTimeoutChangeByMembers] = useState<boolean | undefined>(undefined);
     const [workspaceTimeoutSettingError, setWorkspaceTimeoutSettingError] = useState<string | undefined>(undefined);
 
+    const defaultOrgTimeout = useDefaultOrgTimeoutQuery();
+
     const handleUpdateTeamSettings = useCallback(
         async (newSettings: Partial<PlainMessage<OrganizationSettings>>, options?: { throwMutateError?: boolean }) => {
             if (!org?.id) {
@@ -156,7 +159,9 @@ export default function TeamPoliciesPage() {
                                 hint={
                                     <span>
                                         Use minutes or hours, like <span className="font-semibold">30m</span> or{" "}
-                                        <span className="font-semibold">2h</span>
+                                        <span className="font-semibold">2h</span>. If not set, your organization's
+                                        default of <span className="font-semibold">{defaultOrgTimeout}</span> will be
+                                        used.
                                     </span>
                                 }
                             >

components/dashboard/src/user-settings/Preferences.tsx

@@ -25,6 +25,7 @@ import { converter, userClient } from "../service/public-api";
 import { LoadingButton } from "@podkit/buttons/LoadingButton";
 import { useOrgSettingsQuery } from "../data/organizations/org-settings-query";
 import Alert from "../components/Alert";
+import { useDefaultOrgTimeoutQuery } from "../data/organizations/default-org-timeout-query";
 
 export type IDEChangedTrackLocation = "workspace_list" | "workspace_start" | "preferences";
 
@@ -35,7 +36,7 @@ export default function Preferences() {
     const billingMode = useOrgBillingMode();
     const updateDotfileRepo = useUpdateCurrentUserDotfileRepoMutation();
     const { data: settings } = useOrgSettingsQuery();
-
+    const defaultOrgTimeout = useDefaultOrgTimeoutQuery();
     const [dotfileRepo, setDotfileRepo] = useState<string>(user?.dotfileRepo || "");
 
     const [workspaceTimeout, setWorkspaceTimeout] = useState<string>(
@@ -173,7 +174,8 @@ export default function Preferences() {
                         <Alert type="warning" className="mb-4">
                             The currently selected organization does not allow members to set custom workspace timeouts,
                             so for workspaces created in it, its default timeout of{" "}
-                            {converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) || ""} will be used.
+                            {converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) ?? defaultOrgTimeout}{" "}
+                            will be used.
                         </Alert>
                     )}