fixup: override workspaceAutostartOptions

also fix toDurationString call

Author: AlexTugarev

components/dashboard/src/data/current-user/update-mutation.ts

@@ -18,11 +18,16 @@ export const useUpdateCurrentUserMutation = () => {
     return useMutation({
         mutationFn: async (partialUser: UpdateCurrentUserArgs) => {
             const current = await getGitpodService().server.getLoggedInUser();
+            const currentAdditionalData = { ...current.additionalData };
+            // workspaceAutostartOptions needs to be overriden
+            if (partialUser.additionalData?.workspaceAutostartOptions) {
+                currentAdditionalData.workspaceAutostartOptions = [];
+            }
             const update: UpdateCurrentUserArgs = {
                 id: current.id,
                 fullName: partialUser.fullName || current.fullName,
                 additionalData: deepmerge<AdditionalUserData>(
-                    current.additionalData || {},
+                    currentAdditionalData || {},
                     partialUser.additionalData || {},
                 ),
             };

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

@@ -35,7 +35,7 @@ export default function Preferences() {
     const [dotfileRepo, setDotfileRepo] = useState<string>(user?.dotfileRepo || "");
 
     const [workspaceTimeout, setWorkspaceTimeout] = useState<string>(
-        converter.fromDuration(user?.workspaceTimeoutSettings?.inactivity),
+        converter.toDurationString(user?.workspaceTimeoutSettings?.inactivity),
     );
     const [timeoutUpdating, setTimeoutUpdating] = useState(false);
     const [creationError, setCreationError] = useState<Error>();
@@ -186,7 +186,9 @@ export default function Preferences() {
                                         loading={timeoutUpdating}
                                         disabled={
                                             workspaceTimeout ===
-                                                converter.fromDuration(user?.workspaceTimeoutSettings?.inactivity) ?? ""
+                                                converter.toDurationString(
+                                                    user?.workspaceTimeoutSettings?.inactivity,
+                                                ) ?? ""
                                         }
                                     >
                                         Save

components/public-api/typescript-common/src/public-api-converter.ts

@@ -1068,8 +1068,8 @@ export class PublicAPIConverter {
      * `Duration.nanos` is ignored
      * @returns a string like "1h2m3s", valid time units are `s`, `m`, `h`
      */
-    toDurationString(duration: PartialMessage<Duration>): string {
-        const seconds = duration.seconds || 0;
+    toDurationString(duration?: PartialMessage<Duration>): string {
+        const seconds = duration?.seconds || 0;
         if (seconds === 0) {
             return "0";
         }
@@ -1168,13 +1168,6 @@ export class PublicAPIConverter {
         });
     }
 
-    fromDuration(d?: Duration) {
-        if (!d) {
-            return "";
-        }
-        return String(d.seconds);
-    }
-
     toTimestamp(from?: string | undefined): Timestamp | undefined {
         return from ? Timestamp.fromDate(new Date(from)) : undefined;
     }