From 8ec00c26f87d68db6b0353ec7fb2d4e399878dd2 Mon Sep 17 00:00:00 2001 From: upsiflu Date: Tue, 1 Apr 2025 15:16:23 +0200 Subject: [PATCH] chore(front): correct types --- front/src/App.vue | 1 - front/src/components/Sidebar.vue | 592 ------------------ front/src/components/audio/ChannelForm.vue | 11 +- front/src/components/auth/Settings.vue | 3 +- .../federation/UserFollowButton.vue | 4 +- front/src/components/ui/Pills.vue | 1 + front/src/components/ui/Tabs.vue | 7 +- front/src/components/ui/button/Play.vue | 2 +- front/src/generated/types.ts | 28 +- front/src/views/auth/ProfileBase.vue | 120 ++-- 10 files changed, 109 insertions(+), 660 deletions(-) delete mode 100644 front/src/components/Sidebar.vue diff --git a/front/src/App.vue b/front/src/App.vue index c58f5e7e8..a30cba419 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -9,7 +9,6 @@ import { color } from '~/composables/color' import { generateTrackCreditStringFromQueue } from '~/utils/utils' -// import ChannelUploadModal from '~/components/channels/UploadModal.vue' import PlaylistModal from '~/components/playlists/PlaylistModal.vue' import FilterModal from '~/components/moderation/FilterModal.vue' import ReportModal from '~/components/moderation/ReportModal.vue' diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue deleted file mode 100644 index 0b2df42ef..000000000 --- a/front/src/components/Sidebar.vue +++ /dev/null @@ -1,592 +0,0 @@ - - - - - diff --git a/front/src/components/audio/ChannelForm.vue b/front/src/components/audio/ChannelForm.vue index 5646b1058..76076e190 100644 --- a/front/src/components/audio/ChannelForm.vue +++ b/front/src/components/audio/ChannelForm.vue @@ -46,11 +46,6 @@ const newValues = reactive({ metadata: { ...(props.object?.metadata ?? {}) } as Channel['metadata'] }) -const tagList = computed(() => ({ - currents: newValues.tags.map(tag => ({ type: 'custom' as const, label: tag })), - others: [].map(tag => ({ type: 'custom' as const, label: tag })) -})) - // If props has an object, then this form edits, else it creates // TODO: rename to `process : 'creating' | 'editing'` const creating = computed(() => props.object === null) @@ -257,7 +252,11 @@ defineExpose({
-import type { Actor } from '~/types' +import type { components } from '~/generated/types' import { computed } from 'vue' import { useI18n } from 'vue-i18n' @@ -15,7 +15,7 @@ interface Events { } interface Props { - actor: Actor + actor: components['schemas']['FullActor'] } const emit = defineEmits() diff --git a/front/src/components/ui/Pills.vue b/front/src/components/ui/Pills.vue index a68f57694..0b2afade9 100644 --- a/front/src/components/ui/Pills.vue +++ b/front/src/components/ui/Pills.vue @@ -64,6 +64,7 @@ onMounted(() => { for="dropdown" > + tabs.findIndex(({ title }) => title === actualCurrentTitle.value) ) -watch(() => tabs.length, (_, from) => { - if (from === 0) { +// select first tab +watch(tabs, () => { + if (tabs.length === 1) { currentTitle.value = tabs[0].title } }) @@ -43,7 +44,7 @@ watch(() => tabs.length, (_, from) => { ghost :class="{ 'is-active': actualCurrentTitle === tab.title }" v-bind="tab" - :on-click="() => { currentTitle = tab.title }" + :on-click="'to' in tab ? undefined : () => { currentTitle = tab.title }" class="tabs-item" @keydown.left="currentTitle = tabs[(currentIndex - 1 + tabs.length) % tabs.length].title" @keydown.right="currentTitle = tabs[(currentIndex + 1) % tabs.length].title" diff --git a/front/src/components/ui/button/Play.vue b/front/src/components/ui/button/Play.vue index d2b5b9cc5..eb93bab93 100644 --- a/front/src/components/ui/button/Play.vue +++ b/front/src/components/ui/button/Play.vue @@ -10,7 +10,7 @@ const play = defineEmits(['play']) class="play-button" shadow round - @click="play()" + @click="$emit('play')" /> diff --git a/front/src/generated/types.ts b/front/src/generated/types.ts index 14261d520..7bf2a1310 100644 --- a/front/src/generated/types.ts +++ b/front/src/generated/types.ts @@ -8437,6 +8437,7 @@ export interface components { channel?: string; /** @default pending */ import_status: components["schemas"]["ImportStatusEnum"]; + privacy_level?: components["schemas"]["LibraryPrivacyLevelEnum"]; import_metadata?: unknown; import_reference?: string; source?: string | null; @@ -8827,6 +8828,11 @@ export interface components { extension: string; readonly is_local: boolean; }; + UploadBulkUpdateRequest: { + /** Format: uuid */ + uuid: string; + privacy_level: components["schemas"]["LibraryPrivacyLevelEnum"]; + }; UploadForOwner: { /** Format: uuid */ readonly uuid: string; @@ -8844,6 +8850,7 @@ export interface components { readonly import_date: string | null; /** @default pending */ import_status: components["schemas"]["ImportStatusEnum"]; + privacy_level?: components["schemas"]["LibraryPrivacyLevelEnum"]; readonly import_details: unknown; import_metadata?: unknown; import_reference?: string; @@ -8857,6 +8864,7 @@ export interface components { channel?: string; /** @default pending */ import_status: components["schemas"]["ImportStatusEnum"]; + privacy_level: components["schemas"]["LibraryPrivacyLevelEnum"]; import_metadata?: unknown; import_reference?: string; source?: string | null; @@ -15694,12 +15702,12 @@ export interface operations { path?: never; cookie?: never; }; - requestBody?: { + requestBody: { content: { - "application/json": components["schemas"]["PatchedUploadForOwnerRequest"]; - "application/x-www-form-urlencoded": components["schemas"]["PatchedUploadForOwnerRequest"]; - "multipart/form-data": components["schemas"]["PatchedUploadForOwnerRequest"]; - "application/activity+json": components["schemas"]["PatchedUploadForOwnerRequest"]; + "application/json": components["schemas"]["UploadBulkUpdateRequest"][]; + "application/x-www-form-urlencoded": components["schemas"]["UploadBulkUpdateRequest"][]; + "multipart/form-data": components["schemas"]["UploadBulkUpdateRequest"][]; + "application/activity+json": components["schemas"]["UploadBulkUpdateRequest"][]; }; }; responses: { @@ -22863,12 +22871,12 @@ export interface operations { path?: never; cookie?: never; }; - requestBody?: { + requestBody: { content: { - "application/json": components["schemas"]["PatchedUploadForOwnerRequest"]; - "application/x-www-form-urlencoded": components["schemas"]["PatchedUploadForOwnerRequest"]; - "multipart/form-data": components["schemas"]["PatchedUploadForOwnerRequest"]; - "application/activity+json": components["schemas"]["PatchedUploadForOwnerRequest"]; + "application/json": components["schemas"]["UploadBulkUpdateRequest"][]; + "application/x-www-form-urlencoded": components["schemas"]["UploadBulkUpdateRequest"][]; + "multipart/form-data": components["schemas"]["UploadBulkUpdateRequest"][]; + "application/activity+json": components["schemas"]["UploadBulkUpdateRequest"][]; }; }; responses: { diff --git a/front/src/views/auth/ProfileBase.vue b/front/src/views/auth/ProfileBase.vue index 8a1609cf6..eaa4c87d2 100644 --- a/front/src/views/auth/ProfileBase.vue +++ b/front/src/views/auth/ProfileBase.vue @@ -1,8 +1,9 @@