[dashboard, server] Fix duration handling/conversion

Tool: gitpod/catfood.gitpod.cloud

Author: geropl

components/dashboard/src/service/json-rpc-organization-client.ts

@@ -273,7 +273,7 @@ export class JsonRpcOrganizationClient implements PromiseClient<typeof Organizat
             ...update,
             defaultRole: request.defaultRole as OrgMemberRole,
             timeoutSettings: {
-                inactivity: converter.toDurationString(request.timeoutSettings?.inactivity),
+                inactivity: converter.toDurationStringOpt(request.timeoutSettings?.inactivity),
                 denyUserTimeouts: request.timeoutSettings?.denyUserTimeouts,
             },
             roleRestrictions,

components/dashboard/src/teams/TeamPolicies.tsx

@@ -97,7 +97,7 @@ export default function TeamPoliciesPage() {
 
             handleUpdateTeamSettings({
                 timeoutSettings: {
-                    inactivity: workspaceTimeout ? converter.toDuration(workspaceTimeout) : undefined,
+                    inactivity: converter.toDurationOpt(workspaceTimeout),
                     denyUserTimeouts: !allowTimeoutChangeByMembers,
                 },
             });
@@ -182,7 +182,7 @@ export default function TeamPoliciesPage() {
                                     !isOwner ||
                                     !isPaidOrDedicated ||
                                     (workspaceTimeout ===
-                                        converter.toDurationString(settings?.timeoutSettings?.inactivity) &&
+                                        converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) &&
                                         allowTimeoutChangeByMembers === !settings?.timeoutSettings?.denyUserTimeouts)
                                 }
                             >

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

@@ -39,7 +39,7 @@ export default function Preferences() {
     const [dotfileRepo, setDotfileRepo] = useState<string>(user?.dotfileRepo || "");
 
     const [workspaceTimeout, setWorkspaceTimeout] = useState<string>(
-        converter.toDurationString(user?.workspaceTimeoutSettings?.inactivity),
+        converter.toDurationStringOpt(user?.workspaceTimeoutSettings?.inactivity) || "",
     );
     const [timeoutUpdating, setTimeoutUpdating] = useState(false);
     const [creationError, setCreationError] = useState<Error>();
@@ -173,7 +173,7 @@ export default function Preferences() {
                         <Alert type="warning" className="mb-4">
                             The currently selected organization does not allow members to set custom workspace timeouts,
                             so for workspaces created in it, its default timeout of{" "}
-                            {converter.toDurationString(settings?.timeoutSettings?.inactivity)} will be used.
+                            {converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) || ""} will be used.
                         </Alert>
                     )}
 
@@ -201,7 +201,9 @@ export default function Preferences() {
                                         loading={timeoutUpdating}
                                         disabled={
                                             workspaceTimeout ===
-                                            converter.toDurationString(user?.workspaceTimeoutSettings?.inactivity)
+                                            (converter.toDurationStringOpt(
+                                                user?.workspaceTimeoutSettings?.inactivity,
+                                            ) || "")
                                         }
                                     >
                                         Save

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

@@ -1612,9 +1612,10 @@ 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) {
+            // "" is our "default value" for durations on the server side
             return "";
         }
         const totalMilliseconds = Number(seconds) * 1000;
@@ -1630,6 +1631,13 @@ export class PublicAPIConverter {
         }`;
     }
 
+    toDurationStringOpt(duration?: PartialMessage<Duration>): string | undefined {
+        if (duration === undefined) {
+            return undefined;
+        }
+        return this.toDurationString(duration);
+    }
+
     toUser(from: UserProtocol): User {
         const {
             id,
@@ -1703,6 +1711,13 @@ export class PublicAPIConverter {
         });
     }
 
+    toDurationOpt(from: string | undefined): Duration | undefined {
+        if (from === undefined) {
+            return undefined;
+        }
+        return this.toDuration(from);
+    }
+
     toWorkspaceClass(cls: SupportedWorkspaceClass): WorkspaceClass {
         return new WorkspaceClass({
             id: cls.id,