fix: versions v2 fixes (#5106)

* update dependencies step to show when cannot detect suggested dependencies

* rollback environment to previous copy

* implement disable close when uploading in modal

* pnpm prepr
This commit is contained in:
Truman Gao
2026-01-12 17:12:10 -07:00
committed by GitHub
parent 8d72a42be5
commit 40f5db64d8
9 changed files with 162 additions and 65 deletions

View File

@@ -9,6 +9,7 @@
:items="['release', 'beta', 'alpha']"
:never-empty="true"
:capitalize="true"
:disabled="isUploading"
/>
</div>
<div class="flex flex-col gap-2">
@@ -18,6 +19,7 @@
<input
id="version-number"
v-model="draftVersion.version_number"
:disabled="isUploading"
placeholder="Enter version number, e.g. 1.2.3-alpha.1"
type="text"
autocomplete="off"
@@ -34,6 +36,7 @@
type="text"
autocomplete="off"
maxlength="256"
:disabled="isUploading"
/>
</div>
<div class="flex flex-col gap-2">
@@ -44,6 +47,7 @@
v-model="draftVersion.changelog"
:on-image-upload="onImageUpload"
:min-height="150"
:disabled="isUploading"
/>
</div>
</div>
@@ -56,7 +60,7 @@ import { Chips, MarkdownEditor } from '@modrinth/ui'
import { useImageUpload } from '~/composables/image-upload.ts'
import { injectManageVersionContext } from '~/providers/version/manage-version-modal'
const { draftVersion } = injectManageVersionContext()
const { draftVersion, isUploading } = injectManageVersionContext()
async function onImageUpload(file: File) {
const response = await useImageUpload(file, { context: 'version' })

View File

@@ -78,7 +78,7 @@ export interface ManageVersionContextValue {
dependencyVersions: Ref<Record<string, Labrinth.Versions.v3.Version>>
projectsFetchLoading: Ref<boolean>
handlingNewFiles: Ref<boolean>
suggestedDependencies: Ref<SuggestedDependency[]>
suggestedDependencies: Ref<SuggestedDependency[] | null>
visibleSuggestedDependencies: ComputedRef<SuggestedDependency[]>
primaryFile: ComputedRef<PrimaryFile | null>
@@ -177,7 +177,7 @@ export function createManageVersionContext(
const dependencyProjects = ref<Record<string, Labrinth.Projects.v3.Project>>({})
const dependencyVersions = ref<Record<string, Labrinth.Versions.v3.Version>>({})
const projectsFetchLoading = ref(false)
const suggestedDependencies = ref<SuggestedDependency[]>([])
const suggestedDependencies = ref<SuggestedDependency[] | null>(null)
const isSubmitting = ref(false)
const isUploading = ref(false)
@@ -238,7 +238,7 @@ export function createManageVersionContext(
return existing.version_id === dep.version_id
})
return suggestedDependencies.value
return (suggestedDependencies.value ?? [])
.filter((dep) => !isDuplicateSuggestion(dep))
.filter((dep) => !isAlreadyAdded(dep))
.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? ''))
@@ -559,20 +559,20 @@ export function createManageVersionContext(
async (loaders) => {
if (noDependenciesProject.value) return
try {
suggestedDependencies.value = []
if (!loaders?.length) return
const projectId = draftVersion.value.project_id
if (!projectId) return
try {
const versions = await labrinth.versions_v3.getProjectVersions(projectId, {
let versions = await labrinth.versions_v3.getProjectVersions(projectId, {
loaders,
})
if (!versions || versions.length === 0) {
versions = await labrinth.versions_v3.getProjectVersions(projectId)
}
// Get the most recent matching version and extract its dependencies
if (versions.length > 0) {
suggestedDependencies.value = []
const mostRecentVersion = versions[0]
for (const dep of mostRecentVersion.dependencies) {
suggestedDependencies.value.push({
@@ -582,12 +582,14 @@ export function createManageVersionContext(
file_name: dep.file_name,
})
}
} else {
suggestedDependencies.value = null
}
} catch (error: any) {
console.error(`Failed to get versions for project ${projectId}:`, error)
}
for (const dep of suggestedDependencies.value) {
for (const dep of suggestedDependencies.value ?? []) {
try {
if (dep.project_id) {
const proj = await getProject(dep.project_id)

View File

@@ -10,7 +10,7 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
id: 'add-dependencies',
stageContent: markRaw(DependenciesStage),
title: (ctx) => (ctx.editingVersion.value ? 'Edit dependencies' : 'Dependencies'),
skip: true,
skip: (ctx) => ctx.suggestedDependencies.value != null,
leftButtonConfig: (ctx) =>
ctx.editingVersion.value
? {

View File

@@ -11,6 +11,7 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
stageContent: markRaw(DetailsStage),
title: (ctx) => (ctx.editingVersion.value ? 'Edit details' : 'Details'),
maxWidth: '744px',
disableClose: (ctx) => ctx.isUploading.value,
leftButtonConfig: (ctx) =>
ctx.editingVersion.value
? {
@@ -21,6 +22,7 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
: {
label: 'Back',
icon: LeftArrowIcon,
disabled: ctx.isUploading.value,
onClick: () => ctx.modal.value?.prevStage(),
},
rightButtonConfig: (ctx) => ({
@@ -29,7 +31,7 @@ export const stageConfig: StageConfigInput<ManageVersionContextValue> = {
: ctx.isUploading.value
? ctx.uploadProgress.value.progress >= 1
? 'Creating version'
: `Uploading version ${Math.round(ctx.uploadProgress.value.progress * 100)}%`
: `Uploading ${Math.round(ctx.uploadProgress.value.progress * 100)}%`
: 'Create version',
icon: ctx.isSubmitting.value ? SpinnerIcon : ctx.editingVersion.value ? SaveIcon : PlusIcon,
iconPosition: 'before',