Skip to content

Commit ab3d902

Browse files
author
Nadim Ritter
committed
SEBSP-205 application view metadata in url query
1 parent a800df3 commit ab3d902

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

client/src/components/views/proctoring/ProctoringApplicationSearchPage.vue

+8-6
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,12 @@
226226
//store
227227
const appBarStore = useAppBarStore();
228228
229-
//router params
230-
const sessionId: string = useRoute().params.sessionId.toString();
231-
const metadataApp: string = useRoute().params.metadataApp.toString();
232-
const metadataWindow: string = useRoute().params.metadataWindow.toString();
229+
//router params & query
230+
const route = useRoute();
231+
const sessionId: string = route.params.sessionId.toString();
232+
const metadataApp = route.query.metadataApp ?? "";
233+
const metadataWindow = route.query.metadataWindow ?? "";
234+
233235
234236
//fullscreen
235237
const videoPlayer = ref(null);
@@ -301,8 +303,8 @@
301303
const timestamps: number[] | null =
302304
await applicationsSearchViewService.getTimestampListForApplicationSearch(
303305
sessionId,
304-
metadataApp,
305-
metadataWindow
306+
metadataApp.toString(),
307+
metadataWindow.toString()
306308
);
307309
308310
if(timestamps == null){

client/src/router/navigation.ts

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ export function navigateTo(navPath: string){
99
export function openUrlInNewTab(url: string){
1010
//@ts-ignore
1111
window.open("", "_blank").location.href = router.resolve(url).href;
12+
}
13+
14+
export function openUrlInNewTabApplicationView(url: string){
15+
window.open(url, "_blank");
1216
}

client/src/router/router.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const routes: Array<RouteRecordRaw> = [
113113
}
114114
},
115115
{
116-
path: constants.PROCTORING_APPLICATION_SEARCH_ROUTE + "/:sessionId/:metadataApp/:metadataWindow",
116+
path: constants.PROCTORING_APPLICATION_SEARCH_ROUTE + "/:sessionId",
117117
name: "ProctoringApplicationSearchPage",
118118
component: ProctoringApplicationSearchPage,
119119
meta: {

client/src/services/component-services/searchViewService.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as searchService from "@/services/api-services/searchService";
22
import * as timeUtils from "@/utils/timeUtils";
33
import * as tableUtils from "@/utils/table/tableUtils";
4-
import {openUrlInNewTab} from "@/router/navigation";
4+
import {openUrlInNewTab, openUrlInNewTabApplicationView} from "@/router/navigation";
55
import * as constants from "@/utils/constants";
6+
import { useRoute } from "vue-router";
67

78
//=============api==============
89
export async function searchSessionsDay(optionalParamters?: OptionalParSearchSessions): Promise<string[] | null>{
@@ -73,7 +74,10 @@ export function openProctoringView(sessionId: string, timestamp?: string){
7374
}
7475

7576
export function openProctoringApplicationSearch(sessionId: string, metadataApp: string, metadataWindow: string){
76-
const url: string = constants.PROCTORING_APPLICATION_SEARCH_ROUTE + "/" + sessionId + "/" + metadataApp + "/" + metadataWindow;
77-
openUrlInNewTab(url);
77+
const url: URL = new URL(window.location.origin + constants.PROCTORING_APPLICATION_SEARCH_ROUTE + "/" + sessionId);
78+
url.searchParams.set("metadataApp", metadataApp);
79+
url.searchParams.set("metadataWindow", metadataWindow);
80+
81+
openUrlInNewTabApplicationView(url.toString());
7882
}
7983
//==============================

0 commit comments

Comments
 (0)