Fix default workspace image setup

gitpod-io · Sep 18, 2023 · c2df290 · c2df290
1 parent 1941376
commit c2df290
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/components/dashboard/src/data/organizations/update-org-settings-mutation.ts b/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
@@ -10,7 +10,9 @@ import { getGitpodService } from "../../service/service";
 import { getOrgSettingsQueryKey, OrgSettingsResult } from "./org-settings-query";
 import { useCurrentOrg } from "./orgs-query";
 
-type UpdateOrganizationSettingsArgs = Pick<OrganizationSettings, "workspaceSharingDisabled" | "defaultWorkspaceImage">;
+type UpdateOrganizationSettingsArgs = Partial<
+    Pick<OrganizationSettings, "workspaceSharingDisabled" | "defaultWorkspaceImage">
+>;
 
 export const useUpdateOrgSettingsMutation = () => {
     const queryClient = useQueryClient();

diff --git a/components/dashboard/src/teams/TeamSettings.tsx b/components/dashboard/src/teams/TeamSettings.tsx
@@ -190,7 +190,8 @@ function OrgSettingsForm(props: { org?: OrganizationInfo }) {
             }
             try {
                 await updateTeamSettings.mutateAsync({
-                    ...settings,
+                    // We don't want to have original setting passed, since defaultWorkspaceImage could be undefined
+                    // to bring compatibility when we're going to change Gitpod install value's defaultImage setting
                     ...newSettings,
                 });
                 if (newSettings.defaultWorkspaceImage) {
@@ -205,7 +206,7 @@ function OrgSettingsForm(props: { org?: OrganizationInfo }) {
                 );
             }
         },
-        [updateTeamSettings, org?.id, org?.isOwner, settings, toast],
+        [updateTeamSettings, org?.id, org?.isOwner, toast],
     );
 
     return (

diff --git a/components/gitpod-db/src/typeorm/team-db-impl.ts b/components/gitpod-db/src/typeorm/team-db-impl.ts
@@ -383,8 +383,12 @@ export class TeamDBImpl extends TransactionalDBImpl<TeamDB> implements TeamDB {
                 orgId,
             });
         } else {
-            team.workspaceSharingDisabled = settings.workspaceSharingDisabled;
-            team.defaultWorkspaceImage = settings.defaultWorkspaceImage;
+            if (settings.workspaceSharingDisabled) {
+                team.workspaceSharingDisabled = settings.workspaceSharingDisabled;
+            }
+            if (settings.defaultWorkspaceImage) {
+                team.defaultWorkspaceImage = settings.defaultWorkspaceImage;
+            }
             repo.save(team);
         }
     }

diff --git a/components/server/src/orgs/organization-service.ts b/components/server/src/orgs/organization-service.ts
@@ -338,9 +338,6 @@ export class OrganizationService {
 
     async updateSettings(userId: string, orgId: string, settings: OrganizationSettings): Promise<OrganizationSettings> {
         await this.auth.checkPermissionOnOrganization(userId, "write_settings", orgId);
-        if (!settings.defaultWorkspaceImage) {
-            settings.defaultWorkspaceImage = this.config.workspaceDefaults.workspaceImage;
-        }
         await this.teamDB.setOrgSettings(orgId, settings);
         return settings;
     }