easy nits around design and TelemetryData naming

Signed-off-by: Tarun Pothulapati <[email protected]>

Author: Pothulapati

components/dashboard/src/admin/Settings.tsx

@@ -5,7 +5,7 @@
  */
 
 import { useContext } from "react";
-import { Data, InstallationAdminSettings } from "@gitpod/gitpod-protocol";
+import { TelemetryData, InstallationAdminSettings } from "@gitpod/gitpod-protocol";
 import { AdminContext } from "../admin-context";
 import CheckBox from "../components/CheckBox";
 import { PageWithSubMenu } from "../components/PageWithSubMenu";
@@ -16,7 +16,7 @@ import InfoBox from "../components/InfoBox";
 
 export default function Settings() {
     const { adminSettings, setAdminSettings } = useContext(AdminContext);
-    const [telemetryData, setTelemetryData] = useState<Data>();
+    const [telemetryData, setTelemetryData] = useState<TelemetryData>();
 
 
     const actuallySetTelemetryPrefs = async (value: InstallationAdminSettings) => {
@@ -42,7 +42,7 @@ export default function Settings() {
                     onChange={(evt) => actuallySetTelemetryPrefs({
                         sendTelemetry: evt.target.checked,
                     })} />
-                <InfoBox>{JSON.stringify(telemetryData, null, 2)}</InfoBox>
+                <InfoBox><pre>{JSON.stringify(telemetryData, null, 2)}</pre></InfoBox>
             </PageWithSubMenu >
         </div >
     )

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

@@ -30,7 +30,7 @@ import { GithubUpgradeURL, PlanCoupon } from './payment-protocol';
 import { TeamSubscription, TeamSubscriptionSlot, TeamSubscriptionSlotResolved } from './team-subscription-protocol';
 import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from './analytics';
 import { IDEServer } from './ide-protocol';
-import { InstallationAdminSettings, Data } from './installation-admin-protocol';
+import { InstallationAdminSettings, TelemetryData } from './installation-admin-protocol';
 
 export interface GitpodClient {
     onInstanceUpdate(instance: WorkspaceInstance): void;
@@ -136,7 +136,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     // Admin Settings
     adminGetSettings(): Promise<InstallationAdminSettings>;
     adminUpdateSettings(settings: InstallationAdminSettings): Promise<void>;
-    adminGetTelemetryData(): Promise<Data>;
+    adminGetTelemetryData(): Promise<TelemetryData>;
 
     // Projects
     getProviderRepositoriesForUser(params: GetProviderRepositoriesParams): Promise<ProviderRepository[]>;

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

@@ -23,7 +23,7 @@ export interface InstallationAdmin {
     settings: InstallationAdminSettings;
 }
 
-export interface Data {
+export interface TelemetryData {
     installationAdmin: InstallationAdmin
     totalUsers: number
     totalWorkspaces: number

components/server/src/installation-admin/telemetry-data-provider.ts

@@ -6,7 +6,7 @@
 
  import { injectable, inject } from 'inversify';
 
- import { Data } from "@gitpod/gitpod-protocol"
+ import { TelemetryData } from "@gitpod/gitpod-protocol"
  import { InstallationAdminDB, UserDB, WorkspaceDB } from '@gitpod/gitpod-db/lib';
 
  @injectable()
@@ -15,13 +15,13 @@
     @inject(UserDB) protected readonly userDb: UserDB
     @inject(WorkspaceDB) protected readonly workspaceDb: WorkspaceDB
 
-     async getTelemetryData(): Promise<Data> {
-            const data: Data = {
+     async getTelemetryData(): Promise<TelemetryData> {
+            const data: TelemetryData = {
                 installationAdmin: await this.installationAdminDb.getData(),
-                totalUsers: await this.userDb.getUserCount(false),
+                totalUsers: await this.userDb.getUserCount(true),
                 totalWorkspaces: await this.workspaceDb.getWorkspaceCount(),
                 totalInstances: await this.workspaceDb.getInstanceCount(),
-            } as Data;
+            } as TelemetryData;
 
             return data;
         }