From 098e7482470d872a38a84181f4af8ed525a51112 Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Wed, 13 Dec 2023 12:35:10 +0100 Subject: [PATCH 1/4] add filename to store --- report-viewer/src/stores/state.ts | 4 ++++ report-viewer/src/stores/store.ts | 6 ++++-- report-viewer/src/views/FileUploadView.vue | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/report-viewer/src/stores/state.ts b/report-viewer/src/stores/state.ts index 03e5543d8..b513f80d7 100644 --- a/report-viewer/src/stores/state.ts +++ b/report-viewer/src/stores/state.ts @@ -32,6 +32,10 @@ export interface State { fileIdToDisplayName: Map submissionIdsToComparisonFileName: Map> + /** + * Name of the file uploaded + */ + uploadedFileName: string } /** diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts index b4b714459..491ca6574 100644 --- a/report-viewer/src/stores/store.ts +++ b/report-viewer/src/stores/store.ts @@ -18,7 +18,8 @@ const store = defineStore('store', { singleModeUsed: false, // only used in single mode singleFillRawContent: '', - fileIdToDisplayName: new Map() + fileIdToDisplayName: new Map(), + uploadedFileName: '' }, uiState: { useDarkMode: false, @@ -101,7 +102,8 @@ const store = defineStore('store', { zipModeUsed: false, singleModeUsed: false, singleFillRawContent: '', - fileIdToDisplayName: new Map() + fileIdToDisplayName: new Map(), + uploadedFileName: '' } }, /** diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue index 7520aafa4..d4ea0f04f 100644 --- a/report-viewer/src/views/FileUploadView.vue +++ b/report-viewer/src/views/FileUploadView.vue @@ -162,6 +162,7 @@ async function uploadFileOnDrag(e: DragEvent) { let dropped = e.dataTransfer?.files try { if (dropped?.length === 1) { + store().state.uploadedFileName = dropped[0].name await handleFile(dropped[0]) } else { throw new Error('Not exactly one file') @@ -185,6 +186,7 @@ async function uploadFileThroughWindow() { if (!file) { return } + store().state.uploadedFileName = file.name handleFile(file) } input.click() @@ -209,6 +211,7 @@ async function loadQueryFile(url: URL) { * Handles click on Continue with local files. */ function continueWithLocal() { + store().state.uploadedFileName = 'results.zip' store().setLoadingType({ local: true, zip: localFiles.value === 'zip', @@ -219,6 +222,7 @@ function continueWithLocal() { function registerError(error: Error, source: fileMethod) { loadingFiles.value = false + store().state.uploadedFileName = '' errors.value.push({ error, source }) console.error(error) } From a4cd0c093659d4beb9e8ac4fdbf91550896a22de Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Wed, 13 Dec 2023 12:38:15 +0100 Subject: [PATCH 2/4] add filename to title --- report-viewer/src/views/FileUploadView.vue | 1 + report-viewer/src/views/OverviewView.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue index d4ea0f04f..788eac103 100644 --- a/report-viewer/src/views/FileUploadView.vue +++ b/report-viewer/src/views/FileUploadView.vue @@ -75,6 +75,7 @@ fetch('/results.zip') }) .catch(() => {}) +document.title = 'JPlag Report Viewer' const loadingFiles = ref(false) type fileMethod = 'query' | 'local' | 'upload' | 'unknown' const errors: Ref<{ error: Error; source: fileMethod }[]> = ref([]) diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue index 86717add0..1eb4eb440 100644 --- a/report-viewer/src/views/OverviewView.vue +++ b/report-viewer/src/views/OverviewView.vue @@ -139,6 +139,8 @@ const props = defineProps({ } }) +document.title = `JPlag Report - ${store().state.uploadedFileName}` + const hasMoreSubmissionPaths = computed(() => props.overview.submissionFolderPath.length > 1) const submissionPathValue = computed(() => hasMoreSubmissionPaths.value From eb071b0f983be6a6ee0374a26ac7c8636f198f15 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Wed, 13 Dec 2023 14:18:46 +0100 Subject: [PATCH 3/4] zip name on views --- report-viewer/src/views/InformationView.vue | 3 +++ report-viewer/src/views/OverviewView.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/report-viewer/src/views/InformationView.vue b/report-viewer/src/views/InformationView.vue index e7ff2bc1c..3ef10da5d 100644 --- a/report-viewer/src/views/InformationView.vue +++ b/report-viewer/src/views/InformationView.vue @@ -17,6 +17,9 @@ {{ overview.matchSensitivity }} + {{ + store().state.uploadedFileName + }} diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue index 1eb4eb440..8f1ea15e4 100644 --- a/report-viewer/src/views/OverviewView.vue +++ b/report-viewer/src/views/OverviewView.vue @@ -8,6 +8,9 @@

JPlag Report

{{ submissionPathValue }} + {{ + store().state.uploadedFileName + }} {{ store().getSubmissionIds.length }} From 93ef1675457f34e7a32eb14bea69ab8441cf7c41 Mon Sep 17 00:00:00 2001 From: Sebastian Hahner Date: Fri, 12 Jan 2024 16:28:38 +0100 Subject: [PATCH 4/4] Change order of information displayed in the window title. --- report-viewer/src/views/OverviewView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue index 8f1ea15e4..21f042c21 100644 --- a/report-viewer/src/views/OverviewView.vue +++ b/report-viewer/src/views/OverviewView.vue @@ -142,7 +142,7 @@ const props = defineProps({ } }) -document.title = `JPlag Report - ${store().state.uploadedFileName}` +document.title = `${store().state.uploadedFileName} - JPlag Report Viewer` const hasMoreSubmissionPaths = computed(() => props.overview.submissionFolderPath.length > 1) const submissionPathValue = computed(() =>