Only show privacy policy notice on Gitpod Cloud (#18985)

* Only show privacy policy notice on Gitpod Cloud

* Track dismisses

Author: filiptronicek

components/dashboard/src/Analytics.tsx

@@ -15,10 +15,16 @@ export type Event =
     | "organisation_authorised"
     | "dotfile_repo_changed"
     | "feedback_submitted"
-    | "workspace_class_changed";
+    | "workspace_class_changed"
+    | "privacy_policy_update_accepted";
 type InternalEvent = Event | "path_changed" | "dashboard_clicked";
 
-export type EventProperties = TrackOrgAuthorised | TrackInviteUrlRequested | TrackDotfileRepo | TrackFeedback;
+export type EventProperties =
+    | TrackOrgAuthorised
+    | TrackInviteUrlRequested
+    | TrackDotfileRepo
+    | TrackFeedback
+    | TrackPolicyUpdateClick;
 type InternalEventProperties = EventProperties | TrackDashboardClick | TrackPathChanged;
 
 export interface TrackOrgAuthorised {
@@ -43,6 +49,12 @@ export interface TrackFeedback {
     error_object?: StartWorkspaceError;
     error_message?: string;
 }
+
+export interface TrackPolicyUpdateClick {
+    path: string;
+    success: boolean;
+}
+
 interface TrackDashboardClick {
     dnt?: boolean;
     path: string;

components/dashboard/src/AppNotifications.tsx

@@ -4,12 +4,14 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
+import dayjs from "dayjs";
+import deepMerge from "deepmerge";
 import { useCallback, useEffect, useState } from "react";
 import Alert, { AlertType } from "./components/Alert";
-import dayjs from "dayjs";
 import { useUserLoader } from "./hooks/use-user-loader";
 import { getGitpodService } from "./service/service";
-import deepMerge from "deepmerge";
+import { isGitpodIo } from "./utils";
+import { trackEvent } from "./Analytics";
 
 const KEY_APP_DISMISSED_NOTIFICATIONS = "gitpod-app-notifications-dismissed";
 const PRIVACY_POLICY_LAST_UPDATED = "2023-10-17";
@@ -27,9 +29,23 @@ const UPDATED_PRIVACY_POLICY: Notification = {
     type: "info",
     preventDismiss: true,
     onClose: async () => {
-        const userUpdates = { additionalData: { profile: { acceptedPrivacyPolicyDate: dayjs().toISOString() } } };
-        const previousUser = await getGitpodService().server.getLoggedInUser();
-        await getGitpodService().server.updateLoggedInUser(deepMerge(previousUser, userUpdates));
+        let dismissSuccess = false;
+        try {
+            const userUpdates = { additionalData: { profile: { acceptedPrivacyPolicyDate: dayjs().toISOString() } } };
+            const previousUser = await getGitpodService().server.getLoggedInUser();
+            const updatedUser = await getGitpodService().server.updateLoggedInUser(
+                deepMerge(previousUser, userUpdates),
+            );
+            dismissSuccess = !!updatedUser;
+        } catch (err) {
+            console.error("Failed to update user's privacy policy acceptance date", err);
+            dismissSuccess = false;
+        } finally {
+            trackEvent("privacy_policy_update_accepted", {
+                path: window.location.pathname,
+                success: dismissSuccess,
+            });
+        }
     },
     message: (
         <span className="text-md">
@@ -48,10 +64,10 @@ export function AppNotifications() {
 
     useEffect(() => {
         const notifications = [];
-        if (!loading && user?.additionalData?.profile) {
+        if (!loading && isGitpodIo()) {
             if (
-                !user.additionalData.profile.acceptedPrivacyPolicyDate ||
-                new Date(PRIVACY_POLICY_LAST_UPDATED) > new Date(user.additionalData.profile?.acceptedPrivacyPolicyDate)
+                !user?.additionalData?.profile?.acceptedPrivacyPolicyDate ||
+                new Date(PRIVACY_POLICY_LAST_UPDATED) > new Date(user.additionalData.profile.acceptedPrivacyPolicyDate)
             ) {
                 notifications.push(UPDATED_PRIVACY_POLICY);
             }

components/server/src/user/user-service.ts

@@ -74,7 +74,7 @@ export class UserService {
         }
         if (newUser.additionalData) {
             // When a user is created, it does not have `additionalData.profile` set, so it's ok to rewrite it here.
-            newUser.additionalData.profile = { acceptedPrivacyPolicyDate: new Date().toISOString() };
+            // todo:revert newUser.additionalData.profile = { acceptedPrivacyPolicyDate: new Date().toISOString() };
         }
     }