Skip to content

[server] Fix context setting for PRs for insights #20456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2024
Merged

[server] Fix context setting for PRs for insights #20456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/dashboard/src/insights/download/download-sessions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const downloadUsageCSV = async ({
}: Args): Promise<DownloadUsageCSVResponse> => {
const start = dayjs(from?.toDate()).format("YYYYMMDD");
const end = dayjs(to?.toDate()).format("YYYYMMDD");
const filename = `gitpod-usage-${organizationName}-${start}-${end}.csv`;
const filename = `gitpod-sessions-${organizationName}-${start}-${end}.csv`;

const records = await getAllWorkspaceSessions({
organizationId,
Expand Down
12 changes: 8 additions & 4 deletions components/public-api/typescript-common/src/public-api-converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ import {
WorkspaceSession_Owner,
WorkspaceSession_WorkspaceContext,
WorkspaceSession_WorkspaceContext_Repository,
WorkspaceSession_WorkspaceContext_RefType
WorkspaceSession_WorkspaceContext_RefType,
} from "@gitpod/public-api/lib/gitpod/v1/workspace_pb";
import { BigIntToJson } from "@gitpod/gitpod-protocol/lib/util/stringify";
import { getPrebuildLogPath } from "./prebuild-utils";
Expand Down Expand Up @@ -211,7 +211,9 @@ export class PublicAPIConverter {
const { metrics } = arg.instance.status;
result.metrics = new WorkspaceSession_Metrics({
totalImageSize: metrics?.image?.totalSize ? BigInt(metrics.image.totalSize) : undefined,
workspaceImageSize: metrics?.image?.workspaceImageSize ? BigInt(metrics.image.workspaceImageSize) : undefined,
workspaceImageSize: metrics?.image?.workspaceImageSize
? BigInt(metrics.image.workspaceImageSize)
: undefined,
});

result.id = arg.instance.id;
Expand Down Expand Up @@ -460,10 +462,12 @@ export class PublicAPIConverter {

toWorkspaceSessionContext(arg: WorkspaceContext): WorkspaceSession_WorkspaceContext {
const result = new WorkspaceSession_WorkspaceContext();
if (NavigatorContext.is(arg)) {
if (CommitContext.is(arg)) {
result.revision = arg.revision;
result.refType = this.toRefType(arg.refType);
result.path = arg.path;
if (NavigatorContext.is(arg)) {
result.path = arg.path;
}
result.repository = new WorkspaceSession_WorkspaceContext_Repository({
cloneUrl: arg.repository.cloneUrl,
host: arg.repository.host,
Expand Down
Loading