From 95e3dcb130cf40f2967a5c7acec915de610be504 Mon Sep 17 00:00:00 2001
From: wvffle <funkwhale@wvffle.net>
Date: Wed, 31 Aug 2022 17:33:52 +0000
Subject: [PATCH] Fix tsc linter!

---
 front/src/components/channels/UploadForm.vue  | 18 ++++++++++--------
 .../channels/UploadMetadataForm.vue           | 19 ++++++++++---------
 front/src/types.ts                            |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/front/src/components/channels/UploadForm.vue b/front/src/components/channels/UploadForm.vue
index 2c12fb2f1..82128e365 100644
--- a/front/src/components/channels/UploadForm.vue
+++ b/front/src/components/channels/UploadForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { BackendError, Channel, Upload } from '~/types'
+import type { BackendError, Channel, Upload, Track } from '~/types'
 import type { VueUploadItem } from 'vue-upload-component'
 
 import { computed, ref, reactive, watchEffect, watch } from 'vue'
@@ -44,7 +44,7 @@ interface UploadStatus {
 interface UploadedFile extends VueUploadItem {
   _fileObj?: VueUploadItem
   removed: boolean
-  metadata: Record<string, string>
+  metadata: Metadata
 }
 
 const emit = defineEmits<Events>()
@@ -134,6 +134,7 @@ whenever(() => values.channel !== null, async () => {
 
     draftUploads.value = response.data.results as Upload[]
     for (const upload of response.data.results as Upload[]) {
+      // @ts-expect-error TODO (wvffle): Resolve type errors when API client is done
       uploadImportData[upload.uuid] = upload.import_metadata ?? {}
     }
   } catch (error) {
@@ -211,10 +212,11 @@ const uploadedFilesById = computed(() => uploadedFiles.value.reduce((acc: Record
 //
 // Metadata
 //
-const uploadImportData = reactive({} as Record<string, Record<string, string>>)
+type Metadata = Pick<Track, 'title' | 'description' | 'position' | 'tags'> & { cover: string }
+const uploadImportData = reactive({} as Record<string, Metadata>)
 const audioMetadata = reactive({} as Record<string, Record<string, string>>)
-const uploadData = reactive({} as Record<string, { import_metadata: Record<string, string> }>)
-const patchUpload = async (id: string, data: Record<string, Record<string, string>>) => {
+const uploadData = reactive({} as Record<string, { import_metadata: Metadata }>)
+const patchUpload = async (id: string, data: Record<string, Metadata>) => {
   const response = await axios.patch(`uploads/${id}/`, data)
   uploadData[id] = response.data
   uploadImportData[id] = response.data.import_metadata
@@ -232,9 +234,9 @@ const fetchAudioMetadata = async (uuid: string) => {
     uploadImportData[uuid].title = response.data.title
   }
 
-  for (const key of ['title', 'position', 'tags']) {
+  for (const key of ['title', 'position', 'tags'] as const) {
     if (uploadImportData[uuid][key] === undefined) {
-      uploadImportData[uuid][key] = response.data[key]
+      uploadImportData[uuid][key] = response.data[key] as never
     }
   }
 
@@ -248,7 +250,7 @@ const fetchAudioMetadata = async (uuid: string) => {
 watchEffect(async () => {
   for (const file of files.value) {
     if (file.response?.uuid && audioMetadata[file.response.uuid] === undefined) {
-      uploadData[file.response.uuid] = file.response as { import_metadata: Record<string, string> }
+      uploadData[file.response.uuid] = file.response as { import_metadata: Metadata }
       uploadImportData[file.response.uuid] = file.response.import_metadata
       fetchAudioMetadata(file.response.uuid)
     }
diff --git a/front/src/components/channels/UploadMetadataForm.vue b/front/src/components/channels/UploadMetadataForm.vue
index ee4742112..e04dc090f 100644
--- a/front/src/components/channels/UploadMetadataForm.vue
+++ b/front/src/components/channels/UploadMetadataForm.vue
@@ -1,35 +1,36 @@
 <script setup lang="ts">
-import type { Upload, Tag } from '~/types'
+import type { Upload, Tag, Track } from '~/types'
 
 import { reactive, computed, watch } from 'vue'
-import { useVModel } from '@vueuse/core'
 
 import TagsSelector from '~/components/library/TagsSelector.vue'
 import AttachmentInput from '~/components/common/AttachmentInput.vue'
 
+type Values = Pick<Track, 'title' | 'description' | 'position' | 'tags'> & { cover: string }
 interface Events {
   (e: 'update:values', values: Values): void
 }
 
 interface Props {
   upload: Upload
-  values: Values
+  values: Values | null
 }
 
-type Values = (Record<string, string> & { tags?: Tag[] }) | null
-
 const emit = defineEmits<Events>()
 const props = withDefaults(defineProps<Props>(), {
   values: null
 })
 
-const newValues = reactive<Exclude<Values, null>>({
-  ...(props.values ?? props.upload.import_metadata),
-  tags: (props.values ?? props.upload.import_metadata)?.tags ?? [] as Tag[]
+const newValues = reactive<Omit<Values, 'tags'> & { tags: Tag[] }>({
+  ...(props.values ?? props.upload.import_metadata ?? {}) as Values,
+  tags: ((props.values ?? props.upload.import_metadata)?.tags?.map(name => ({ name })) ?? []) as Tag[]
 })
 
 const isLoading = computed(() => !props.upload)
-watch(newValues, (values) => emit('update:values', values), { immediate: true })
+watch(newValues, (values) => emit('update:values', {
+  ...values,
+  tags: values.tags?.map(({ name }) => name)
+}), { immediate: true })
 </script>
 
 <template>
diff --git a/front/src/types.ts b/front/src/types.ts
index 91dce8f3a..537d83a1d 100644
--- a/front/src/types.ts
+++ b/front/src/types.ts
@@ -294,7 +294,7 @@ export interface Upload {
     error_code: string
   }
 
-  import_metadata?: Record<string, string> & { tags?: Tag[] }
+  import_metadata?: Record<string, string> & { tags?: string[] }
 }
 
 // Profile stuff