Fix build issues

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

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

@@ -15,7 +15,10 @@ import { SwitchInputField } from "@podkit/switch/Switch";
 import { WelcomeMessageEditorModal } from "./WelcomeMessageEditor";
 import { WelcomeMessagePreview } from "./WelcomeMessagePreview";
 import { useCallback, useState } from "react";
-import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import type {
+    OnboardingSettings_WelcomeMessage,
+    OrganizationSettings,
+} from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { PlainMessage } from "@bufbuild/protobuf";
 
 type Props = {
@@ -32,13 +35,13 @@ export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: P
 
     const [welcomeMessageEditorOpen, setWelcomeMessageEditorOpen] = useState(false);
 
-    const handleToggleWelcomeMessageEnabled = useCallback(
-        async (enabled: boolean) => {
+    const handleUpdateWelcomeMessage = useCallback(
+        async (newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>) => {
             await handleUpdateTeamSettings({
                 onboardingSettings: {
                     welcomeMessage: {
                         ...settings?.onboardingSettings?.welcomeMessage,
-                        enabled,
+                        ...newSettings,
                     },
                     recommendedRepositories: settings?.onboardingSettings?.recommendedRepositories ?? [],
                 },
@@ -76,7 +79,7 @@ export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: P
                             }
                         }
 
-                        handleToggleWelcomeMessageEnabled(checked);
+                        handleUpdateWelcomeMessage({ enabled: checked });
                     }}
                     label=""
                 />
@@ -87,7 +90,7 @@ export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: P
                 isOwner={isOwner}
                 isOpen={welcomeMessageEditorOpen}
                 setIsOpen={setWelcomeMessageEditorOpen}
-                handleUpdateTeamSettings={handleUpdateTeamSettings}
+                handleUpdateWelcomeMessage={handleUpdateWelcomeMessage}
                 settings={settings?.onboardingSettings?.welcomeMessage}
             />
 

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

@@ -5,10 +5,7 @@
  */
 
 import { PlainMessage } from "@bufbuild/protobuf";
-import {
-    OnboardingSettings_WelcomeMessage,
-    OrganizationSettings,
-} from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { Textarea } from "@podkit/forms/TextArea";
 import { FormEvent, useCallback, useState } from "react";
 import { Modal, ModalBody, ModalFooter, ModalHeader } from "../../components/Modal";
@@ -24,18 +21,15 @@ type Props = {
     isLoading: boolean;
     isOwner: boolean;
     isOpen: boolean;
-    handleUpdateTeamSettings: (
-        newSettings: Partial<PlainMessage<OrganizationSettings>>,
-        options?: { throwMutateError?: boolean },
-    ) => Promise<void>;
+    handleUpdateWelcomeMessage: (newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>) => Promise<void>;
     setIsOpen: (isOpen: boolean) => void;
 };
 export const WelcomeMessageEditorModal = ({
     isLoading,
     isOwner,
     settings,
     isOpen,
-    handleUpdateTeamSettings,
+    handleUpdateWelcomeMessage,
     setIsOpen,
 }: Props) => {
     const [message, setMessage] = useState<string | undefined>(settings?.message);
@@ -44,13 +38,13 @@ export const WelcomeMessageEditorModal = ({
     const updateWelcomeMessage = useCallback(
         async (e: FormEvent) => {
             e.preventDefault();
-            await handleUpdateTeamSettings({
-                onboardingSettings: {
-                    welcomeMessage: { message, featuredMemberId, enabled: settings?.enabled ?? false },
-                },
+            await handleUpdateWelcomeMessage({
+                message,
+                featuredMemberId,
+                enabled: settings?.enabled ?? false,
             });
         },
-        [handleUpdateTeamSettings, message, featuredMemberId, settings?.enabled],
+        [handleUpdateWelcomeMessage, message, featuredMemberId, settings?.enabled],
     );
 
     return (