Merge pull request #1444 from jplag/report-viewer/show-zip-name

add zipfilename to title and overview
jplag · Jan 12, 2024 · 256b149 · 256b149
2 parents d985ce7 + 93ef167
commit 256b149
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/report-viewer/src/stores/state.ts b/report-viewer/src/stores/state.ts
@@ -36,6 +36,10 @@ export interface State {
 
   fileIdToDisplayName: Map<string, string>
   submissionIdsToComparisonFileName: Map<string, Map<string, string>>
+  /**
+   * Name of the file uploaded
+   */
+  uploadedFileName: string
 }
 
 /**

diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts
@@ -19,7 +19,8 @@ const store = defineStore('store', {
       singleModeUsed: false,
       // only used in single mode
       singleFillRawContent: '',
-      fileIdToDisplayName: new Map()
+      fileIdToDisplayName: new Map(),
+      uploadedFileName: ''
     },
     uiState: {
       useDarkMode: false,
@@ -125,7 +126,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
@@ -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([])
@@ -162,6 +163,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 +187,7 @@ async function uploadFileThroughWindow() {
     if (!file) {
       return
     }
+    store().state.uploadedFileName = file.name
     handleFile(file)
   }
   input.click()
@@ -209,6 +212,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 +223,7 @@ function continueWithLocal() {
 
 function registerError(error: Error, source: fileMethod) {
   loadingFiles.value = false
+  store().state.uploadedFileName = ''
   errors.value.push({ error, source })
   console.error(error)
 }

diff --git a/report-viewer/src/views/InformationView.vue b/report-viewer/src/views/InformationView.vue
@@ -17,6 +17,9 @@
         <TextInformation label="Min Token Match" class="pb-1">{{
           overview.matchSensitivity
         }}</TextInformation>
+        <TextInformation label="Result File Name">{{
+          store().state.uploadedFileName
+        }}</TextInformation>
       </ScrollableComponent>
     </Container>
 

diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
@@ -8,6 +8,9 @@
         <h2>JPlag Report</h2>
         <div class="flex flex-row items-center space-x-5">
           <TextInformation label="Submission Directory">{{ submissionPathValue }}</TextInformation>
+          <TextInformation label="Result name">{{
+            store().state.uploadedFileName
+          }}</TextInformation>
           <TextInformation label="Total Submissions">{{
             store().getSubmissionIds.length
           }}</TextInformation>
@@ -139,6 +142,8 @@ const props = defineProps({
   }
 })
 
+document.title = `${store().state.uploadedFileName} - JPlag Report Viewer`
+
 const hasMoreSubmissionPaths = computed(() => props.overview.submissionFolderPath.length > 1)
 const submissionPathValue = computed(() =>
   hasMoreSubmissionPaths.value