Update papi converter tests and revert unecessary changes

Author: filiptronicek

components/dashboard/src/insights/WorkspaceSession.tsx

@@ -17,7 +17,7 @@ export const WorkspaceSessionEntry = ({ session, index }: Props) => {
     return (
         <li key={index} className="text-sm text-gray-600 dark:text-gray-300">
             {session.creationTime ? displayTime(session.creationTime) : "n/a"} (
-            {session.workspace?.status?.instanceId.slice(0, 7) || "No instance ID"}){isRunning ? " - running" : ""}
+            {session.id.slice(0, 7) || "No instance ID"}){isRunning ? " - running" : ""}
         </li>
     );
 };

components/dashboard/src/insights/WorkspaceSessionGroup.tsx

@@ -6,7 +6,7 @@
 
 import { Timestamp } from "@bufbuild/protobuf";
 import { OrganizationMember } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
-import { WorkspaceSpec_WorkspaceType } from "@gitpod/public-api/lib/gitpod/v1/workspace_pb";
+import { WorkspaceSession, WorkspaceSpec_WorkspaceType } from "@gitpod/public-api/lib/gitpod/v1/workspace_pb";
 import { AccordionContent, AccordionItem, AccordionTrigger } from "../components/accordion/Accordion";
 import { ReactComponent as UsageIcon } from "../images/usage-default.svg";
 import { toRemoteURL } from "../projects/render-utils";
@@ -16,7 +16,7 @@ import { displayWorkspaceType } from "./download/download-sessions";
 
 type Props = {
     id: string;
-    sessions: any[];
+    sessions: WorkspaceSession[];
     member?: OrganizationMember;
 };
 export const WorkspaceSessionGroup = ({ id, sessions, member }: Props) => {

components/dashboard/src/usage/download/DownloadUsage.tsx

@@ -50,6 +50,7 @@ export const DownloadUsage: FC<Props> = ({ attributionId, startDate, endDate })
     }, [attributionId, endDate, org, setDownloadDisabled, startDate, toast]);
 
     return (
+        // TODO: Convert this to use an IconButton when we add one to podkit
         <Button variant="secondary" onClick={handleDownload} className="gap-1" disabled={downloadDisabled}>
             <DownloadIcon />
             <span>Export as CSV</span>

components/public-api/typescript-common/fixtures/toWorkspace2_1.golden

@@ -9,7 +9,21 @@
             "name": "gitpod-io/workspace-images - main",
             "pinned": false,
             "originalContextUrl": "https://github.com/gitpod-io/workspace-images",
-            "warnings": []
+            "warnings": [],
+            "context": {
+                "path": "",
+                "ref": "main",
+                "refType": "REF_TYPE_BRANCH",
+                "revision": "fa52963fa39227bcfbf005d396eb753bf3981e40",
+                "repository": {
+                    "cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
+                    "defaultBranch": "main",
+                    "host": "github.com",
+                    "owner": "gitpod-io",
+                    "name": "workspace-images",
+                    "private": false
+                }
+            }
         },
         "spec": {
             "initializer": {

components/public-api/typescript-common/fixtures/toWorkspace2_2.golden

@@ -9,7 +9,21 @@
             "name": "gitpod-io/gitpod - main",
             "pinned": true,
             "originalContextUrl": "https://github.com/gitpod-io/gitpod",
-            "warnings": []
+            "warnings": [],
+            "context": {
+                "path": "",
+                "ref": "main",
+                "refType": "REF_TYPE_BRANCH",
+                "revision": "eb6a504011d82fe87d0746012c75b4916ce54480",
+                "repository": {
+                    "cloneUrl": "https://github.com/gitpod-io/gitpod.git",
+                    "defaultBranch": "main",
+                    "host": "github.com",
+                    "owner": "gitpod-io",
+                    "name": "gitpod",
+                    "private": false
+                }
+            }
         },
         "spec": {
             "initializer": {

components/public-api/typescript-common/fixtures/toWorkspace2_3.golden

@@ -9,7 +9,21 @@
             "name": "gitpod-io/empty ",
             "pinned": false,
             "originalContextUrl": "https://github.com/gitpod-io/empty",
-            "warnings": []
+            "warnings": [],
+            "context": {
+                "path": "",
+                "ref": "",
+                "refType": "REF_TYPE_UNSPECIFIED",
+                "revision": "",
+                "repository": {
+                    "cloneUrl": "https://github.com/gitpod-io/empty.git",
+                    "defaultBranch": "",
+                    "host": "github.com",
+                    "owner": "gitpod-io",
+                    "name": "empty",
+                    "private": false
+                }
+            }
         },
         "spec": {
             "initializer": {

components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_1.golden

@@ -9,7 +9,21 @@
             "name": "description",
             "pinned": true,
             "originalContextUrl": "https://github.com/gitpod-io/contextURL",
-            "warnings": []
+            "warnings": [],
+            "context": {
+                "path": "",
+                "ref": "master",
+                "refType": "REF_TYPE_BRANCH",
+                "revision": "revision",
+                "repository": {
+                    "cloneUrl": "https://github.com/gitpod-io/contextURL.git",
+                    "defaultBranch": "",
+                    "host": "github.com",
+                    "owner": "gitpod-io",
+                    "name": "contextURL",
+                    "private": true
+                }
+            }
         },
         "spec": {
             "initializer": {

components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_2.golden

@@ -9,7 +9,21 @@
             "name": "empty",
             "pinned": true,
             "originalContextUrl": "https://github.com/gitpod-io/empty",
-            "warnings": []
+            "warnings": [],
+            "context": {
+                "path": "",
+                "ref": "master",
+                "refType": "REF_TYPE_BRANCH",
+                "revision": "revision",
+                "repository": {
+                    "cloneUrl": "https://github.com/gitpod-io/empty.git",
+                    "defaultBranch": "",
+                    "host": "github.com",
+                    "owner": "gitpod.io",
+                    "name": "empty",
+                    "private": false
+                }
+            }
         },
         "spec": {
             "initializer": {

components/public-api/typescript-common/fixtures/toWorkspaceSession_1.golden

@@ -1,6 +1,6 @@
 {
     "result": {
-        "id": "",
+        "id": "226695b4-f10a-471a-a219-9b657645bf78",
         "workspace": {
             "id": "akosyakov-parceldemo-4crqn25qlwi",
             "metadata": {
@@ -11,7 +11,21 @@
                 "name": "akosyakov/parcel-demo - master",
                 "pinned": false,
                 "originalContextUrl": "https://github.com/akosyakov/parcel-demo",
-                "warnings": []
+                "warnings": [],
+                "context": {
+                    "path": "",
+                    "ref": "master",
+                    "refType": "REF_TYPE_BRANCH",
+                    "revision": "60dbf818194082ef1a368bacd49cfd25a34c9256",
+                    "repository": {
+                        "cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
+                        "defaultBranch": "master",
+                        "host": "github.com",
+                        "owner": "akosyakov",
+                        "name": "parcel-demo",
+                        "private": false
+                    }
+                }
             },
             "spec": {
                 "initializer": {

components/public-api/typescript-common/fixtures/toWorkspaceSession_2.golden

@@ -1,6 +1,6 @@
 {
     "result": {
-        "id": "",
+        "id": "8e8c7061-f312-4265-8d78-d824c0470dde",
         "workspace": {
             "id": "sveneffting-2048intermi-5vb9hvqev88",
             "metadata": {
@@ -11,7 +11,21 @@
                 "name": "svenefftinge/2048-in-terminal - master",
                 "pinned": false,
                 "originalContextUrl": "https://github.com/svenefftinge/2048-in-terminal",
-                "warnings": []
+                "warnings": [],
+                "context": {
+                    "path": "",
+                    "ref": "master",
+                    "refType": "REF_TYPE_BRANCH",
+                    "revision": "aac9c200a79e37ebe216bb90c829d5ab2771f2ee",
+                    "repository": {
+                        "cloneUrl": "https://github.com/svenefftinge/2048-in-terminal.git",
+                        "defaultBranch": "master",
+                        "host": "github.com",
+                        "owner": "svenefftinge",
+                        "name": "2048-in-terminal",
+                        "private": false
+                    }
+                }
             },
             "spec": {
                 "initializer": {