stuff

Author: Simon Emms

components/dashboard/src/admin/Settings.tsx

@@ -1,22 +1,38 @@
-import { useContext } from "react";
+import { AdminGetListResult, WorkspaceAndInstance } from "@gitpod/gitpod-protocol";
+import { useState } from "react";
 import CheckBox from "../components/CheckBox";
 import { PageWithSubMenu } from "../components/PageWithSubMenu";
-import { UserContext } from "../user-context";
+import { getGitpodService } from "../service/service";
+// import { UserContext } from "../user-context";
 import { adminMenu } from "./admin-menu";
 
 export default function Settings() {
-    const { user } = useContext(UserContext);
+    // const { user } = useContext(UserContext);
 
-    console.log({ user })
+    const [searchResult] = useState<AdminGetListResult<WorkspaceAndInstance>>({ rows: [], total: 0 });
+    console.log(searchResult)
+
+    getGitpodService().server.adminSettingsGetTelemetry().then(() => {
+        console.log('hello')
+    }).catch((err) => {
+        console.log(err)
+    })
+
+    const actuallySetTelemetryPrefs = async (value: boolean) => {
+        // console.log({ useState, UserContext })
+        console.log({ value })
+        console.log('hello world')
+    }
 
     return (
         <div>
             <PageWithSubMenu subMenu={adminMenu} title="Settings" subtitle="Configure settings for your Gitpod cluster.">
                 <CheckBox
-                    title="Send anonymous telemetry to Gitpod"
-                    desc="This telemetry is used to provide insights on how you use your cluster so we can provide a better overall experience"
-                    checked={true} />
+                    title="Send anonymous service ping to Gitpod"
+                    desc="This is used to provide insights on how you use your cluster so we can provide a better overall experience."
+                    checked={false}
+                    onChange={(evt) => actuallySetTelemetryPrefs(evt.target.checked)} />
             </PageWithSubMenu>
-        </div>
+        </div >
     )
 }

components/gitpod-protocol/src/admin-protocol.ts

@@ -29,6 +29,9 @@ export interface AdminServer {
     adminIsStudent(userId: string): Promise<boolean>;
     adminAddStudentEmailDomain(userId: string, domain: string): Promise<void>;
     adminGrantExtraHours(userId: string, extraHours: number): Promise<void>;
+
+    adminSettingsGetTelemetry(): Promise<boolean>
+    adminSettingsSetTelemetry(send: boolean): Promise<void>
 }
 
 export interface AdminGetListRequest<T> {
@@ -65,7 +68,7 @@ export interface AdminModifyPermanentWorkspaceFeatureFlagRequest {
     }[]
 }
 
-export interface WorkspaceAndInstance extends Omit<Workspace, "id"|"creationTime">, Omit<WorkspaceInstance, "id"|"creationTime"> {
+export interface WorkspaceAndInstance extends Omit<Workspace, "id" | "creationTime">, Omit<WorkspaceInstance, "id" | "creationTime"> {
     workspaceId: string;
     workspaceCreationTime: string;
     instanceId: string;
@@ -78,7 +81,7 @@ export namespace WorkspaceAndInstance {
         return {
             id: wai.workspaceId,
             creationTime: wai.workspaceCreationTime,
-            ... wai
+            ...wai
         };
     }
 
@@ -89,7 +92,7 @@ export namespace WorkspaceAndInstance {
         return {
             id: wai.instanceId,
             creationTime: wai.instanceCreationTime,
-            ... wai
+            ...wai
         };
     }
 }

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -318,7 +318,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         if (!instance) {
             throw new ResponseError(ErrorCodes.NOT_FOUND, `Workspace ${workspaceId} has no running instance`);
         }
-        await this.guardAccess({ kind: "workspaceInstance", subject: instance, workspace}, "get");
+        await this.guardAccess({ kind: "workspaceInstance", subject: instance, workspace }, "get");
 
         const client = await this.workspaceManagerClientProvider.get(instance.region);
         const request = new TakeSnapshotRequest();
@@ -337,13 +337,13 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
             await this.internalDoWaitForWorkspace(waitOpts);
         } else {
             // start driving the snapshot immediately
-            SafePromise.catchAndLog(this.internalDoWaitForWorkspace(waitOpts), { userId: user.id, workspaceId: workspaceId})
+            SafePromise.catchAndLog(this.internalDoWaitForWorkspace(waitOpts), { userId: user.id, workspaceId: workspaceId })
         }
 
         return snapshot.id;
     }
 
-    protected async guardSnaphotAccess(ctx: TraceContext, userId: string, workspaceId: string) : Promise<Workspace> {
+    protected async guardSnaphotAccess(ctx: TraceContext, userId: string, workspaceId: string): Promise<Workspace> {
         traceAPIParams(ctx, { userId, workspaceId });
 
         const workspace = await this.workspaceDb.trace(ctx).findById(workspaceId);
@@ -563,6 +563,20 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         return result;
     }
 
+    async adminSettingsGetTelemetry(ctx: TraceContext): Promise<boolean> {
+        // traceAPIParams(ctx, {});
+
+        // await this.guardAdminAccess("adminSettingsGetTelemetry", {}, Permission.ADMIN_API);
+
+        console.log(33333)
+
+        return false
+    }
+
+    async adminSettingsSetTelemetry(ctx: TraceContext, send: boolean): Promise<void> {
+        console.log('set')
+    }
+
     async adminForceStopWorkspace(ctx: TraceContext, workspaceId: string): Promise<void> {
         traceAPIParams(ctx, { workspaceId });
 
@@ -715,7 +729,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
     }
 
     async adminSetLicense(ctx: TraceContext, key: string): Promise<void> {
-        traceAPIParams(ctx, { });   // don't trace the actual key
+        traceAPIParams(ctx, {});   // don't trace the actual key
 
         await this.guardAdminAccess("adminGetWorkspaces", { key }, Permission.ADMIN_API);
 
@@ -1406,7 +1420,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
 
     // various
     async sendFeedback(ctx: TraceContext, feedback: string): Promise<string | undefined> {
-        traceAPIParams(ctx, { });   // feedback is not interesting here, any may contain names
+        traceAPIParams(ctx, {});   // feedback is not interesting here, any may contain names
 
         const user = this.checkUser("sendFeedback");
         const now = new Date().toISOString();

components/server/src/workspace/gitpod-server-impl.ts

@@ -621,7 +621,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             includeHeadless: false,
         });
         await Promise.all(res.map(ws => this.guardAccess({ kind: "workspace", subject: ws.workspace }, "get")));
-        await Promise.all(res.map(ws => this.guardAccess({ kind: "workspaceInstance", subject: ws.latestInstance, workspace: ws.workspace}, "get")));
+        await Promise.all(res.map(ws => this.guardAccess({ kind: "workspaceInstance", subject: ws.latestInstance, workspace: ws.workspace }, "get")));
         return res;
     }
 
@@ -1853,7 +1853,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     public async getGitpodTokenScopes(ctx: TraceContext, tokenHash: string): Promise<string[]> {
-        traceAPIParams(ctx, { });   // do not trace tokenHash
+        traceAPIParams(ctx, {});   // do not trace tokenHash
 
         const user = this.checkAndBlockUser("getGitpodTokenScopes");
         let token: GitpodToken | undefined;
@@ -1871,7 +1871,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     public async deleteGitpodToken(ctx: TraceContext, tokenHash: string): Promise<void> {
-        traceAPIParams(ctx, { });   // do not trace tokenHash
+        traceAPIParams(ctx, {});   // do not trace tokenHash
 
         const user = this.checkAndBlockUser("deleteGitpodToken");
         const existingTokens = await this.getGitpodTokens(ctx); // all tokens for logged in user
@@ -1984,6 +1984,15 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         throw new ResponseError(ErrorCodes.EE_FEATURE, `Admin support is implemented in Gitpod's Enterprise Edition`);
     }
 
+    async adminSettingsGetTelemetry(ctx: TraceContext): Promise<boolean> {
+        console.log(2222)
+        return false;
+    }
+
+    async adminSettingsSetTelemetry(ctx: TraceContext, send: boolean): Promise<void> {
+
+    }
+
     async getLicenseInfo(): Promise<GetLicenseInfoResult> {
         throw new ResponseError(ErrorCodes.EE_FEATURE, `Licensing is implemented in Gitpod's Enterprise Edition`);
     }
@@ -2040,7 +2049,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     protected validHostNameRegexp = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)+([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])(\/([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))?$/;
 
     async updateOwnAuthProvider(ctx: TraceContext, { entry }: GitpodServer.UpdateOwnAuthProviderParams): Promise<AuthProviderEntry> {
-        traceAPIParams(ctx, {  });  // entry contains PII
+        traceAPIParams(ctx, {});  // entry contains PII
 
         let userId: string;
         try {