Rename isPaidPlan to isPaidOrDedicated and get rid of update_max_parallel_running_workspaces

Author: filiptronicek

components/dashboard/src/data/organizations/update-org-settings-mutation.ts

@@ -60,7 +60,6 @@ export const useUpdateOrgSettingsMutation = () => {
                 roleRestrictions,
                 updateRoleRestrictions: !!roleRestrictions,
                 maxParallelRunningWorkspaces,
-                updateMaxParallelRunningWorkspaces: maxParallelRunningWorkspaces !== undefined,
             });
             return settings.settings!;
         },

components/dashboard/src/teams/TeamPolicies.tsx

@@ -122,7 +122,7 @@ export default function TeamPoliciesPage() {
         [workspaceTimeout, allowTimeoutChangeByMembers, handleUpdateTeamSettings],
     );
 
-    const isPaidPlan =
+    const isPaidOrDedicated =
         billingMode.data?.mode === "none" || (billingMode.data?.mode === "usage-based" && billingMode.data?.paid);
 
     return (
@@ -157,7 +157,7 @@ export default function TeamPoliciesPage() {
 
                     <ConfigurationSettingsField>
                         <Heading3>Workspace timeouts</Heading3>
-                        {!isPaidPlan && (
+                        {!isPaidOrDedicated && (
                             <Alert type="info" className="my-3">
                                 Setting Workspace timeouts is only available for organizations on a paid plan. Visit{" "}
                                 <Link to={"/billing"} className="gp-link">
@@ -181,7 +181,7 @@ export default function TeamPoliciesPage() {
                                     value={workspaceTimeout ?? ""}
                                     placeholder="e.g. 30m"
                                     onChange={setWorkspaceTimeout}
-                                    disabled={updateTeamSettings.isLoading || !isOwner || !isPaidPlan}
+                                    disabled={updateTeamSettings.isLoading || !isOwner || !isPaidOrDedicated}
                                 />
                             </InputField>
                             <CheckboxInputField
@@ -190,14 +190,14 @@ export default function TeamPoliciesPage() {
                                 checked={!!allowTimeoutChangeByMembers}
                                 containerClassName="my-4"
                                 onChange={setAllowTimeoutChangeByMembers}
-                                disabled={updateTeamSettings.isLoading || !isOwner || !isPaidPlan}
+                                disabled={updateTeamSettings.isLoading || !isOwner || !isPaidOrDedicated}
                             />
                             <LoadingButton
                                 type="submit"
                                 loading={updateTeamSettings.isLoading}
                                 disabled={
                                     !isOwner ||
-                                    !isPaidPlan ||
+                                    !isPaidOrDedicated ||
                                     (workspaceTimeout ===
                                         converter.toDurationString(settings?.timeoutSettings?.inactivity) &&
                                         allowTimeoutChangeByMembers === !settings?.timeoutSettings?.denyUserTimeouts)
@@ -213,7 +213,7 @@ export default function TeamPoliciesPage() {
                         isLoading={updateTeamSettings.isLoading}
                         settings={settings}
                         handleUpdateTeamSettings={handleUpdateTeamSettings}
-                        isPaidPlan={isPaidPlan}
+                        isPaidOrDedicated={isPaidOrDedicated}
                     />
 
                     <OrgWorkspaceClassesOptions

components/dashboard/src/teams/policies/MaxParallelWorkspaces.tsx

@@ -18,7 +18,7 @@ import { useInstallationConfiguration } from "../../data/installation/default-wo
 type Props = {
     isOwner: boolean;
     isLoading: boolean;
-    isPaidPlan: boolean;
+    isPaidOrDedicated: boolean;
     settings?: OrganizationSettings;
     handleUpdateTeamSettings: (
         newSettings: Partial<PlainMessage<OrganizationSettings>>,
@@ -32,15 +32,15 @@ export const MaxParallelWorkspaces = ({
     isOwner,
     isLoading,
     settings,
-    isPaidPlan,
+    isPaidOrDedicated,
     handleUpdateTeamSettings,
 }: Props) => {
     const [error, setError] = useState<string | undefined>(undefined);
     const [maxParallelWorkspaces, setMaxParallelWorkspaces] = useState<number>(
         settings?.maxParallelRunningWorkspaces ?? 0,
     );
 
-    const organizationDefault = isPaidPlan ? MAX_PARALLEL_WORKSPACES_PAID : MAX_PARALLEL_WORKSPACES_FREE;
+    const organizationDefault = isPaidOrDedicated ? MAX_PARALLEL_WORKSPACES_PAID : MAX_PARALLEL_WORKSPACES_FREE;
     const { data: installationConfig } = useInstallationConfiguration();
     const isDedicatedInstallation = !!installationConfig?.isDedicatedInstallation;
 

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

@@ -182,9 +182,6 @@ message UpdateOrganizationSettingsRequest {
   // update_role_restrictions specifies whether role_restrictions should be updated
   optional bool update_role_restrictions = 13;
 
-  // update_max_parallel_running_workspaces specifies whether max_parallel_running_workspaces should be updated
-  optional bool update_max_parallel_running_workspaces = 14;
-
   // max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
   optional int32 max_parallel_running_workspaces = 15;
 }