From 1ce47a1f2286040ec002f7080cd25229a325e03c Mon Sep 17 00:00:00 2001
From: Eric <5089238+emizzle@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:51:33 +1000
Subject: [PATCH] clean up request fetching

---
 src/components/StorageRequests.vue |  9 +++------
 src/views/RequestView.vue          | 25 ++++++-------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/components/StorageRequests.vue b/src/components/StorageRequests.vue
index 3491b93..1a9507b 100644
--- a/src/components/StorageRequests.vue
+++ b/src/components/StorageRequests.vue
@@ -7,22 +7,19 @@ import { useRequestsStore } from '@/stores/requests'
 import StateIndicator from '@/components/StateIndicator.vue'
 import RelativeTime from '@/components/RelativeTime.vue'
 import ShortenValue from '@/components/ShortenValue.vue'
-import {
-  getStateColour,
-  moderatedState
-} from '@/utils/requests'
+import { getStateColour, moderatedState } from '@/utils/requests'
 
 const requestsStore = useRequestsStore()
 const { requests } = storeToRefs(requestsStore)
 const router = useRouter()
 const requestsOrdered = computed(() => {
-  const sorted = [...Object.entries(requests.value)].sort(
+  const sorted = Object.entries(requests.value).sort(
     ([reqIdA, reqA], [reqIdB, reqB]) => reqB.requestedAt - reqA.requestedAt
   )
   return sorted
 })
 
-const props = defineProps({
+defineProps({
   enableModeration: {
     type: Boolean,
     default: false
diff --git a/src/views/RequestView.vue b/src/views/RequestView.vue
index 95ddf6c..3106afe 100644
--- a/src/views/RequestView.vue
+++ b/src/views/RequestView.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useRequestsStore } from '@/stores/requests'
 import { useRoute, useRouter } from 'vue-router'
@@ -10,12 +10,11 @@ const requestsStore = useRequestsStore()
 const { requests, loading, fetched } = storeToRefs(requestsStore)
 const route = useRoute()
 const router = useRouter()
-const request = ref(requests.value[route.params.requestId])
 
-async function fetchRequestDetails(requestId) {
+async function fetchRequest(requestId) {
   console.log('request id route param changed, fetching...')
   try {
-    await requestsStore.fetchRequest(requestId)
+    await requestsStore.fetchRequestDetails(requestId)
   } catch (error) {
     if (
       error.message.includes('Unknown request') ||
@@ -26,22 +25,10 @@ async function fetchRequestDetails(requestId) {
   }
 }
 
-// TODO: I don't understand why the request ref isn't reactive and/or v-model
-// can't be set to requests.value[route.params.requestId] directly. So instead,
-// we need this watch
-watch(
-  () => requests.value[route.params.requestId],
-  (req) => {
-    request.value = req
-  }
-)
-
-const hasRequest = computed(() => {
-  return request.value !== undefined
-})
+const request = computed(() => requests.value[route.params.requestId])
 
 function watchRequestId() {
-  watch(() => route.params.requestId, fetchRequestDetails, { immediate: true })
+  watch(() => route.params.requestId, fetchRequest, { immediate: true })
 }
 
 if (fetched.value) {
@@ -55,7 +42,7 @@ if (fetched.value) {
   <div>
     <SkeletonLoading v-if="loading" type="image" />
     <StorageRequest
-      v-else-if="hasRequest"
+      v-else
       :requestId="route.params.requestId"
       v-model="request"
       :enableModeration="route.query.enableModeration === 'true'"