* feat: base content card component * fix: tooltips + colors * feat: fix orgs * feat: base content tab internals rewrite * feat: fix invalidmodal * feat: add ContentModpackCard * fix: extract types * draft: layout * feat: unlink modal * feat: impl content tab * fix: lint * fix: toggling * temp: disable updating stuff * feat: selection v-model * feat: bulk selection * feat: mods tab rough draft * feat: use fuse.js * feat: add project combobox * clean up project combobox * feat: start install to play modal * fix: events * feat: use v-on * feat: bulk actions + fix floating action bar width * feat: figma alignments * feat: migrate toggle to tailwind * fix: row borders * feat: disabled state * feat: virtual list impl for card table based on window scroll * fix: lint * feat: virtualization + smaller contentcard items * feat: use ContentCardTable + ContentCardItems * feat: fix gap + border issues on last elm * feat: cleanup + use proper searching * fix: use TeleportOverflowMenu * fix: fallback to svg if src is invalid on avatar component * fix: storybook * feat: start on updater modal * feat: finish content updater modal * feat: i18n pass * feat: impl modal * feat(app): backend changes for content tab refactor (#5237) * feat: include_changelog=false for updater modal * fix: hash overrides * feat: update checking for modpack * feat: qa * feat: modpack content modal * fix: padding in table to match modals + tightness * fix: lint * feat: delete modal * feat: fix toggle bugs * fix: prepr * fix: duplicate messages * qa: full width search * qa: use bg-surface-1.5 * qa: animation for filter pills * qa: standardize hover colors * fix: border-[1px] is border * qa: mass de-select actually mass selecting * qa: match figma designs for floating action bar * qa: modal fixes * q: modal fixes x2 * fix: table border * qa: confirm modals * qa: modal alignment * qa: re-add stuck heading + dedupe logic * qa: dedupe virtual scrolling + remove dead components * qa: responsiveness for content table + link fixes * qa: version column link, tooltips + lint fixes * qa: instance busy protections * fix: installation freeze bug * chore: remove old mods page * refactor: deduplicate layout * chore: delete old content page(s) * qa * qa * qa * feat: sort btn - to iterate * fix: ml * feat: date added * fix: lint * fix: formatting.ts removal * feat: get_dependencies_as_content_items * qa: final QA changes * refactor: deduplicate + polish content.rs * feat: hook up content.vue with v1 * feat: hide v1 content api behind frontend feature flag * fix: query keys + copy on empty state * chore: i18n pass * feat: reimpl unlink + upload endpoint * feat: use bulk endpoints v1 * fix: lint * fix: flags * fix: responsiveness via container queries * fix: lint * qa: 1 * qa: fixes * qa: fix ssr issues with browse content * qa: header page divider * qa: modals * fix: prepr * fix: issues * fix: lint * fix: toggle v1 ff * qa: 5 * qa: delete modal copy * feat: creation flow modals (#5383) * refactor: delete content v0 usages + impl * feat: qa + fixes * feat: installing banner using state event * feat: fix modpack card bugs + filtering issues * refactor: delete backups v0 api module * feat: v1 servers GET endpoint * fix: backups * feat: swap to kyros upload v1 addon * fix: use tanstack for loader.vue * feat: finish install from discovery modal * qa: bug fixes * feat: set up installation settings * fix: lint * fix: typos * fix: bugs * fix: disable inline content * feat: content tab improvements — upload UX, installation settings, and client-only indicators Upload cancellation and navigation guard: - Add ConfirmLeaveModal that prompts when navigating away during upload - Cancel in-flight XHR uploads when user confirms leaving the page - Add beforeunload handler to warn on browser/tab close during upload - Track uploadedBytes/totalBytes in UploadState for progress display - Replace Collapsible with Transition for upload progress admonition - Show byte progress and percentage in upload banner - Clamp upload progress to prevent exceeding 100% Installation settings (server.properties): - Add KnownPropertiesFields and PropertiesFields types to Archon types - Add buildProperties() to creation flow context to collect gamemode, difficulty, seed, world type, structures, and generator settings - Pass properties through installContent on onboarding, discovery, and ServerSetupModal flows Server setup and discovery flow improvements: - Migrate ServerSetupModal from servers_v0.reinstall to content_v1.installContent - Replace loaderApiNames lookup with toApiLoader() helper - Remove eraseDataOnInstall toggle — always use soft_override: false - Simplify modpack install on discovery page to use first available version and route through creation flow modal for both onboarding and non-onboarding - Differentiate post-install navigation: content page for onboarding, loader options for existing servers Modpack update flow: - Replace updateModpack() call with installContent() using soft_override: true to support version selection in the content updater modal Client-only mod indicators: - Add environment field to AddonVersion (reuses Labrinth.Projects.v3.Environment) - Add environment to ContentItem and isClientOnly to ContentCardTableItem - Show orange TriangleAlertIcon with tooltip on client-only mods in content table - Add "Client-only" filter pill to content filtering (controlled via showClientOnlyFilter on ContentManagerContext) - Apply client-only indicators in both ContentPageLayout and ModpackContentModal Misc: - Add CLAUDE.md note about using prepr commands for lint checks - Export ConfirmLeaveModal from instances barrel * fix: piping * fix: switch content disable for linked server instances * feat: client only filter * fix: prepr * feat: hasUpdate shape update * feat: bulk update endpoint impl for content in panel * feat: websocket state impl again with new phases * fix: ws * fix: use timeout fn for sync admon + fix content card layout scroll for browsers with overflow anchor bug * fix: qa bugs * fix: lint, a11y and i18n * refactor: set up layouts folder properly * fix: linked data cache stuff + lint * feat: move installationsettings to shared layout * fix: lint * fix: issues * feat: temp fuck staging up * fix: lockfile * fix: data sync issues on loader.vue * fix: lint * Hide shader configuration files from content list (#5499) * feat: workaround search problem + split out reset * fix: qa * fix: changelog not showing on first open * fix: qa + optimistic updating improvements * fix: prepr+lint * fix: qa * feat: qa * fix: lint * fix: lint * fix: build * fix: build * fix: type errors * fix: fade and JAVA_HOME passthrough * feat: qa * feat: impl diff shit * fix: qa * fix: app qa * feat: update diff modal * fix: endpoint * fix: qa * fix: qa * fix: use bulk in modpack modal * feat: abort signal impl + fix issues * fix: diff modal trunc * feat: qa * fix: qa * feat: tooltip content tab * fix: prepr * fix: dismiss on settings btn * feat: qa * feat: dont clear handlers on disconnect * fix: lint * fix: wrangler + introduce staging-archon env file --------- Signed-off-by: Calum H. <calum@modrinth.com> Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Artyom Ezri <61311568+Artezon@users.noreply.github.com>
309 lines
9.4 KiB
Vue
309 lines
9.4 KiB
Vue
<template>
|
|
<ContentDiffModal
|
|
ref="diffModal"
|
|
:header="formatMessage(messages.updateToPlay)"
|
|
:admonition-header="formatMessage(messages.updateRequired)"
|
|
:description="
|
|
instance ? formatMessage(messages.updateRequiredDescription, { name: instance.name }) : ''
|
|
"
|
|
:diffs="normalizedDiffs"
|
|
:confirm-label="formatMessage(commonMessages.updateButton)"
|
|
:confirm-icon="DownloadIcon"
|
|
:show-report-button="true"
|
|
@confirm="handleUpdate"
|
|
@cancel="handleDecline"
|
|
@report="handleReport"
|
|
/>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import type { Labrinth } from '@modrinth/api-client'
|
|
import { DownloadIcon } from '@modrinth/assets'
|
|
import {
|
|
commonMessages,
|
|
type ContentDiffItem,
|
|
ContentDiffModal,
|
|
defineMessages,
|
|
useVIntl,
|
|
} from '@modrinth/ui'
|
|
import { openUrl } from '@tauri-apps/plugin-opener'
|
|
import dayjs from 'dayjs'
|
|
import { computed, ref, watch } from 'vue'
|
|
|
|
import { get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
|
|
import { update_managed_modrinth_version } from '@/helpers/profile'
|
|
import type { GameInstance } from '@/helpers/types'
|
|
import { injectServerInstall } from '@/providers/server-install'
|
|
|
|
type Dependency = Labrinth.Versions.v3.Dependency
|
|
type Version = Labrinth.Versions.v2.Version
|
|
|
|
interface BaseDiff {
|
|
project_id: string
|
|
project?: {
|
|
title: string
|
|
icon_url?: string
|
|
slug: string
|
|
}
|
|
currentVersionId?: string
|
|
newVersionId?: string
|
|
currentVersion?: Version
|
|
newVersion?: Version
|
|
fileName?: string
|
|
}
|
|
interface AddedDiff extends BaseDiff {
|
|
type: 'added'
|
|
newVersionId: string
|
|
}
|
|
interface RemovedDiff extends BaseDiff {
|
|
type: 'removed'
|
|
}
|
|
interface UpdatedDiff extends BaseDiff {
|
|
type: 'updated'
|
|
currentVersionId: string
|
|
newVersionId: string
|
|
}
|
|
type DependencyDiff = AddedDiff | RemovedDiff | UpdatedDiff
|
|
|
|
type ProjectInfo = {
|
|
id: string
|
|
title: string
|
|
icon_url?: string
|
|
slug: string
|
|
}
|
|
|
|
const { formatMessage } = useVIntl()
|
|
const { startInstallingServer, stopInstallingServer } = injectServerInstall()
|
|
type UpdateCompleteCallback = () => void | Promise<void>
|
|
|
|
const diffModal = ref<InstanceType<typeof ContentDiffModal>>()
|
|
const instance = ref<GameInstance | null>(null)
|
|
const onUpdateComplete = ref<UpdateCompleteCallback>(() => {})
|
|
const diffs = ref<DependencyDiff[]>([])
|
|
const modpackVersionId = ref<string | null>(null)
|
|
const modpackVersion = ref<Version | null>(null)
|
|
|
|
const normalizedDiffs = computed<ContentDiffItem[]>(() =>
|
|
diffs.value.map((diff) => ({
|
|
type: diff.type,
|
|
projectName: diff.project?.title,
|
|
fileName: diff.fileName,
|
|
currentVersionName: diff.currentVersion?.version_number,
|
|
newVersionName: diff.newVersion?.version_number,
|
|
})),
|
|
)
|
|
|
|
async function computeDependencyDiffs(
|
|
currentDeps: Dependency[],
|
|
latestDeps: Dependency[],
|
|
): Promise<DependencyDiff[]> {
|
|
console.log('Computing dependency diffs', { currentDeps, latestDeps })
|
|
|
|
// Separate deps with project_id from file_name-only deps
|
|
const currentWithProject = currentDeps.filter((d) => d.project_id)
|
|
const latestWithProject = latestDeps.filter((d) => d.project_id)
|
|
const currentFileOnly = currentDeps.filter((d) => !d.project_id && d.file_name)
|
|
const latestFileOnly = latestDeps.filter((d) => !d.project_id && d.file_name)
|
|
|
|
const currentByProject = new Map<string, Dependency>(
|
|
currentWithProject.map((d) => [d.project_id!, d]),
|
|
)
|
|
const latestByProject = new Map<string, Dependency>(
|
|
latestWithProject.map((d) => [d.project_id!, d]),
|
|
)
|
|
const currentFilenames = new Set(currentFileOnly.map((d) => d.file_name!))
|
|
const latestFilenames = new Set(latestFileOnly.map((d) => d.file_name!))
|
|
|
|
const diffs: DependencyDiff[] = []
|
|
|
|
// Find added and updated dependencies (by project_id)
|
|
latestByProject.forEach((latestDep, projectId) => {
|
|
const currentDep = currentByProject.get(projectId)
|
|
if (!currentDep && latestDep.version_id) {
|
|
diffs.push({ type: 'added', project_id: projectId, newVersionId: latestDep.version_id })
|
|
} else if (
|
|
currentDep?.version_id &&
|
|
latestDep?.version_id &&
|
|
currentDep?.version_id !== latestDep.version_id
|
|
) {
|
|
diffs.push({
|
|
type: 'updated',
|
|
project_id: projectId,
|
|
currentVersionId: currentDep.version_id,
|
|
newVersionId: latestDep.version_id,
|
|
})
|
|
}
|
|
})
|
|
|
|
// Find removed dependencies (by project_id)
|
|
currentByProject.forEach((currentDep, projectId) => {
|
|
if (!latestByProject.has(projectId)) {
|
|
diffs.push({
|
|
type: 'removed',
|
|
project_id: projectId,
|
|
currentVersionId: currentDep.version_id,
|
|
})
|
|
}
|
|
})
|
|
|
|
// Find added/removed file_name-only dependencies
|
|
// ideally in future, this should use the hash of the file instead of filename, but since version dependencies don't include file hashes, we'll use filename as a best effort approach
|
|
for (const fileName of latestFilenames) {
|
|
if (!currentFilenames.has(fileName)) {
|
|
diffs.push({ type: 'added', project_id: '', newVersionId: '' as string, fileName })
|
|
}
|
|
}
|
|
for (const fileName of currentFilenames) {
|
|
if (!latestFilenames.has(fileName)) {
|
|
diffs.push({ type: 'removed', project_id: '', fileName })
|
|
}
|
|
}
|
|
|
|
// Fetch projects and versions of diffs
|
|
const allProjectIds = [...new Set(diffs.map((d) => d.project_id).filter(Boolean))]
|
|
const allVersionIds = [
|
|
...new Set(
|
|
[...diffs.map((d) => d.newVersionId), ...diffs.map((d) => d.currentVersionId)].filter(
|
|
Boolean,
|
|
),
|
|
),
|
|
] as string[]
|
|
const [projects, versions] = await Promise.all([
|
|
get_project_many(allProjectIds, 'bypass'),
|
|
get_version_many(allVersionIds, 'bypass'),
|
|
])
|
|
|
|
const projectMap = new Map<string, ProjectInfo>(projects.map((p: ProjectInfo) => [p.id, p]))
|
|
const versionMap = new Map<string, Version>(versions.map((v: Version) => [v.id, v]))
|
|
|
|
const mappedDiffs = diffs
|
|
.map((diff) => {
|
|
const project = projectMap.get(diff.project_id)
|
|
return {
|
|
...diff,
|
|
project: project
|
|
? { title: project.title, icon_url: project.icon_url, slug: project.slug }
|
|
: undefined,
|
|
currentVersion: diff.currentVersionId ? versionMap.get(diff.currentVersionId) : undefined,
|
|
newVersion: diff.newVersionId ? versionMap.get(diff.newVersionId) : undefined,
|
|
}
|
|
})
|
|
.sort((a, b) => {
|
|
const typeOrder = { added: 0, updated: 1, removed: 2 }
|
|
const typeCompare = typeOrder[a.type] - typeOrder[b.type]
|
|
if (typeCompare !== 0) return typeCompare
|
|
|
|
const aDate = a.newVersion?.date_published || a.currentVersion?.date_published || ''
|
|
const bDate = b.newVersion?.date_published || b.currentVersion?.date_published || ''
|
|
return dayjs(bDate).valueOf() - dayjs(aDate).valueOf()
|
|
})
|
|
.filter((d) => d.project || d.fileName) // filter out any diffs that couldn't be matched to a project or file
|
|
return mappedDiffs
|
|
}
|
|
|
|
async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[] | null> {
|
|
if (!inst.linked_data) return null
|
|
if (!modpackVersionId.value || !inst.linked_data.version_id) return null
|
|
|
|
try {
|
|
// For server projects, linked_data.project_id is the server project but
|
|
// linked_data.version_id references a content modpack version from a different project.
|
|
// Detect this by comparing the version's project_id with linked_data.project_id.
|
|
modpackVersion.value = await get_version(modpackVersionId.value, 'bypass')
|
|
const instanceModpackVersion = await get_version(inst.linked_data.version_id, 'bypass')
|
|
|
|
// Compute dependency diffs between current and latest version
|
|
if (instanceModpackVersion && modpackVersion.value) {
|
|
return await computeDependencyDiffs(
|
|
instanceModpackVersion.dependencies || [],
|
|
modpackVersion.value.dependencies || [],
|
|
)
|
|
}
|
|
} catch (error) {
|
|
console.error('Error checking for updates:', error)
|
|
return null
|
|
}
|
|
return null
|
|
}
|
|
|
|
watch(
|
|
() => instance.value,
|
|
async (newInstance) => {
|
|
if (!newInstance) return
|
|
const result = await checkUpdateAvailable(newInstance)
|
|
diffs.value = result || []
|
|
},
|
|
{ immediate: true, deep: true },
|
|
)
|
|
|
|
async function handleUpdate() {
|
|
hide()
|
|
const serverProjectId = instance.value?.linked_data?.project_id
|
|
if (serverProjectId) startInstallingServer(serverProjectId)
|
|
try {
|
|
if (modpackVersionId.value && instance.value) {
|
|
await update_managed_modrinth_version(instance.value.path, modpackVersionId.value)
|
|
await onUpdateComplete.value()
|
|
}
|
|
} catch (error) {
|
|
console.error('Error updating instance:', error)
|
|
} finally {
|
|
if (serverProjectId) stopInstallingServer(serverProjectId)
|
|
}
|
|
}
|
|
|
|
function handleReport() {
|
|
if (instance.value?.linked_data?.project_id) {
|
|
openUrl(
|
|
`https://modrinth.com/report?item=project&itemID=${instance.value.linked_data.project_id}`,
|
|
)
|
|
}
|
|
}
|
|
|
|
function handleDecline() {
|
|
hide()
|
|
}
|
|
|
|
function show(
|
|
instanceVal: GameInstance,
|
|
modpackVersionIdVal: string | null = null,
|
|
callback: UpdateCompleteCallback = () => {},
|
|
e?: MouseEvent,
|
|
) {
|
|
instance.value = instanceVal
|
|
modpackVersionId.value = modpackVersionIdVal
|
|
onUpdateComplete.value = callback
|
|
diffModal.value?.show(e)
|
|
}
|
|
|
|
function hide() {
|
|
diffModal.value?.hide()
|
|
}
|
|
|
|
const messages = defineMessages({
|
|
updateToPlay: {
|
|
id: 'app.modal.update-to-play.header',
|
|
defaultMessage: 'Update to play',
|
|
},
|
|
updateRequired: {
|
|
id: 'app.modal.update-to-play.update-required',
|
|
defaultMessage: 'Update required',
|
|
},
|
|
updateRequiredDescription: {
|
|
id: 'app.modal.update-to-play.update-required-description',
|
|
defaultMessage:
|
|
'An update is required to play {name}. Please update to the latest version to launch the game.',
|
|
},
|
|
})
|
|
|
|
const hasUpdate = computed(() => {
|
|
if (!instance.value?.linked_data) return false
|
|
return (
|
|
modpackVersionId.value != null &&
|
|
modpackVersionId.value !== instance.value.linked_data.version_id
|
|
)
|
|
})
|
|
|
|
defineExpose({ show, hide, hasUpdate })
|
|
</script>
|