Remove hack for fixing un-setting featured members

The hack was introduced in #20620

- Update welcome message configuration to handle optional enabled field
- Simplify welcome message update logic in various components
- Modify protobuf definitions to make enabled field optional
- Remove redundant checks and simplify type handling in converters and components

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

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

@@ -46,8 +46,8 @@ export const useUpdateOrgSettingsMutation = () => {
                 }
             }
 
-            const settings = await organizationClient.updateOrganizationSettings(update);
-            return settings.settings!;
+            const { settings } = await organizationClient.updateOrganizationSettings(update);
+            return settings!;
         },
         onSuccess: (settings) => {
             invalidateWorkspaceClasses();

components/dashboard/src/teams/TeamOnboarding.tsx

@@ -53,9 +53,7 @@ export default function TeamOnboardingPage() {
                 throw new Error("no organization settings change permission");
             }
             try {
-                await updateTeamSettings.mutateAsync({
-                    ...newSettings,
-                });
+                await updateTeamSettings.mutateAsync(newSettings);
                 toast("Organization settings updated");
             } catch (error) {
                 if (options?.throwMutateError) {

components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx

@@ -26,7 +26,7 @@ export const OrgMemberAvatarInput = ({ settings, setFeaturedMemberId }: Props) =
     const handleSelectionChange = useCallback(
         (selectedId: string) => {
             const member = members?.find((m) => m.userId === selectedId);
-            setFeaturedMemberId(selectedId || undefined);
+            setFeaturedMemberId(selectedId);
             setAvatarUrl(member?.avatarUrl);
         },
         [members, setFeaturedMemberId],

components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx

@@ -4,8 +4,6 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { PlainMessage } from "@bufbuild/protobuf";
-import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { SwitchInputField } from "@podkit/switch/Switch";
 import { Heading3, Subheading } from "@podkit/typography/Headings";
 import { useCallback, useState } from "react";
@@ -40,20 +38,20 @@ export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: P
     const [welcomeMessageEditorOpen, setWelcomeMessageEditorOpen] = useState(false);
 
     const handleUpdateWelcomeMessage = useCallback(
-        async (newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>, options?: UpdateTeamSettingsOptions) => {
+        async (
+            newSettings: NonNullable<UpdateOrganizationSettingsArgs["onboardingSettings"]>["welcomeMessage"],
+            options?: UpdateTeamSettingsOptions,
+        ) => {
             await handleUpdateTeamSettings(
                 {
                     onboardingSettings: {
-                        welcomeMessage: {
-                            ...settings?.onboardingSettings?.welcomeMessage,
-                            ...newSettings,
-                        },
+                        welcomeMessage: newSettings,
                     },
                 },
                 options,
             );
         },
-        [handleUpdateTeamSettings, settings?.onboardingSettings?.welcomeMessage],
+        [handleUpdateTeamSettings],
     );
 
     return (

components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx

@@ -4,7 +4,6 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { PlainMessage } from "@bufbuild/protobuf";
 import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { Button } from "@podkit/buttons/Button";
 import { LoadingButton } from "@podkit/buttons/LoadingButton";
@@ -17,14 +16,15 @@ import { TextInput } from "../../components/forms/TextInputField";
 import { UpdateTeamSettingsOptions } from "../TeamOnboarding";
 import { OrgMemberAvatarInput } from "./OrgMemberAvatarInput";
 import { gitpodWelcomeSubheading } from "./WelcomeMessageConfigurationField";
+import { UpdateOrganizationSettingsArgs } from "../../data/organizations/update-org-settings-mutation";
 
 type Props = {
     settings: OnboardingSettings_WelcomeMessage | undefined;
     isLoading: boolean;
     isOwner: boolean;
     isOpen: boolean;
     handleUpdateWelcomeMessage: (
-        newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>,
+        newSettings: NonNullable<UpdateOrganizationSettingsArgs["onboardingSettings"]>["welcomeMessage"],
         options?: UpdateTeamSettingsOptions,
     ) => Promise<void>;
     setIsOpen: (isOpen: boolean) => void;
@@ -44,12 +44,12 @@ export const WelcomeMessageEditorModal = ({
     const updateWelcomeMessage = useCallback(
         async (e: FormEvent) => {
             e.preventDefault();
+            console.log("updateWelcomeMessage", message, featuredMemberId);
             try {
                 await handleUpdateWelcomeMessage(
                     {
                         message,
                         featuredMemberId,
-                        enabled: settings?.enabled ?? false,
                     },
                     {
                         throwMutateError: true,
@@ -61,7 +61,7 @@ export const WelcomeMessageEditorModal = ({
                 setError(error.message);
             }
         },
-        [handleUpdateWelcomeMessage, message, featuredMemberId, settings?.enabled, setIsOpen],
+        [handleUpdateWelcomeMessage, message, featuredMemberId, setIsOpen],
     );
 
     return (

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

@@ -53,7 +53,7 @@ message RoleRestrictionEntry {
 message OnboardingSettings {
   message WelcomeMessage {
     // enabled specifies whether the welcome message is enabled
-    bool enabled = 1;
+    optional bool enabled = 1;
 
     // message is the welcome message for the organization
     optional string message = 2;