Update user

Author: filiptronicek

components/dashboard/src/AppNotifications.tsx

@@ -11,9 +11,11 @@ import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 import advancedFormat from "dayjs/plugin/advancedFormat";
 import { useUserLoader } from "./hooks/use-user-loader";
+import { getGitpodService } from "./service/service";
+import { deepMerge } from "./utils";
 
 const KEY_APP_DISMISSED_NOTIFICATIONS = "gitpod-app-notifications-dismissed";
-const PRIVACY_POLICY_LAST_UPDATED = "09/25/2023";
+const PRIVACY_POLICY_LAST_UPDATED = "2023-09-26";
 
 interface Notification {
     id: string;
@@ -33,16 +35,21 @@ export function localizedTime(dateStr: string): JSX.Element {
 }
 
 function formatDate(dateString: string): JSX.Element {
-    const formatted = dayjs.utc(dateString).local().format("LL");
+    const formatted = dayjs.utc(dateString).local().format("MMMM D, YYYY");
     return <time dateTime={dateString}>{formatted}</time>;
 }
 
 const UPDATED_PRIVACY_POLICY: Notification = {
     id: "privacy-policy-update",
     type: "info",
     preventDismiss: true,
-    onClose: () => {
+    onClose: async () => {
         console.error("Well... happy for you");
+        const userUpdates = { additionalData: { profile: { acceptedPrivacyPolicyDate: dayjs().toISOString() } } };
+        const previousUser = await getGitpodService().server.getLoggedInUser();
+        const user = await getGitpodService().server.updateLoggedInUser(deepMerge(previousUser, userUpdates));
+
+        console.log(user);
     },
     message: (
         <span className="text-md">
@@ -61,8 +68,11 @@ export function AppNotifications() {
 
     useEffect(() => {
         const notifications = [];
-        if (!loading && user?.additionalData) {
-            if (new Date(PRIVACY_POLICY_LAST_UPDATED) > new Date(user.additionalData.acceptedPrivacyPoliceDate)) {
+        if (!loading && user?.additionalData?.profile) {
+            if (
+                !user.additionalData.profile.acceptedPrivacyPolicyDate ||
+                new Date(PRIVACY_POLICY_LAST_UPDATED) > new Date(user.additionalData.profile?.acceptedPrivacyPolicyDate)
+            ) {
                 notifications.push(UPDATED_PRIVACY_POLICY);
             }
         }

components/dashboard/src/utils.ts

@@ -85,6 +85,31 @@ export function getURLHash() {
     return window.location.hash.replace(/^[#/]+/, "");
 }
 
+export type DeepPartial<T> = {
+    [P in keyof T]?: DeepPartial<T[P]> | T[P];
+};
+
+function isObject(item: any): item is Record<string, any> {
+    return item && typeof item === "object" && !Array.isArray(item);
+}
+
+export function deepMerge<T>(target: T, source: DeepPartial<T>): T {
+    for (let key in source) {
+        if (source.hasOwnProperty(key)) {
+            const currentKey = key as keyof T;
+            if (isObject(source[currentKey]) && isObject(target[currentKey])) {
+                target[currentKey] = deepMerge(
+                    target[currentKey],
+                    source[currentKey] as DeepPartial<T[keyof T]>,
+                ) as T[keyof T];
+            } else {
+                target[currentKey] = source[currentKey] as T[keyof T];
+            }
+        }
+    }
+    return target;
+}
+
 export function isWebsiteSlug(pathName: string) {
     const slugs = [
         "about",

components/gitpod-protocol/src/protocol.ts

@@ -302,7 +302,7 @@ export interface ProfileDetails {
     // when was the last time the user updated their profile information or has been nudged to do so.
     lastUpdatedDetailsNudge?: string;
     // when was the last time the user has accepted our privacy policy
-    acceptedPrivacyPoliceDate?: string;
+    acceptedPrivacyPolicyDate?: string;
     // the user's company name
     companyName?: string;
     // the user's email