From 237192897052af2c9333ad752f48aa713893fb89 Mon Sep 17 00:00:00 2001
From: Zisu Zhang <thezzisu@gmail.com>
Date: Mon, 22 Jan 2024 13:28:28 +0800
Subject: [PATCH] fix: solution details (#33)

---
 .yarn/versions/69848106.yml                   |  3 +++
 .../src/components/solution/SolutionList.vue  |  2 +-
 .../solution/SolutionStatusChip.vue           |  3 ++-
 .../src/components/solution/SolutionView.vue  |  6 ++---
 .../components/utils/zip/ZipAutoViewer.vue    |  3 ++-
 .../src/components/utils/zip/ZipViewer.vue    | 22 ++++++++++-------
 apps/frontend/src/pages/auth/login/iaaa.vue   | 12 ++++++----
 apps/frontend/src/pages/auth/login/mail.vue   |  9 ++++---
 .../src/pages/auth/login/password.vue         | 15 ++++--------
 apps/frontend/src/pages/auth/verify.vue       |  2 +-
 apps/frontend/src/pages/signup.vue            |  2 +-
 apps/frontend/src/router/index.ts             |  3 ++-
 apps/frontend/src/stores/app.ts               | 24 ++++++++++++++++++-
 apps/server/src/routes/problem/solution.ts    |  4 ++++
 14 files changed, 72 insertions(+), 38 deletions(-)
 create mode 100644 .yarn/versions/69848106.yml

diff --git a/.yarn/versions/69848106.yml b/.yarn/versions/69848106.yml
new file mode 100644
index 0000000..85ee0e5
--- /dev/null
+++ b/.yarn/versions/69848106.yml
@@ -0,0 +1,3 @@
+releases:
+  "@aoi-js/frontend": patch
+  "@aoi-js/server": patch
diff --git a/apps/frontend/src/components/solution/SolutionList.vue b/apps/frontend/src/components/solution/SolutionList.vue
index 606b92e..a4183ee 100644
--- a/apps/frontend/src/components/solution/SolutionList.vue
+++ b/apps/frontend/src/components/solution/SolutionList.vue
@@ -23,7 +23,7 @@
       <PrincipalProfile :principal-id="item.userId" />
     </template>
     <template v-slot:[`item.title`]="{ item }">
-      <RouterLink :to="rel(item._id)" style="color: primary">
+      <RouterLink v-if="contestId" :to="rel(item._id)" style="color: primary">
         {{ useContestProblemTitle(item.problemId)?.value }}
       </RouterLink>
     </template>
diff --git a/apps/frontend/src/components/solution/SolutionStatusChip.vue b/apps/frontend/src/components/solution/SolutionStatusChip.vue
index fcc99d2..b854b74 100644
--- a/apps/frontend/src/components/solution/SolutionStatusChip.vue
+++ b/apps/frontend/src/components/solution/SolutionStatusChip.vue
@@ -19,7 +19,8 @@ const props = defineProps<{
 }>()
 
 const knownStatus: Record<string, [string, string]> = {
-  Accepted: ['mdi-check', 'success']
+  Accepted: ['mdi-check', 'success'],
+  Success: ['mdi-check', 'info']
 }
 const display = computed(() => knownStatus[props.status] ?? ['mdi-circle-outline', ''])
 </script>
diff --git a/apps/frontend/src/components/solution/SolutionView.vue b/apps/frontend/src/components/solution/SolutionView.vue
index e30120a..35d11aa 100644
--- a/apps/frontend/src/components/solution/SolutionView.vue
+++ b/apps/frontend/src/components/solution/SolutionView.vue
@@ -9,7 +9,7 @@
             <!-- <th class="text-center">{{ t('term.hash') }}</th>
             <th class="text-center">{{ t('term.runner-label') }}</th> -->
             <th class="text-center">{{ t('term.user') }}</th>
-            <th class="text-center">{{ t('term.title') }}</th>
+            <th class="text-center" v-if="contestId">{{ t('term.title') }}</th>
             <th class="text-center" v-text="t('common.created-at')" />
             <th class="text-center" v-if="value.submittedAt" v-text="t('common.submitted-at')" />
           </thead>
@@ -34,7 +34,7 @@
               <td class="text-center">
                 <PrincipalProfile :principal-id="value.userId" />
               </td>
-              <td class="text-center">
+              <td class="text-center" v-if="contestId">
                 <code>{{ useContestProblemTitle(value.problemId)?.value }}</code>
               </td>
               <td class="text-center" v-text="new Date(value.createdAt).toLocaleString()" />
@@ -98,7 +98,7 @@
     <VBtn v-if="showData && !viewFile" :text="t('action.view')" @click="viewFile = true" />
   </VCardActions>
   <VCardText v-if="showData && viewFile">
-    <ZipAutoViewer :endpoint="downloadEndpoint" default-file="answer.code" />
+    <ZipAutoViewer :endpoint="downloadEndpoint" default-file="answer.code" show-metadata />
   </VCardText>
   <template v-if="showDetails && solution.state.value?.state === 4">
     <VDivider />
diff --git a/apps/frontend/src/components/utils/zip/ZipAutoViewer.vue b/apps/frontend/src/components/utils/zip/ZipAutoViewer.vue
index 6b2f9a7..8970da4 100644
--- a/apps/frontend/src/components/utils/zip/ZipAutoViewer.vue
+++ b/apps/frontend/src/components/utils/zip/ZipAutoViewer.vue
@@ -1,5 +1,5 @@
 <template>
-  <ZipViewer v-if="zip" :zip="zip" :default-file="props.defaultFile" />
+  <ZipViewer v-if="zip" :zip="zip" :default-file="defaultFile" :show-metadata="showMetadata" />
 </template>
 
 <script setup lang="ts">
@@ -12,6 +12,7 @@ import ZipViewer from './ZipViewer.vue'
 const props = defineProps<{
   endpoint: string
   defaultFile?: string
+  showMetadata?: boolean
 }>()
 const zip = shallowRef<JSZip>()
 
diff --git a/apps/frontend/src/components/utils/zip/ZipViewer.vue b/apps/frontend/src/components/utils/zip/ZipViewer.vue
index 93ba0b6..812704d 100644
--- a/apps/frontend/src/components/utils/zip/ZipViewer.vue
+++ b/apps/frontend/src/components/utils/zip/ZipViewer.vue
@@ -5,10 +5,10 @@
         <div>
           <VList density="compact">
             <VListItem
-              v-for="file in props.zip.files"
-              :key="file.name"
-              :title="file.name"
-              @click="currentFile = file"
+              v-for="name in files"
+              :key="zip.files[name].name"
+              :title="zip.files[name].name"
+              @click="currentFile = zip.files[name]"
             />
           </VList>
         </div>
@@ -27,11 +27,17 @@ import ZipFileViewer from './ZipFileViewer.vue'
 const props = defineProps<{
   zip: JSZip
   defaultFile?: string
+  showMetadata?: boolean
 }>()
 
+const files = computed(() => {
+  const keys = Object.keys(props.zip.files)
+  if (props.showMetadata) return keys
+  return keys.filter((fn) => fn !== '.metadata.json')
+})
+
 const showSideBar = computed(() => {
-  // show iff there are more than one files, excluding .metadata.json
-  return Object.keys(props.zip.files).filter((fn) => fn !== '.metadata.json').length > 1
+  return files.value.length > 1
 })
 
 const currentFile = shallowRef<JSZip.JSZipObject>()
@@ -42,8 +48,8 @@ function initialize() {
   if (props.defaultFile) {
     currentFile.value = props.zip.file(props.defaultFile) ?? undefined
   }
-  if (!currentFile.value && Object.keys(props.zip.files).length == 1) {
-    currentFile.value = props.zip.files[Object.keys(props.zip.files)[0]]
+  if (!currentFile.value && !showSideBar.value) {
+    currentFile.value = props.zip.files[files.value[0]]
   }
 }
 initialize()
diff --git a/apps/frontend/src/pages/auth/login/iaaa.vue b/apps/frontend/src/pages/auth/login/iaaa.vue
index 7ce319a..26846cb 100644
--- a/apps/frontend/src/pages/auth/login/iaaa.vue
+++ b/apps/frontend/src/pages/auth/login/iaaa.vue
@@ -7,14 +7,17 @@
 
 <script setup lang="ts">
 import { useAsyncTask } from '@/utils/async'
-import { http, login, prettyHTTPError } from '@/utils/http'
+import { http, prettyHTTPError } from '@/utils/http'
 import { onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { getToken } from '@/utils/user/iaaa'
+import { useLogin } from '@/stores/app'
 
 const { t } = useI18n()
 const router = useRouter()
+const route = useRoute()
+const { postLogin } = useLogin()
 
 const task = useAsyncTask(async () => {
   try {
@@ -27,10 +30,9 @@ const task = useAsyncTask(async () => {
       }
     })
     const { token } = await resp.json<{ token: string }>()
-    login(token)
-    router.replace('/')
+    postLogin(token)
   } catch (err) {
-    router.replace('/login')
+    router.replace({ path: '/auth/login', query: route.query })
     throw new Error(await prettyHTTPError(err))
   }
 })
diff --git a/apps/frontend/src/pages/auth/login/mail.vue b/apps/frontend/src/pages/auth/login/mail.vue
index 30f3b63..4563df4 100644
--- a/apps/frontend/src/pages/auth/login/mail.vue
+++ b/apps/frontend/src/pages/auth/login/mail.vue
@@ -30,16 +30,16 @@
 </template>
 
 <script setup lang="ts">
-import { http, login, prettyHTTPError } from '@/utils/http'
+import { useLogin } from '@/stores/app'
+import { http, prettyHTTPError } from '@/utils/http'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 import type { SubmitEventPromise } from 'vuetify'
 
 const { t } = useI18n()
-const router = useRouter()
 const toast = useToast()
+const { postLogin } = useLogin()
 
 const email = ref('')
 const emailIcon = ref('mdi-send')
@@ -97,8 +97,7 @@ async function signin(ev: SubmitEventPromise) {
     })
     const { token } = await resp.json<{ token: string }>()
     toast.success(t('hint.signin-success'))
-    login(token)
-    router.replace('/')
+    postLogin(token)
   } catch (err) {
     toast.error(t('hint.signin-wrong-credentials'))
   }
diff --git a/apps/frontend/src/pages/auth/login/password.vue b/apps/frontend/src/pages/auth/login/password.vue
index 0a66210..2c55a4b 100644
--- a/apps/frontend/src/pages/auth/login/password.vue
+++ b/apps/frontend/src/pages/auth/login/password.vue
@@ -30,16 +30,16 @@
 </template>
 
 <script setup lang="ts">
-import { http, login } from '@/utils/http'
+import { useLogin } from '@/stores/app'
+import { http } from '@/utils/http'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 import type { SubmitEventPromise } from 'vuetify'
 
 const { t } = useI18n()
-const router = useRouter()
 const toast = useToast()
+const { postLogin } = useLogin()
 
 const username = ref('')
 const password = ref('')
@@ -76,14 +76,9 @@ async function signin(ev: SubmitEventPromise) {
         }
       }
     })
-    const { token, userId } = await resp.json<{ token?: string; userId?: string }>()
+    const { token } = await resp.json<{ token: string }>()
     toast.success(t('hint.signin-success'))
-    if (token) {
-      login(token)
-      router.replace('/')
-    } else {
-      router.replace(`/initial?uid=${userId}`)
-    }
+    postLogin(token)
   } catch (err) {
     toast.error(t('hint.signin-wrong-credentials'))
   }
diff --git a/apps/frontend/src/pages/auth/verify.vue b/apps/frontend/src/pages/auth/verify.vue
index 5ba3302..db51fb6 100644
--- a/apps/frontend/src/pages/auth/verify.vue
+++ b/apps/frontend/src/pages/auth/verify.vue
@@ -44,7 +44,7 @@ const appState = useAppState()
 const { hasMfaToken } = useMfa()
 withI18nTitle('pages.verify')
 
-if (!appState.loggedIn) router.replace('/login')
+if (!appState.loggedIn) router.replace('/auth/login')
 if (hasMfaToken.value) router.replace('/')
 
 const hint = import.meta.env.VITE_VERIFY_HINT
diff --git a/apps/frontend/src/pages/signup.vue b/apps/frontend/src/pages/signup.vue
index 3d84550..9e3f67c 100644
--- a/apps/frontend/src/pages/signup.vue
+++ b/apps/frontend/src/pages/signup.vue
@@ -180,7 +180,7 @@ async function signup() {
     const { token } = await resp.json<{ token: string }>()
     login(token)
     toast.success(t('hint.signup-success'))
-    router.push('/login')
+    router.push('auth/login')
   } catch (error) {
     toast.error(t('hint.signup-username-exists'))
     return
diff --git a/apps/frontend/src/router/index.ts b/apps/frontend/src/router/index.ts
index e747535..ac320a0 100644
--- a/apps/frontend/src/router/index.ts
+++ b/apps/frontend/src/router/index.ts
@@ -15,7 +15,8 @@ const router = createRouter({
 
 router.beforeEach((to, from, next) => {
   const appState = useAppState()
-  if (to.path.startsWith('/org') && !appState.loggedIn) return next('/login')
+  if (to.path.startsWith('/org') && !appState.loggedIn)
+    return next({ path: '/auth/login', query: { redirect: to.fullPath } })
   return next()
 })
 
diff --git a/apps/frontend/src/stores/app.ts b/apps/frontend/src/stores/app.ts
index 6af8dd5..32d7f04 100644
--- a/apps/frontend/src/stores/app.ts
+++ b/apps/frontend/src/stores/app.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 import { useAsyncState, useLocalStorage, useTitle, watchDebounced } from '@vueuse/core'
-import { http, isLoggedIn, userId } from '@/utils/http'
+import { http, isLoggedIn, login, userId } from '@/utils/http'
 import { useRoute, useRouter } from 'vue-router'
 import type { IOrgProfile, IUserProfile } from '@/types'
 
@@ -106,3 +106,25 @@ export function useMfa() {
     }
   }
 }
+
+export function useLogin() {
+  const router = useRouter()
+  const route = useRoute()
+  return {
+    isLoggedIn,
+    postLogin: (token: string) => {
+      login(token)
+      if (route.query.redirect) {
+        router.replace(`${route.query.redirect}`)
+      } else {
+        router.replace('/')
+      }
+    },
+    doLogin: () => {
+      router.push({
+        path: '/auth/login',
+        query: { redirect: route.fullPath }
+      })
+    }
+  }
+}
diff --git a/apps/server/src/routes/problem/solution.ts b/apps/server/src/routes/problem/solution.ts
index 89e707f..9e34cd0 100644
--- a/apps/server/src/routes/problem/solution.ts
+++ b/apps/server/src/routes/problem/solution.ts
@@ -56,6 +56,8 @@ const solutionScopedRoutes = defineRoutes(async (s) => {
           200: Type.Object({
             _id: Type.UUID(),
             label: Type.String(),
+            problemId: Type.UUID(),
+            userId: Type.UUID(),
             problemDataHash: Type.String(),
             state: Type.Integer(),
             score: Type.Number(),
@@ -81,6 +83,8 @@ const solutionScopedRoutes = defineRoutes(async (s) => {
         {
           projection: {
             label: 1,
+            problemId: 1,
+            userId: 1,
             problemDataHash: 1,
             state: 1,
             score: 1,