Skip to content

Add baseSessionID handling to DataServiceV2: #2821

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

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −0
Open

Add baseSessionID handling to DataServiceV2: #2821

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
34 changes: 34 additions & 0 deletions frontend/app/services/data_service_v2/data_service_v2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@ export class DataServiceV2 implements DataServiceV2Interface {
const searchParams = this.getSearchParams();
const sessionPath = searchParams.get('session_path');
const runPath = searchParams.get('run_path');
const baseSessionId = searchParams.get('base_session_id');
let params = new HttpParams();
if (sessionPath) {
params = params.set('session_path', sessionPath);
}
if (runPath) {
params = params.set('run_path', runPath);
}
if (baseSessionId) {
params = params.set('base_session_id', baseSessionId);
}
return params;
}

Expand Down Expand Up @@ -290,12 +294,16 @@ export class DataServiceV2 implements DataServiceV2Interface {

const sessionPath = this.getSearchParams().get('session_path');
const runPath = this.getSearchParams().get('run_path');
const baseSessionId = this.getSearchParams().get('base_session_id');
if (sessionPath) {
linkParams.set('session_path', sessionPath);
}
if (runPath) {
linkParams.set('run_path', runPath);
}
if (baseSessionId) {
linkParams.set('base_session_id', baseSessionId);
}
return `${window.parent.location.origin}?${linkParams.toString()}#profile`;
}
return '';
Expand Down Expand Up @@ -332,12 +340,16 @@ export class DataServiceV2 implements DataServiceV2Interface {
const searchParams = new URLSearchParams();
const sessionPath = this.getSearchParams().get('session_path');
const runPath = this.getSearchParams().get('run_path');
const baseSessionId = this.getSearchParams().get('base_session_id');
if (sessionPath) {
searchParams.set('session_path', sessionPath);
}
if (runPath) {
searchParams.set('run_path', runPath);
}
if (baseSessionId) {
searchParams.set('base_session_id', baseSessionId);
}
searchParams.set('run', sessionId);
searchParams.set('tag', 'graph_viewer');
for (const [key, value] of params.entries()) {
Expand Down Expand Up @@ -429,12 +441,16 @@ export class DataServiceV2 implements DataServiceV2Interface {
const searchParams = this.getSearchParams();
const sessionPath = searchParams.get('session_path');
const runPath = searchParams.get('run_path');
const baseSessionId = this.getSearchParams().get('base_session_id');
if (sessionPath) {
linkParams.set('session_path', sessionPath);
}
if (runPath) {
linkParams.set('run_path', runPath);
}
if (baseSessionId) {
linkParams.set('base_session_id', baseSessionId);
}
return `${window.parent.location.origin}/${DATA_API}?${linkParams.toString()}#profile`;
}
return '';
Expand Down Expand Up @@ -535,6 +551,20 @@ export class DataServiceV2 implements DataServiceV2Interface {
window.history.replaceState({}, '', newUrl);
}

getBaseSessionId(): string | null {
return this.getSearchParams().get('base_session_id');
}

setBaseSessionId(baseSessionId: string) {
const searchParams = this.getSearchParams();
if (baseSessionId) {
searchParams.set('base_session_id', baseSessionId);
} else {
searchParams.delete('base_session_id');
}
this.setSearchParams(searchParams);
}

exportDataAsCSV(
sessionId: string,
tool: string,
Expand Down Expand Up @@ -642,12 +672,16 @@ export class DataServiceV2 implements DataServiceV2Interface {
const sessionPath = searchParams.get('session_path');
const runPath = searchParams.get('run_path');
const host = searchParams.get('host');
const baseSessionId = searchParams.get('base_session_id');
if (sessionPath) {
params.set('session_path', sessionPath);
}
if (runPath) {
params.set('run_path', runPath);
}
if (baseSessionId) {
params.set('base_session_id', baseSessionId);
}
params.set('run', sessionId);
params.set('tag', 'roofline_model');
if (host) {
Expand Down
3 changes: 3 additions & 0 deletions frontend/app/services/data_service_v2/data_service_v2_interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ export interface DataServiceV2Interface {
getSearchParams(): URLSearchParams;
setSearchParams(searchParams: URLSearchParams): void;

getBaseSessionId(): string | null;
setBaseSessionId(sessionId: string): void;

// Export tool data for the given session as a CSV.
// tqx: additional query parameters to pass to the server. The format should
// be a semicolon-separated list of key-value pairs, for example,
Expand Down