+
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
index 1e731024ad..2f5359338d 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
@@ -1,5 +1,5 @@
diff --git a/apps/frontend/src/pages/settings/applications.vue b/apps/frontend/src/pages/settings/applications.vue
index d39106ceb5..4cf333ba33 100644
--- a/apps/frontend/src/pages/settings/applications.vue
+++ b/apps/frontend/src/pages/settings/applications.vue
@@ -283,10 +283,6 @@ definePageMeta({
middleware: 'auth',
})
-useHead({
- title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
-})
-
const messages = defineMessages({
headTitle: {
id: 'settings.applications.head-title',
@@ -420,6 +416,10 @@ const messages = defineMessages({
},
})
+useHead({
+ title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
+})
+
const { scopesToLabels } = useScopes()
const scopeCategories = computed(() => {
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 17e9547a69..5626d3d147 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -193,13 +193,13 @@ import MessageBanner from '~/components/ui/MessageBanner.vue'
import type { DisplayLocation } from '~/plugins/cosmetics'
import { isDarkTheme, type Theme } from '~/plugins/theme/index.ts'
+const { addNotification } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
useHead({
title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
})
-const { addNotification } = injectNotificationManager()
-const { formatMessage } = useVIntl()
-
const messages = defineMessages({
headTitle: {
id: 'settings.head-title',
diff --git a/apps/frontend/src/pages/settings/pats.vue b/apps/frontend/src/pages/settings/pats.vue
index ce0ae7a0bf..264988874f 100644
--- a/apps/frontend/src/pages/settings/pats.vue
+++ b/apps/frontend/src/pages/settings/pats.vue
@@ -7,51 +7,65 @@
:proceed-label="formatMessage(deleteModalMessages.action)"
@proceed="removePat(deletePatIndex)"
/>
-
-
-
-
-
-
- {{ category.name }} -
-
-
+
-
+
+
+
+
+
+
+
-
-
+
+
+ {{ category.name }} +
+
+
+
+
+
@@ -199,6 +213,7 @@ import {
injectModrinthClient,
injectNotificationManager,
IntlFormatted,
+ NewModal,
StyledInput,
useFormatDateTime,
useRelativeTime,
@@ -206,7 +221,6 @@ import {
} from '@modrinth/ui'
import { useQuery, useQueryClient } from '@tanstack/vue-query'
-import Modal from '~/components/ui/Modal.vue'
import {
getScopeValue,
hasScope,
@@ -403,7 +417,7 @@ async function createPat() {
scopes: Number(scopesVal.value),
expires: data.$dayjs(expires.value).toISOString(),
})
- pats.value.push(res)
+ queryClient.setQueryData(['pat'], (old) => [...(old || []), res])
patModal.value.hide()
} catch (err) {
addNotification({
diff --git a/apps/frontend/src/pages/settings/profile.vue b/apps/frontend/src/pages/settings/profile.vue
index c5da261eea..3e62e9477c 100644
--- a/apps/frontend/src/pages/settings/profile.vue
+++ b/apps/frontend/src/pages/settings/profile.vue
@@ -99,10 +99,6 @@ import {
const { addNotification } = injectNotificationManager()
const { formatMessage } = useVIntl()
-useHead({
- title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
-})
-
definePageMeta({
middleware: 'auth',
})
@@ -139,6 +135,10 @@ const messages = defineMessages({
},
})
+useHead({
+ title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
+})
+
const auth = await useAuth()
// Avatar state (separate from useSavable)
From 3b604cfdc0aee690ff2ab7aea0cbcce7679b3c83 Mon Sep 17 00:00:00 2001
From: aecsocket
Date: Thu, 19 Mar 2026 00:16:30 +0000
Subject: [PATCH 05/45] Get AutoMod to ignore .rpo files (#5616)
---
apps/labrinth/src/queue/moderation.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/labrinth/src/queue/moderation.rs b/apps/labrinth/src/queue/moderation.rs
index f006793e9a..4ff4b69e21 100644
--- a/apps/labrinth/src/queue/moderation.rs
+++ b/apps/labrinth/src/queue/moderation.rs
@@ -336,7 +336,7 @@ impl AutomatedModerationQueue {
|| file.name().starts_with("overrides/resourcepacks")
|| file.name().starts_with("client-overrides/resourcepacks")
{
- if file.name().matches('/').count() > 2 || file.name().ends_with(".txt") {
+ if file.name().matches('/').count() > 2 || file.name().ends_with(".txt") || file.name().ends_with(".rpo") {
continue;
}
From 93c81631a94a1b08d22949940494c0855523307d Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Thu, 19 Mar 2026 15:26:15 +0000
Subject: [PATCH 06/45] fix: NaN cmp-info (#5619)
* fix: NaN cmp-info
* fix: ssr
* fix: lint
---
.../src/components/ui/charts/ChartDisplay.vue | 75 ++++++++++-------
.../src/pages/dashboard/analytics.vue | 24 ++++--
apps/frontend/src/pages/legal/cmp-info.vue | 2 +-
apps/frontend/src/utils/analytics.js | 82 +++++++++++--------
4 files changed, 110 insertions(+), 73 deletions(-)
diff --git a/apps/frontend/src/components/ui/charts/ChartDisplay.vue b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
index 39564d4cb1..5dbb2dbdf6 100644
--- a/apps/frontend/src/components/ui/charts/ChartDisplay.vue
+++ b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
@@ -8,7 +8,7 @@
{{ analytics.error.value }}
+
= ref(defaultRange)
+const startDate = ref(initialDates.startDate)
+const endDate = ref(initialDates.endDate)
+const timeResolution = ref(defaultRange.timeResolution)
+
+debug('default range initialized', {
+ range: defaultRange.getLabel([dayjs(), dayjs()]),
+ startDate: startDate.value.toISOString(),
+ endDate: endDate.value.toISOString(),
+ timeResolution: timeResolution.value,
+})
onBeforeMount(() => {
- // Load cached data and range from localStorage - cache.
+ debug('onBeforeMount')
if (import.meta.client) {
const rangeLabel = localStorage.getItem('analyticsSelectedRange')
+ debug('localStorage range', { rangeLabel })
if (rangeLabel) {
- const range = props.ranges.find((r) => r.getLabel([dayjs(), dayjs()]) === rangeLabel)!
+ const range = props.ranges.find((r) => r.getLabel([dayjs(), dayjs()]) === rangeLabel)
- if (range !== undefined) {
+ if (range) {
internalRange.value = range
- const ranges = range.getDates(dayjs())
+ const dates = range.getDates(dayjs())
timeResolution.value = range.timeResolution
- startDate.value = ranges.startDate
- endDate.value = ranges.endDate
+ startDate.value = dates.startDate
+ endDate.value = dates.endDate
+ debug('range overridden from localStorage', {
+ startDate: dates.startDate.toISOString(),
+ endDate: dates.endDate.toISOString(),
+ timeResolution: range.timeResolution,
+ })
}
}
}
})
-onMounted(() => {
- if (internalRange.value === null) {
- internalRange.value = props.ranges.find(
- (r) => r.getLabel([dayjs(), dayjs()]) === 'Previous 30 days',
- )!
- }
-
- const ranges = selectedRange.value.getDates(dayjs())
- startDate.value = ranges.startDate
- endDate.value = ranges.endDate
- timeResolution.value = selectedRange.value.timeResolution
-
- isInitialized.value = true
-})
-
-const internalRange: Ref = ref(null as unknown as RangeObject)
-
const selectedRange = computed({
get: () => {
return internalRange.value
@@ -499,6 +509,7 @@ const selectedRange = computed({
},
})
+debug('calling useFetchAllAnalytics')
const analytics = useFetchAllAnalytics(
resetCharts,
projects,
@@ -507,9 +518,15 @@ const analytics = useFetchAllAnalytics(
startDate,
endDate,
timeResolution,
- isInitialized,
)
+debug('awaiting analytics.fetch()')
+await analytics.fetch()
+debug('analytics.fetch() resolved', {
+ loading: analytics.loading.value,
+ error: analytics.error.value,
+})
+
const formattedCategorySubtitle = computed(() => {
return (
selectedRange.value?.getLabel([dayjs(startDate.value), dayjs(endDate.value)]) ?? 'Loading...'
diff --git a/apps/frontend/src/pages/dashboard/analytics.vue b/apps/frontend/src/pages/dashboard/analytics.vue
index 0301240f1b..25d8376438 100644
--- a/apps/frontend/src/pages/dashboard/analytics.vue
+++ b/apps/frontend/src/pages/dashboard/analytics.vue
@@ -1,15 +1,23 @@
()
+const { instance } = injectInstanceSettings()
-const title = ref(props.instance.name)
-const icon: Ref = ref(props.instance.icon_path)
-const groups = ref(props.instance.groups)
+const title = ref(instance.name)
+const icon: Ref = ref(instance.icon_path)
+const groups = ref(instance.groups)
const newCategoryInput = ref('')
-const installing = computed(() => props.instance.install_stage !== 'installed')
+const installing = computed(() => instance.install_stage !== 'installed')
async function duplicateProfile() {
- await duplicate(props.instance.path).catch(handleError)
+ await duplicate(instance.path).catch(handleError)
trackEvent('InstanceDuplicate', {
- loader: props.instance.loader,
- game_version: props.instance.game_version,
+ loader: instance.loader,
+ game_version: instance.game_version,
})
}
@@ -52,7 +53,7 @@ const availableGroups = computed(() => [
async function resetIcon() {
icon.value = undefined
- await edit_icon(props.instance.path, null).catch(handleError)
+ await edit_icon(instance.path, null).catch(handleError)
trackEvent('InstanceRemoveIcon')
}
@@ -70,7 +71,7 @@ async function setIcon() {
if (!value) return
icon.value = value
- await edit_icon(props.instance.path, icon.value).catch(handleError)
+ await edit_icon(instance.path, icon.value).catch(handleError)
trackEvent('InstanceSetIcon')
}
@@ -101,7 +102,7 @@ watch(
[title, groups, groups],
async () => {
if (removing.value) return
- await edit(props.instance.path, editProfileObject.value).catch(handleError)
+ await edit(instance.path, editProfileObject.value).catch(handleError)
},
{ deep: true },
)
@@ -109,11 +110,11 @@ watch(
const removing = ref(false)
async function removeProfile() {
removing.value = true
- const path = props.instance.path
+ const path = instance.path
trackEvent('InstanceRemove', {
- loader: props.instance.loader,
- game_version: props.instance.game_version,
+ loader: instance.loader,
+ game_version: instance.game_version,
})
await router.push({ path: '/' })
@@ -218,7 +219,7 @@ const messages = defineMessages({
:src="icon ? convertFileSrc(icon) : icon"
size="108px"
class="!border-4 group-hover:brightness-75"
- :tint-by="props.instance.path"
+ :tint-by="instance.path"
no-shadow
/>
•
diff --git a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
index 67783c2ce0..5c585de622 100644
--- a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
@@ -5,12 +5,11 @@ import {
commonMessages,
defineMessages,
injectNotificationManager,
+ NewModal,
useVIntl,
} from '@modrinth/ui'
import { ref } from 'vue'
-import InstanceModalTitlePrefix from '@/components/ui/modal/InstanceModalTitlePrefix.vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
import type { GameInstance } from '@/helpers/types'
import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
@@ -26,10 +25,10 @@ const props = defineProps<{
instance: GameInstance
}>()
-const modal = ref()
+const modal = ref>()
-const name = ref()
-const address = ref()
+const name = ref('')
+const address = ref('')
const resourcePack = ref('enabled')
async function addServer(play: boolean) {
@@ -60,11 +59,11 @@ function show() {
name.value = ''
address.value = ''
resourcePack.value = 'enabled'
- modal.value.show()
+ modal.value?.show()
}
function hide() {
- modal.value.hide()
+ modal.value?.hide()
}
const messages = defineMessages({
@@ -85,37 +84,33 @@ const messages = defineMessages({
defineExpose({ show, hide })
-
-
-
-
+
+ >()
const name = ref('')
const address = ref('')
@@ -81,11 +81,11 @@ function show(server: ServerWorld) {
index.value = server.index
displayStatus.value = server.display_status
hideFromHome.value = server.display_status === 'hidden'
- modal.value.show()
+ modal.value?.show()
}
function hide() {
- modal.value.hide()
+ modal.value?.hide()
}
defineExpose({ show })
@@ -96,29 +96,28 @@ const titleMessage = defineMessage({
})
-
-
- {{ formatMessage(titleMessage) }}
-
+
+
+
-
+
- Cancelled
+ {{ formatMessage(messages.cancelled) }}
{{ item.progress }}%
@@ -102,12 +112,61 @@
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/providers/file-manager.ts b/packages/ui/src/layouts/shared/files-tab/providers/file-manager.ts
new file mode 100644
index 0000000000..4eb5ba6e35
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/providers/file-manager.ts
@@ -0,0 +1,72 @@
+import type { ComputedRef, Ref } from 'vue'
+
+import { createContext } from '#ui/providers/create-context'
+
+import type {
+ EditingFile,
+ ExtractDryRunResult,
+ FileItem,
+ FileOperation,
+ UploadState,
+} from '../types'
+
+export interface FileManagerContext {
+ items: Ref
+ loading: Ref
+ error: Ref
+
+ currentPath: Ref
+ navigateTo: (path: string) => void
+
+ editingFile: Ref
+ startEditing: (file: EditingFile) => void
+ stopEditing: () => void
+
+ createItem: (name: string, type: 'file' | 'directory') => Promise
+ renameItem: (path: string, newName: string) => Promise
+ moveItem: (source: string, destination: string) => Promise
+ deleteItem: (path: string, recursive: boolean) => Promise
+
+ readFile: (path: string) => Promise
+ readFileAsBlob: (path: string) => Promise
+ writeFile: (path: string, content: string) => Promise
+ downloadFile: (path: string, fileName: string) => Promise
+
+ uploadFiles: (files: File[]) => void
+ cancelUpload?: () => void
+ uploadState?: Ref | ComputedRef
+
+ refresh: () => void
+
+ isBusy?: Ref | ComputedRef
+ busyTooltip?: Ref | ComputedRef
+ busyWarning?: Ref | ComputedRef
+
+ extractFile?: (
+ path: string,
+ override: boolean,
+ dry: boolean,
+ ) => Promise
+ activeOperations?: Ref | ComputedRef
+ dismissOperation?: (id: string, action: 'dismiss' | 'cancel') => void
+
+ prefetchDirectory?: (path: string) => void
+ prefetchFile?: (path: string) => void
+
+ showInstallFromUrl?: boolean
+ basePath?: Ref | ComputedRef
+ openInFolder?: (path: string) => void
+
+ downloadButtonLabel?: string
+ uploadingLabel?: (completed: number, total: number) => string
+
+ canRestart?: boolean
+ restartServer?: () => Promise
+ canShareToMclogs?: boolean
+ shareToMclogs?: (content: string) => Promise
+}
+
+export const [injectFileManager, provideFileManager] = createContext(
+ 'FilePageLayout',
+ 'fileManagerContext',
+)
diff --git a/packages/ui/src/layouts/shared/files-tab/providers/index.ts b/packages/ui/src/layouts/shared/files-tab/providers/index.ts
new file mode 100644
index 0000000000..8772a59621
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/providers/index.ts
@@ -0,0 +1,2 @@
+export type { FileManagerContext } from './file-manager'
+export { injectFileManager, provideFileManager } from './file-manager'
diff --git a/packages/ui/src/layouts/shared/files-tab/types.ts b/packages/ui/src/layouts/shared/files-tab/types.ts
new file mode 100644
index 0000000000..12416aa5e0
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/types.ts
@@ -0,0 +1,69 @@
+export interface FileItem {
+ name: string
+ type: 'file' | 'directory' | 'symlink'
+ path: string
+ modified: number
+ created: number
+ size?: number
+ count?: number
+ target?: string
+}
+
+export interface EditingFile {
+ name: string
+ path: string
+}
+
+export type FileSortField = 'name' | 'size' | 'created' | 'modified'
+
+export type FileViewFilter = 'all' | 'filesOnly' | 'foldersOnly'
+
+export type FileContextMenuOption =
+ | {
+ id: string
+ action?: () => void
+ disabled?: boolean
+ tooltip?: string
+ color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple' | 'medal-promo'
+ shown?: boolean
+ }
+ | { divider: true; shown?: boolean }
+
+export interface FileOperation {
+ id?: string
+ op: string
+ src: string
+ state: string
+ progress?: number
+ bytes_processed?: number
+ files_processed?: number
+ current_file?: string
+}
+
+export interface UndoableOperation {
+ type: 'move' | 'rename'
+ itemType: string
+ fileName: string
+}
+
+export interface MoveOperation extends UndoableOperation {
+ type: 'move'
+ sourcePath: string
+ destinationPath: string
+}
+
+export interface RenameOperation extends UndoableOperation {
+ type: 'rename'
+ path: string
+ oldName: string
+ newName: string
+}
+
+export type Operation = MoveOperation | RenameOperation
+
+export interface ExtractDryRunResult {
+ modpack_name: string | null
+ conflicting_files: string[]
+}
+
+export type { UploadState } from '@modrinth/api-client'
diff --git a/packages/ui/src/layouts/shared/installation-settings/layout.vue b/packages/ui/src/layouts/shared/installation-settings/layout.vue
index d519bfc11f..d23d53d726 100644
--- a/packages/ui/src/layouts/shared/installation-settings/layout.vue
+++ b/packages/ui/src/layouts/shared/installation-settings/layout.vue
@@ -21,10 +21,10 @@ import Avatar from '#ui/components/base/Avatar.vue'
import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
import Chips from '#ui/components/base/Chips.vue'
import Combobox from '#ui/components/base/Combobox.vue'
+import ConfirmLeaveModal from '#ui/components/modal/ConfirmLeaveModal.vue'
import { defineMessages, useVIntl } from '#ui/composables/i18n'
import { commonMessages } from '#ui/utils/common-messages'
-import ConfirmLeaveModal from '../content-tab/components/modals/ConfirmLeaveModal.vue'
import ConfirmModpackUpdateModal from '../content-tab/components/modals/ConfirmModpackUpdateModal.vue'
import ConfirmReinstallModal from '../content-tab/components/modals/ConfirmReinstallModal.vue'
import ConfirmRepairModal from '../content-tab/components/modals/ConfirmRepairModal.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
index 11c808469b..1206f53089 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
@@ -5,6 +5,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
+import ConfirmLeaveModal from '#ui/components/modal/ConfirmLeaveModal.vue'
import { defineMessages, useVIntl } from '#ui/composables/i18n'
import {
injectModrinthClient,
@@ -13,7 +14,6 @@ import {
} from '#ui/providers'
import { commonMessages } from '#ui/utils/common-messages'
-import ConfirmLeaveModal from '../../../shared/content-tab/components/modals/ConfirmLeaveModal.vue'
import ConfirmModpackUpdateModal from '../../../shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue'
import ConfirmUnlinkModal from '../../../shared/content-tab/components/modals/ConfirmUnlinkModal.vue'
import ContentUpdaterModal from '../../../shared/content-tab/components/modals/ContentUpdaterModal.vue'
@@ -78,9 +78,17 @@ const messages = defineMessages({
id: 'hosting.content.failed-to-bulk-update',
defaultMessage: 'Failed to update content',
},
- copyLink: {
- id: 'hosting.content.copy-link',
- defaultMessage: 'Copy link',
+})
+
+const leaveMessages = defineMessages({
+ uploadInProgress: {
+ id: 'instances.confirm-leave-modal.upload-in-progress',
+ defaultMessage: 'Upload in progress',
+ },
+ leavePageBody: {
+ id: 'instances.confirm-leave-modal.body',
+ defaultMessage:
+ 'Files are still being uploaded. Leaving this page will cancel the upload and your changes may be lost.',
},
})
@@ -168,7 +176,7 @@ const modpack = computed(() => {
: `/user/${mp.owner.id}`,
}
: undefined,
- categories: (project?.display_categories ?? []).map((name) => ({
+ categories: (project?.categories ?? []).map((name) => ({
name,
icon: name,
project_type: 'modpack',
@@ -824,7 +832,7 @@ function getOverflowOptions(item: ContentItem) {
if (item.project?.slug) {
options.push({
- id: formatMessage(messages.copyLink),
+ id: formatMessage(commonMessages.copyLinkButton),
icon: ClipboardCopyIcon,
action: async () => {
await navigator.clipboard.writeText(
@@ -961,5 +969,10 @@ provideContentManager({
@confirm="handleModpackUpdateConfirm"
@cancel="handleModpackUpdateCancel"
/>
-
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/files.vue b/packages/ui/src/layouts/wrapped/hosting/manage/files.vue
index 70ade05d78..eb76a8bba6 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/files.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/files.vue
@@ -1,328 +1,41 @@
-
-
-
-
-
-
+
+ Rewards Program Terms "
},
@@ -1028,6 +1382,12 @@
"label.update-available": {
"defaultMessage": "Update available"
},
+ "label.updating": {
+ "defaultMessage": "Updating..."
+ },
+ "label.upload-failed": {
+ "defaultMessage": "Upload failed"
+ },
"label.username": {
"defaultMessage": "Username"
},
@@ -2818,5 +3178,20 @@
},
"ui.component.unsaved-changes-popup.body": {
"defaultMessage": "You have unsaved changes."
+ },
+ "ui.confirm-leave-modal.body": {
+ "defaultMessage": "You have unsaved changes that will be lost if you leave this page."
+ },
+ "ui.confirm-leave-modal.header": {
+ "defaultMessage": "You have unsaved changes"
+ },
+ "ui.confirm-leave-modal.leave": {
+ "defaultMessage": "Leave page"
+ },
+ "ui.confirm-leave-modal.stay": {
+ "defaultMessage": "Stay on page"
+ },
+ "ui.confirm-leave-modal.title": {
+ "defaultMessage": "Leave page?"
}
}
diff --git a/packages/ui/src/stories/base/Admonition.stories.ts b/packages/ui/src/stories/base/Admonition.stories.ts
index 7ec3c77ff2..f04ea9e81f 100644
--- a/packages/ui/src/stories/base/Admonition.stories.ts
+++ b/packages/ui/src/stories/base/Admonition.stories.ts
@@ -1,6 +1,8 @@
import type { Meta, StoryObj } from '@storybook/vue3-vite'
import Admonition from '../../components/base/Admonition.vue'
+import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import ProgressBar from '../../components/base/ProgressBar.vue'
const meta = {
title: 'Base/Admonition',
@@ -45,3 +47,92 @@ export const Success: Story = {
body: 'Everything went smoothly.',
},
}
+
+export const Dismissible: Story = {
+ args: {
+ type: 'info',
+ header: 'Dismissible Notice',
+ body: 'This admonition can be dismissed by clicking the X button.',
+ dismissible: true,
+ },
+}
+
+export const WithTopRightActions: Story = {
+ render: () => ({
+ components: { Admonition, ButtonStyled },
+ template: /*html*/ `
+
+
+export default meta
+type Story = StoryObj
+
+export const Default: Story = {
+ args: {
+ mode: 'local',
+ activeIndex: 0,
+ links: [
+ { label: 'Overview', href: '' },
+ { label: 'Gallery', href: 'gallery' },
+ { label: 'Changelog', href: 'changelog' },
+ { label: 'Versions', href: 'versions' },
+ ],
+ },
+}
+
+export const LocalMode: StoryObj = {
+ render: () => ({
+ components: { NavTabs },
+ setup() {
+ const activeIndex = ref(0)
+ const links = [
+ { label: 'Overview', href: '' },
+ { label: 'Gallery', href: 'gallery' },
+ { label: 'Changelog', href: 'changelog' },
+ { label: 'Versions', href: 'versions' },
+ ]
+ function onTabClick(index: number) {
+ activeIndex.value = index
+ }
+ return { activeIndex, links, onTabClick }
+ },
+ template: /* html */ `
+
+
+export const Default: Story = {
+ render: () => ({
+ components: { ConfirmLeaveModal, ButtonStyled },
+ setup() {
+ const modalRef = ref | null>(null)
+ const result = ref('')
+ async function openModal() {
+ result.value = ''
+ const confirmed = await modalRef.value?.prompt()
+ result.value = confirmed ? 'User chose to leave' : 'User chose to stay'
+ }
+ return { modalRef, result, openModal }
+ },
+ template: /* html */ `
+ | null>(null)
+ const openModal = () => modalRef.value?.prompt()
+ return { modalRef, openModal }
+ },
+ template: /* html */ `
+ | null>(null)
+ const openModal = () => modalRef.value?.prompt()
+ return { modalRef, openModal }
+ },
+ template: /* html */ `
+
-
-export default meta
-type Story = StoryObj
-
-const justNow = new Date().toISOString()
-const eightMinsAgo = new Date(Date.now() - 8 * 60 * 1000).toISOString()
-const fiveHoursAgo = new Date(Date.now() - 5 * 60 * 60 * 1000).toISOString()
-
-export const AllStates: Story = {
- render: () => ({
- components: { BackupProgressAdmonition },
- setup() {
- const now = new Date().toISOString()
- const mins8 = new Date(Date.now() - 8 * 60 * 1000).toISOString()
- const hours5 = new Date(Date.now() - 5 * 60 * 60 * 1000).toISOString()
- return { now, mins8, hours5 }
- },
- template: /*html*/ `
- = {
+ shaderpack: 'shader',
+}
+
+export function normalizeProjectType(type: string): string {
+ return PROJECT_TYPE_ALIASES[type] ?? type
+}
+
export const commonProjectTypeCategoryMessages = defineMessages({
datapack: {
id: 'project-type.datapack.category',
diff --git a/packages/ui/src/utils/file-extensions.ts b/packages/ui/src/utils/file-extensions.ts
index 7908f52b06..78b88c067a 100644
--- a/packages/ui/src/utils/file-extensions.ts
+++ b/packages/ui/src/utils/file-extensions.ts
@@ -146,6 +146,8 @@ export function getEditorLanguage(ext: string): string {
case 'cfg':
case 'conf':
return 'ini'
+ case 'log':
+ return 'mclog'
default:
return 'text'
}
diff --git a/packages/ui/src/utils/server-search.ts b/packages/ui/src/utils/server-search.ts
index 6658e29b95..6f88f905a2 100644
--- a/packages/ui/src/utils/server-search.ts
+++ b/packages/ui/src/utils/server-search.ts
@@ -112,7 +112,7 @@ export const SERVER_SORT_TYPES: SortType[] = [
const FILTER_FIELD_MAP: Record = {
server_content_type: 'minecraft_java_server.content.kind',
- server_game_version: 'minecraft_java_server.content.supported_game_versions',
+ server_game_version: 'game_versions',
server_status: 'minecraft_java_server.ping.data',
server_region: 'minecraft_server.region',
server_language: 'minecraft_server.languages',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0c64e72f10..5bd6673c85 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -98,6 +98,9 @@ importers:
'@tauri-apps/plugin-dialog':
specifier: ^2.2.1
version: 2.6.0
+ '@tauri-apps/plugin-fs':
+ specifier: ^2.4.5
+ version: 2.4.5
'@tauri-apps/plugin-http':
specifier: ~2.5.7
version: 2.5.7
@@ -4109,6 +4112,9 @@ packages:
'@tauri-apps/plugin-dialog@2.6.0':
resolution: {integrity: sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg==}
+ '@tauri-apps/plugin-fs@2.4.5':
+ resolution: {integrity: sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA==}
+
'@tauri-apps/plugin-http@2.5.7':
resolution: {integrity: sha512-+F2lEH/c9b0zSsOXKq+5hZNcd9F4IIKCK1T17RqMwpCmVnx2aoqY8yIBccCd25HTYUb3j6NPVbRax/m00hKG8A==}
@@ -12987,6 +12993,10 @@ snapshots:
dependencies:
'@tauri-apps/api': 2.10.1
+ '@tauri-apps/plugin-fs@2.4.5':
+ dependencies:
+ '@tauri-apps/api': 2.10.1
+
'@tauri-apps/plugin-http@2.5.7':
dependencies:
'@tauri-apps/api': 2.10.1
diff --git a/standards/frontend/INTERNATIONALIZATION.md b/standards/frontend/INTERNATIONALIZATION.md
index a33ee79aa6..b87471ef71 100644
--- a/standards/frontend/INTERNATIONALIZATION.md
+++ b/standards/frontend/INTERNATIONALIZATION.md
@@ -3,6 +3,7 @@
- [Message Definitions](#message-definitions)
- [Rendering Messages](#rendering-messages)
- [ICU Message Format](#icu-message-format)
+ - [Writing Translation-Friendly Strings](#writing-translation-friendly-strings)
- [Rich-Text Messages](#rich-text-messages)
- [Vue/ICU Delimiter Collisions](#vueicu-delimiter-collisions)
- [Imports](#imports)
@@ -52,6 +53,36 @@ Dynamic values use ICU placeholders in `defaultMessage`:
- **Numbers/dates/times:** `'{price, number, ::currency/USD}'`
- **Plurals/selects:** `'{count, plural, one {# message} other {# messages}}'`
+## Writing Translation-Friendly Strings
+
+ICU gives you powerful tools (plurals, selects, nested expressions), but translators in other languages face constraints that English doesn't have:
+
+- **Word order varies by language.** Don't assume `{action} {noun}` works everywhere — some languages need `{noun} {action}` or require prepositions between them.
+- **Plurals aren't just "add an s".** Many languages change internal parts of a word or phrase for pluralization, not just the ending. A simple `{count} {itemType}` breaks if `itemType` is always singular.
+- **Grammatical gender affects surrounding words.** Articles, adjectives, and verbs may change based on whether a noun is masculine or feminine. If a variable like `{contentType}` can be "shader" or "mod", translators may need to inflect surrounding text differently for each.
+
+### Guidelines
+
+1. **Use `select` for content types, not bare variables.** When a variable represents different content types (mod, shader, modpack, etc.), pass a key and use ICU `select` so translators can write type-specific forms:
+
+```
+// Bad — translators can't inflect around a pre-rendered noun
+'Delete {count} {itemType}'
+
+// Good — translators can write entirely different phrases per type
+'Delete {count} {contentType, select, mod {{count, plural, one {mod} other {mods}}} shader {{count, plural, one {shader} other {shaders}}} other {items}}'
+```
+
+This lets translators write entirely different noun forms per branch, which many languages require.
+
+2. **Prefer separate messages over complex ICU when branches diverge significantly.** If the singular and plural versions of a string are structurally different (not just a noun change), use two separate message IDs rather than one complex ICU expression.
+
+3. **Don't concatenate translated strings.** Never build a sentence by joining multiple `formatMessage` calls — the word order may be wrong in other languages. Put the entire sentence in one message.
+
+4. **Keep variables semantic.** Pass `contentType: 'mod'` (a key), not `contentType: 'Mod'` (a pre-rendered display string). Translators can then map each key to the correct form in their language.
+
+5. **Test with long strings.** German and Finnish words can be 2-3x longer than English equivalents. Ensure UI layouts don't break with longer text.
+
## Rich-Text Messages
When a message contains links or markup, wrap the relevant ranges with named tags in `defaultMessage`:
From 36f62a3285c3f10e91d129246034c6f5a3c765b2 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:10:01 -0700
Subject: [PATCH 30/45] refactor: move flags into settings, change icon (#5678)
* refactor: move flags into settings, change icon
* fix: use ButtonStyled for app
---
.../components/ui/modal/AppSettingsModal.vue | 10 +--
.../ui/settings/FeatureFlagSettings.vue | 23 +++--
.../app-frontend/src/locales/en-US/index.json | 3 -
apps/frontend/src/layouts/default.vue | 17 ++--
apps/frontend/src/locales/en-US/index.json | 3 -
.../src/middleware/flags-redirect.global.ts | 6 ++
apps/frontend/src/pages/flags.vue | 78 -----------------
apps/frontend/src/pages/settings.vue | 9 ++
apps/frontend/src/pages/settings/flags.vue | 87 +++++++++++++++++++
packages/ui/src/locales/en-US/index.json | 3 +
packages/ui/src/utils/common-messages.ts | 4 +
11 files changed, 137 insertions(+), 106 deletions(-)
create mode 100644 apps/frontend/src/middleware/flags-redirect.global.ts
delete mode 100644 apps/frontend/src/pages/flags.vue
create mode 100644 apps/frontend/src/pages/settings/flags.vue
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index 1635b46a70..9419d63749 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -6,12 +6,13 @@ import {
LanguagesIcon,
ModrinthIcon,
PaintbrushIcon,
- ReportIcon,
SettingsIcon,
ShieldIcon,
+ ToggleRightIcon,
} from '@modrinth/assets'
import {
commonMessages,
+ commonSettingsMessages,
defineMessage,
defineMessages,
ProgressBar,
@@ -95,11 +96,8 @@ const tabs = [
content: ResourceManagementSettings,
},
{
- name: defineMessage({
- id: 'app.settings.tabs.feature-flags',
- defaultMessage: 'Feature flags',
- }),
- icon: ReportIcon,
+ name: commonSettingsMessages.featureFlags,
+ icon: ToggleRightIcon,
content: FeatureFlagSettings,
developerOnly: true,
},
diff --git a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
index 679dfc48eb..dadcab73be 100644
--- a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
@@ -1,5 +1,5 @@
-
-
-
Date: Thu, 26 Mar 2026 22:30:17 +0000
Subject: [PATCH 31/45] fix: various content fixes (#5676)
* fix: wrong lock field
* fix: install_stage locking up due to previous failure stored as stale snapshot
* fix: Error when updating instance
Fixes #5671
* fix: prepr
---
packages/app-lib/src/api/profile/mod.rs | 44 ++++++-------
packages/app-lib/src/api/worlds.rs | 16 +++--
packages/app-lib/src/launcher/mod.rs | 63 +++++++++++++------
.../composables/content-filtering.ts | 6 +-
.../src/layouts/shared/content-tab/layout.vue | 10 +--
5 files changed, 78 insertions(+), 61 deletions(-)
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
index 0384d3c652..313fe59ae8 100644
--- a/packages/app-lib/src/api/profile/mod.rs
+++ b/packages/app-lib/src/api/profile/mod.rs
@@ -294,19 +294,13 @@ pub async fn get_optimal_jre_key(
let state = State::get().await?;
if let Some(profile) = get(path).await? {
- let minecraft = crate::api::metadata::get_minecraft_versions().await?;
-
- // Fetch version info from stored profile game_version
- let version = minecraft
- .versions
- .iter()
- .find(|it| it.id == profile.game_version)
- .ok_or_else(|| {
- crate::ErrorKind::LauncherError(format!(
- "Invalid or unknown Minecraft version: {}",
- profile.game_version
- ))
- })?;
+ let (minecraft, version_index) =
+ crate::launcher::resolve_minecraft_manifest(
+ &profile.game_version,
+ &state,
+ )
+ .await?;
+ let version = &minecraft.versions[version_index];
let loader_version = crate::launcher::get_loader_version_from_profile(
&profile.game_version,
@@ -352,14 +346,22 @@ pub async fn install(path: &str, force: bool) -> crate::Result<()> {
if let Some(profile) = get(path).await? {
let result =
crate::launcher::install_minecraft(&profile, None, force).await;
- if result.is_err()
- && profile.install_stage != ProfileInstallStage::Installed
- {
- edit(path, |prof| {
- prof.install_stage = ProfileInstallStage::NotInstalled;
- async { Ok(()) }
- })
- .await?;
+ if result.is_err() {
+ // Re-read the profile to get the current install_stage, as
+ // install_minecraft may have changed it (e.g. to MinecraftInstalling)
+ let current_stage = get(path)
+ .await
+ .ok()
+ .flatten()
+ .map(|p| p.install_stage)
+ .unwrap_or(ProfileInstallStage::NotInstalled);
+ if current_stage != ProfileInstallStage::Installed {
+ edit(path, |prof| {
+ prof.install_stage = ProfileInstallStage::NotInstalled;
+ async { Ok(()) }
+ })
+ .await?;
+ }
}
result?;
} else {
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index 4cde476e12..4edfd5aecb 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -901,15 +901,13 @@ pub async fn get_profile_protocol_version(
return Ok(Some(*protocol_version));
}
- let minecraft = crate::api::metadata::get_minecraft_versions().await?;
- let version_index = minecraft
- .versions
- .iter()
- .position(|it| it.id == profile.game_version)
- .ok_or(ErrorKind::LauncherError(format!(
- "Invalid game version: {}",
- profile.game_version
- )))?;
+ let state = State::get().await?;
+ let (minecraft, version_index) =
+ crate::launcher::resolve_minecraft_manifest(
+ &profile.game_version,
+ &state,
+ )
+ .await?;
let version = &minecraft.versions[version_index];
let loader_version = get_loader_version_from_profile(
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index db29817fb8..51b8a91240 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -189,6 +189,46 @@ pub async fn get_loader_version_from_profile(
}
}
+/// Resolves the Minecraft version manifest and finds the index for the given
+/// game version. If the version isn't found in the cache, forces a manifest
+/// refresh to pick up newly-released versions.
+pub async fn resolve_minecraft_manifest(
+ game_version: &str,
+ state: &State,
+) -> crate::Result<(d::minecraft::VersionManifest, usize)> {
+ let minecraft = crate::api::metadata::get_minecraft_versions().await?;
+
+ if let Some(idx) = minecraft
+ .versions
+ .iter()
+ .position(|it| it.id == game_version)
+ {
+ return Ok((minecraft, idx));
+ }
+
+ // Version not found in cache — force a manifest refresh in case it was
+ // released after the cache was populated.
+ let refreshed = crate::state::CachedEntry::get_minecraft_manifest(
+ Some(crate::state::CacheBehaviour::MustRevalidate),
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?
+ .ok_or_else(|| {
+ crate::ErrorKind::NoValueFor("minecraft versions".to_string())
+ })?;
+
+ let idx = refreshed
+ .versions
+ .iter()
+ .position(|it| it.id == game_version)
+ .ok_or(crate::ErrorKind::LauncherError(format!(
+ "Invalid game version: {game_version}"
+ )))?;
+
+ Ok((refreshed, idx))
+}
+
#[tracing::instrument(skip(profile))]
pub async fn install_minecraft(
@@ -219,16 +259,8 @@ pub async fn install_minecraft(
let instance_path =
crate::api::profile::get_full_path(&profile.path).await?;
- let minecraft = crate::api::metadata::get_minecraft_versions().await?;
-
- let version_index = minecraft
- .versions
- .iter()
- .position(|it| it.id == profile.game_version)
- .ok_or(crate::ErrorKind::LauncherError(format!(
- "Invalid game version: {}",
- profile.game_version
- )))?;
+ let (minecraft, version_index) =
+ resolve_minecraft_manifest(&profile.game_version, &state).await?;
let version = &minecraft.versions[version_index];
let minecraft_updated = version_index
<= minecraft
@@ -481,15 +513,8 @@ pub async fn launch_minecraft(
let instance_path =
crate::api::profile::get_full_path(&profile.path).await?;
- let minecraft = crate::api::metadata::get_minecraft_versions().await?;
- let version_index = minecraft
- .versions
- .iter()
- .position(|it| it.id == profile.game_version)
- .ok_or(crate::ErrorKind::LauncherError(format!(
- "Invalid game version: {}",
- profile.game_version
- )))?;
+ let (minecraft, version_index) =
+ resolve_minecraft_manifest(&profile.game_version, &state).await?;
let version = &minecraft.versions[version_index];
let minecraft_updated = version_index
<= minecraft
diff --git a/packages/ui/src/layouts/shared/content-tab/composables/content-filtering.ts b/packages/ui/src/layouts/shared/content-tab/composables/content-filtering.ts
index 7f448e1e18..cc0c569543 100644
--- a/packages/ui/src/layouts/shared/content-tab/composables/content-filtering.ts
+++ b/packages/ui/src/layouts/shared/content-tab/composables/content-filtering.ts
@@ -51,11 +51,7 @@ export function useContentFilters(items: Ref, config?: ContentFil
}
}
- if (
- config?.showUpdateFilter &&
- !config?.isPackLocked?.value &&
- items.value.some((m) => m.has_update)
- ) {
+ if (config?.showUpdateFilter && items.value.some((m) => m.has_update)) {
options.push({ id: 'updates', label: 'Updates' })
}
diff --git a/packages/ui/src/layouts/shared/content-tab/layout.vue b/packages/ui/src/layouts/shared/content-tab/layout.vue
index e1334224aa..fd9b45158a 100644
--- a/packages/ui/src/layouts/shared/content-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/content-tab/layout.vue
@@ -278,7 +278,7 @@ const tableItems = computed(() => {
isBulkOperating.value ||
item.installing === true,
installing: item.installing === true,
- hasUpdate: !ctx.isPackLocked.value && item.has_update,
+ hasUpdate: item.has_update,
isClientOnly: isClientOnlyEnvironment(item.environment),
overflowOptions: ctx.getOverflowOptions?.(item),
}
@@ -711,7 +711,7 @@ const confirmUnlinkModal = ref>()
>()
>
Date: Thu, 26 Mar 2026 22:44:54 +0000
Subject: [PATCH 32/45] Fix payout sync response schema (#5644)
---
packages/muralpay/src/payout.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/muralpay/src/payout.rs b/packages/muralpay/src/payout.rs
index 849c12d2de..7fb215aaf1 100644
--- a/packages/muralpay/src/payout.rs
+++ b/packages/muralpay/src/payout.rs
@@ -364,7 +364,7 @@ pub enum FiatPayoutStatus {
// since 1.31
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
-#[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
pub enum RefundErrorCode {
Unknown,
AccountNumberIncorrect,
@@ -376,7 +376,7 @@ pub enum RefundErrorCode {
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
-#[serde(tag = "type", rename_all = "kebab-case")]
+#[serde(rename_all = "kebab-case")]
pub enum FiatPayoutStatusKind {
Created,
Pending,
From 4394092928e8becf55b2c947220d77413b933425 Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Thu, 26 Mar 2026 22:55:08 +0000
Subject: [PATCH 33/45] feat: better tooltips for mods in content tab hosting
panel (#5679)
* feat: better tooltips for mods in content tab hosting panel
* feat: qa
---
.../hosting/manage/[id]/options/loader.vue | 39 ++++++++-----
.../api-client/src/modules/archon/types.ts | 13 ++++-
.../server/ServerModpackContentCard.vue | 13 ++++-
.../components/ContentCardItem.vue | 30 +++++++++-
.../components/ContentCardTable.vue | 4 ++
.../components/ContentModpackCard.vue | 36 ++++++++----
.../components/modals/ModpackContentModal.vue | 8 ++-
.../composables/content-filtering.ts | 16 ++++--
.../src/layouts/shared/content-tab/layout.vue | 8 ++-
.../src/layouts/shared/content-tab/types.ts | 14 ++++-
.../components/ContentDiffModal.vue | 2 +-
.../shared/installation-settings/layout.vue | 47 +++++++++-------
.../providers/installation-settings.ts | 2 +-
.../shared/installation-settings/types.ts | 3 +-
.../wrapped/hosting/manage/content.vue | 56 ++++++++++++-------
packages/ui/src/locales/en-US/index.json | 8 ++-
packages/ui/src/utils/common-messages.ts | 10 ++++
17 files changed, 223 insertions(+), 86 deletions(-)
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
index 368479623b..247ddffd47 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
@@ -203,13 +203,18 @@ const addonsQuery = useQuery({
const modpack = computed(() => addonsQuery.data.value?.modpack ?? null)
+const modpackProjectId = computed(() => {
+ const spec = modpack.value?.spec
+ return spec?.platform === 'modrinth' ? spec.project_id : null
+})
+
const modpackVersionsQuery = useQuery({
- queryKey: computed(() => ['labrinth', 'versions', 'v2', modpack.value?.spec.project_id]),
+ queryKey: computed(() => ['labrinth', 'versions', 'v2', modpackProjectId.value]),
queryFn: () =>
- client.labrinth.versions_v2.getProjectVersions(modpack.value!.spec.project_id, {
+ client.labrinth.versions_v2.getProjectVersions(modpackProjectId.value!, {
include_changelog: false,
}),
- enabled: computed(() => !!modpack.value?.spec.project_id),
+ enabled: computed(() => !!modpackProjectId.value),
})
const auth = await useAuth()
@@ -321,17 +326,20 @@ provideInstallationSettings({
}),
isLinked: computed(() => {
const val = !!modpack.value
- debug('isLinked:', val, 'modpack:', modpack.value?.spec?.project_id)
+ debug('isLinked:', val, 'modpack:', modpackProjectId.value)
return val
}),
isBusy: isInstalling,
modpack: computed(() => {
if (!modpack.value) return null
+ const isLocal = modpack.value.spec.platform === 'local_file'
return {
iconUrl: modpack.value.icon_url,
- title: modpack.value.title ?? modpack.value.spec.project_id,
- link: `/project/${modpack.value.spec.project_id}`,
+ title:
+ modpack.value.title ?? (isLocal ? modpack.value.spec.name : modpack.value.spec.project_id),
+ link: modpackProjectId.value ? `/project/${modpackProjectId.value}` : undefined,
versionNumber: modpack.value.version_number,
+ filename: isLocal ? modpack.value.spec.filename : undefined,
owner: modpack.value.owner
? {
id: modpack.value.owner.id,
@@ -460,7 +468,7 @@ provideInstallationSettings({
},
async reinstallModpack() {
- if (!modpack.value) return
+ if (!modpack.value || modpack.value.spec.platform !== 'modrinth') return
debug(
'reinstallModpack: called, project:',
modpack.value.spec.project_id,
@@ -531,10 +539,11 @@ provideInstallationSettings({
getCachedModpackVersions: () => modpackVersionsQuery.data.value ?? null,
async fetchModpackVersions() {
- debug('fetchModpackVersions: called, project:', modpack.value?.spec.project_id)
+ debug('fetchModpackVersions: called, project:', modpackProjectId.value)
+ if (!modpackProjectId.value) throw new Error('No modpack project ID')
try {
const versions = await client.labrinth.versions_v2.getProjectVersions(
- modpack.value!.spec.project_id,
+ modpackProjectId.value,
{
include_changelog: false,
},
@@ -562,7 +571,7 @@ provideInstallationSettings({
},
async onModpackVersionConfirm(version) {
- if (!modpack.value) return
+ if (!modpackProjectId.value) return
debug('onModpackVersionConfirm: called, version:', version.id)
debug('onModpackVersionConfirm: emitting reinstall before API call')
emit('reinstall')
@@ -571,7 +580,7 @@ provideInstallationSettings({
content_variant: 'modpack',
spec: {
platform: 'modrinth',
- project_id: modpack.value.spec.project_id,
+ project_id: modpackProjectId.value,
version_id: version.id,
},
soft_override: true,
@@ -590,18 +599,18 @@ provideInstallationSettings({
updaterModalProps: computed(() => ({
isApp: false,
- currentVersionId: modpack.value?.spec.version_id ?? '',
+ currentVersionId:
+ modpack.value?.spec.platform === 'modrinth' ? modpack.value.spec.version_id : '',
projectIconUrl: modpack.value?.icon_url ?? undefined,
projectName:
- modpack.value?.title ??
- modpack.value?.spec.project_id ??
- formatMessage(commonMessages.modpackLabel),
+ modpack.value?.title ?? modpackProjectId.value ?? formatMessage(commonMessages.modpackLabel),
currentGameVersion: addonsQuery.data.value?.game_version ?? server.value?.mc_version ?? '',
currentLoader: addonsQuery.data.value?.modloader ?? server.value?.loader ?? '',
})),
isServer: true,
isApp: false,
+ showModpackVersionActions: computed(() => modpack.value?.spec.platform === 'modrinth'),
lockPlatform: true,
hideLoaderVersion: true,
diff --git a/packages/api-client/src/modules/archon/types.ts b/packages/api-client/src/modules/archon/types.ts
index 8b74a55d60..5c13800371 100644
--- a/packages/api-client/src/modules/archon/types.ts
+++ b/packages/api-client/src/modules/archon/types.ts
@@ -27,6 +27,8 @@ export namespace Archon {
disabled: boolean
kind: AddonKind
from_modpack: boolean
+ pack_client_retained: boolean
+ pack_client_depends: boolean
has_update: string | null
name: string | null
project_id: string | null
@@ -68,12 +70,21 @@ export namespace Archon {
| 'purpur'
| 'vanilla'
- export type ModpackSpec = {
+ export type ModpackSpecModrinth = {
platform: 'modrinth'
project_id: string
version_id: string
}
+ export type ModpackSpecLocalFile = {
+ platform: 'local_file'
+ filename: string
+ name: string
+ description: string | null
+ }
+
+ export type ModpackSpec = ModpackSpecModrinth | ModpackSpecLocalFile
+
export type ModpackOwner = {
id: string
name: string
diff --git a/packages/ui/src/components/project/server/ServerModpackContentCard.vue b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
index ef66a91567..bc29556cc8 100644
--- a/packages/ui/src/components/project/server/ServerModpackContentCard.vue
+++ b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
@@ -1,7 +1,7 @@
Loading analytics...
@@ -315,6 +315,7 @@ import { Card, DropdownSelect, useCompactNumber, + useDebugLogger, useFormatMoney, useFormatNumber, } from '@modrinth/ui' @@ -332,6 +333,7 @@ import { intToRgba, } from '~/utils/analytics.js' +const debug = useDebugLogger('ChartDisplay') const formatNumber = useFormatNumber() const { formatCompactNumber } = useCompactNumber() const formatMoney = useFormatMoney() @@ -339,6 +341,8 @@ const formatMoney = useFormatMoney() const router = useNativeRouter() const theme = useTheme() +debug('setup start', { server: import.meta.server, client: import.meta.client }) + const props = withDefaults( defineProps<{ projects?: any[] @@ -359,6 +363,11 @@ const props = withDefaults( const projects = computed(() => props.projects || []) +debug('projects from props', { + count: projects.value.length, + ids: projects.value.map((p: any) => p.id), +}) + // const selectedChart = ref('downloads') const selectedChart = computed({ get: () => { @@ -438,46 +447,47 @@ const isUsingProjectColors = computed({ }, }) -const startDate = ref(dayjs().startOf('day')) -const endDate = ref(dayjs().endOf('day')) -const timeResolution = ref(30) -const isInitialized = ref(false) +const defaultRange = props.ranges.find( + (r) => r.getLabel([dayjs(), dayjs()]) === 'Previous 30 days', +)! +const initialDates = defaultRange.getDates(dayjs()) + +const internalRange: Ref
-
+
diff --git a/apps/frontend/src/pages/legal/cmp-info.vue b/apps/frontend/src/pages/legal/cmp-info.vue
index f65d3007d1..fff4dc340e 100644
--- a/apps/frontend/src/pages/legal/cmp-info.vue
+++ b/apps/frontend/src/pages/legal/cmp-info.vue
@@ -195,7 +195,7 @@ const { data: transparencyInformation } = useQuery({
queryFn: () => client.labrinth.payouts_v3.getPlatformRevenue(),
})
-const platformRevenue = computed(() => (transparencyInformation.value as any)?.all_time)
+const platformRevenue = computed(() => Number((transparencyInformation.value as any)?.all_time))
const platformRevenueData = computed(
() => (transparencyInformation.value as any)?.data?.slice(0, 5) ?? [],
)
diff --git a/apps/frontend/src/utils/analytics.js b/apps/frontend/src/utils/analytics.js
index aa1a435a3a..c516de1287 100644
--- a/apps/frontend/src/utils/analytics.js
+++ b/apps/frontend/src/utils/analytics.js
@@ -1,4 +1,4 @@
-import { injectI18n } from '@modrinth/ui'
+import { injectI18n, useDebugLogger } from '@modrinth/ui'
import dayjs from 'dayjs'
import { computed, ref, watch } from 'vue'
@@ -314,8 +314,15 @@ export const useFetchAllAnalytics = (
startDate = ref(dayjs().subtract(30, 'days')),
endDate = ref(dayjs()),
timeResolution = ref(1440),
- isInitialized = ref(false),
) => {
+ const debug = useDebugLogger('useFetchAllAnalytics')
+ debug('init', {
+ projectCount: projects.value?.length,
+ personalRevenue,
+ startDate: startDate.value?.toISOString(),
+ endDate: endDate.value?.toISOString(),
+ })
+
const downloadData = ref(null)
const viewData = ref(null)
const revenueData = ref(null)
@@ -340,7 +347,22 @@ export const useFetchAllAnalytics = (
revenue: processRevAnalytics(revenueData.value, projects.value, theme.active),
}))
+ const buildQuery = () => {
+ const q = {
+ start_date: startDate.value.toISOString(),
+ end_date: endDate.value.toISOString(),
+ resolution_minutes: timeResolution.value,
+ }
+
+ if (projects.value?.length) {
+ q.project_ids = JSON.stringify(projects.value.map((p) => p.id))
+ }
+
+ return q
+ }
+
const fetchData = async (query) => {
+ debug('fetchData called', { query })
const normalQuery = new URLSearchParams(query)
const revenueQuery = new URLSearchParams(query)
@@ -355,6 +377,7 @@ export const useFetchAllAnalytics = (
loading.value = true
error.value = null
+ debug('fetching all 5 endpoints...')
const responses = await Promise.all([
useFetchAnalytics(`analytics/downloads?${qs}`),
useFetchAnalytics(`analytics/views?${qs}`),
@@ -362,16 +385,21 @@ export const useFetchAllAnalytics = (
useFetchAnalytics(`analytics/countries/downloads?${qs}`),
useFetchAnalytics(`analytics/countries/views?${qs}`),
])
+ debug('all 5 endpoints resolved', {
+ downloads: Object.keys(responses[0] || {}).length,
+ views: Object.keys(responses[1] || {}).length,
+ revenue: Object.keys(responses[2] || {}).length,
+ })
- // collect project ids from projects.value into a set
const projectIds = new Set()
if (projects.value) {
projects.value.forEach((p) => projectIds.add(p.id))
} else {
- // if projects.value is not set, we assume that we want all project ids
Object.keys(responses[0] || {}).forEach((id) => projectIds.add(id))
}
+ debug('filtering to projectIds', { count: projectIds.size })
+
const filterProjectIds = (data) => {
const filtered = {}
Object.entries(data).forEach(([id, values]) => {
@@ -389,43 +417,27 @@ export const useFetchAllAnalytics = (
downloadsByCountry.value = responses[3] || {}
viewsByCountry.value = responses[4] || {}
} catch (e) {
+ debug('fetchData error', e)
error.value = e
} finally {
loading.value = false
+ debug('fetchData done, loading=false')
+ }
+ }
+
+ const fetch = async () => {
+ debug('fetch() called', { projectCount: projects.value?.length })
+ await fetchData(buildQuery())
+ if (onDataRefresh) {
+ onDataRefresh()
}
}
watch(
- [
- () => startDate.value,
- () => endDate.value,
- () => timeResolution.value,
- () => projects.value,
- () => isInitialized.value,
- ],
- async () => {
- if (!isInitialized.value) {
- return
- }
-
- const q = {
- start_date: startDate.value.toISOString(),
- end_date: endDate.value.toISOString(),
- resolution_minutes: timeResolution.value,
- }
-
- if (projects.value?.length) {
- q.project_ids = JSON.stringify(projects.value.map((p) => p.id))
- }
-
- await fetchData(q)
-
- if (onDataRefresh) {
- onDataRefresh()
- }
- },
- {
- immediate: true,
+ [() => startDate.value, () => endDate.value, () => timeResolution.value, () => projects.value],
+ (newVals, oldVals) => {
+ debug('watch triggered', { new: newVals, old: oldVals })
+ fetch()
},
)
@@ -474,6 +486,6 @@ export const useFetchAllAnalytics = (
totalData,
loading,
error,
- isInitialized,
+ fetch,
}
}
From 2128fa7ade7bd9b60345b671506a666c02b6b3dd Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Thu, 19 Mar 2026 09:53:53 -0700
Subject: [PATCH 07/45] refactor: TabbedModal to use NewModal and DI (#5612)
* refactor: tabbed modal to use NewModal
* refactor: use DI for instance settings modal instead of passing down props
* pnpm prepr
---
.../ui/instance_settings/GeneralSettings.vue | 33 +-
.../ui/instance_settings/HooksSettings.vue | 13 +-
.../InstallationSettings.vue | 81 +++--
.../ui/instance_settings/JavaSettings.vue | 29 +-
.../ui/instance_settings/WindowSettings.vue | 15 +-
.../components/ui/modal/AppSettingsModal.vue | 88 +++--
.../ui/modal/InstanceSettingsModal.vue | 46 ++-
apps/app-frontend/src/helpers/types.d.ts | 6 -
.../src/providers/instance-settings.ts | 14 +
.../ui/src/components/modal/TabbedModal.vue | 177 ++++++----
.../src/stories/modal/TabbedModal.stories.ts | 320 ++++++++++++++++++
11 files changed, 584 insertions(+), 238 deletions(-)
create mode 100644 apps/app-frontend/src/providers/instance-settings.ts
create mode 100644 packages/ui/src/stories/modal/TabbedModal.stories.ts
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
index ead9416bfa..f8d4052209 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -18,8 +18,9 @@ import { useRouter } from 'vue-router'
import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
import { trackEvent } from '@/helpers/analytics'
import { duplicate, edit, edit_icon, list, remove } from '@/helpers/profile'
+import { injectInstanceSettings } from '@/providers/instance-settings'
-import type { GameInstance, InstanceSettingsTabProps } from '../../../helpers/types'
+import type { GameInstance } from '../../../helpers/types'
const { handleError } = injectNotificationManager()
const { formatMessage } = useVIntl()
@@ -27,21 +28,21 @@ const router = useRouter()
const deleteConfirmModal = ref()
-const props = defineProps
+
+
+ Loading analytics...
+
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
index ff2bb35e31..3061ea7fc6 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -10,22 +10,21 @@ import { computed, ref, watch } from 'vue'
import { edit } from '@/helpers/profile'
import { get } from '@/helpers/settings.ts'
+import { injectInstanceSettings } from '@/providers/instance-settings'
-import type { AppSettings, Hooks, InstanceSettingsTabProps } from '../../../helpers/types'
+import type { AppSettings, Hooks } from '../../../helpers/types'
const { handleError } = injectNotificationManager()
const { formatMessage } = useVIntl()
-const props = defineProps()
+const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as AppSettings
const overrideHooks = ref(
- !!props.instance.hooks.pre_launch ||
- !!props.instance.hooks.wrapper ||
- !!props.instance.hooks.post_exit,
+ !!instance.hooks.pre_launch || !!instance.hooks.wrapper || !!instance.hooks.post_exit,
)
-const hooks = ref(props.instance.hooks ?? globalSettings.hooks)
+const hooks = ref(instance.hooks ?? globalSettings.hooks)
const editProfileObject = computed(() => {
const editProfile: {
@@ -41,7 +40,7 @@ const editProfileObject = computed(() => {
watch(
[overrideHooks, hooks],
async () => {
- await edit(props.instance.path, editProfileObject.value)
+ await edit(instance.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index 9874e53468..2aa0201b0b 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -27,17 +27,15 @@ import {
update_repair_modrinth,
} from '@/helpers/profile'
import { get_game_versions, get_loaders } from '@/helpers/tags'
+import { injectInstanceSettings } from '@/providers/instance-settings'
-import type { InstanceSettingsTabProps, Manifest } from '../../../helpers/types'
+import type { Manifest } from '../../../helpers/types'
const { handleError } = injectNotificationManager()
const { formatMessage } = useVIntl()
const queryClient = useQueryClient()
-const props = defineProps()
-const emit = defineEmits<{
- unlinked: []
-}>()
+const { instance, offline, isMinecraftServer, onUnlinked } = injectInstanceSettings()
const [
fabric_versions,
@@ -75,9 +73,9 @@ const [
])
const { data: modpackInfo } = useQuery({
- queryKey: computed(() => ['linkedModpackInfo', props.instance.path]),
- queryFn: () => get_linked_modpack_info(props.instance.path, 'must_revalidate'),
- enabled: computed(() => !!props.instance.linked_data?.project_id && !props.offline),
+ queryKey: computed(() => ['linkedModpackInfo', instance.path]),
+ queryFn: () => get_linked_modpack_info(instance.path, 'must_revalidate'),
+ enabled: computed(() => !!instance.linked_data?.project_id && !offline),
})
const repairing = ref(false)
@@ -103,13 +101,13 @@ function getManifest(loader: string) {
provideAppBackup({
async createBackup() {
const allProfiles = await list()
- const prefix = `${props.instance.name} - Backup #`
+ const prefix = `${instance.name} - Backup #`
const existingNums = allProfiles
.filter((p) => p.name.startsWith(prefix))
.map((p) => parseInt(p.name.slice(prefix.length), 10))
.filter((n) => !isNaN(n))
const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
- const newPath = await duplicate(props.instance.path)
+ const newPath = await duplicate(instance.path)
await edit(newPath, { name: `${prefix}${nextNum}` })
},
})
@@ -120,30 +118,27 @@ provideInstallationSettings({
const rows = [
{
label: formatMessage(commonMessages.platformLabel),
- value: formatLoaderLabel(props.instance.loader),
+ value: formatLoaderLabel(instance.loader),
},
{
label: formatMessage(commonMessages.gameVersionLabel),
- value: props.instance.game_version,
+ value: instance.game_version,
},
]
- if (props.instance.loader !== 'vanilla' && props.instance.loader_version) {
+ if (instance.loader !== 'vanilla' && instance.loader_version) {
rows.push({
label: formatMessage(messages.loaderVersion, {
- loader: formatLoaderLabel(props.instance.loader),
+ loader: formatLoaderLabel(instance.loader),
}),
- value: props.instance.loader_version,
+ value: instance.loader_version,
})
}
return rows
}),
- isLinked: computed(() => !!props.instance.linked_data?.locked),
+ isLinked: computed(() => !!instance.linked_data?.locked),
isBusy: computed(
() =>
- props.instance.install_stage !== 'installed' ||
- repairing.value ||
- reinstalling.value ||
- !!props.offline,
+ instance.install_stage !== 'installed' || repairing.value || reinstalling.value || !!offline,
),
modpack: computed(() => {
if (!modpackInfo.value) return null
@@ -154,9 +149,9 @@ provideInstallationSettings({
versionNumber: modpackInfo.value.version?.version_number,
}
}),
- currentPlatform: computed(() => props.instance.loader),
- currentGameVersion: computed(() => props.instance.game_version),
- currentLoaderVersion: computed(() => props.instance.loader_version ?? ''),
+ currentPlatform: computed(() => instance.loader),
+ currentGameVersion: computed(() => instance.game_version),
+ currentLoaderVersion: computed(() => instance.loader_version ?? ''),
availablePlatforms: loaders?.value?.map((x) => x.name) ?? [],
resolveGameVersions(loader, showSnapshots) {
@@ -199,50 +194,50 @@ provideInstallationSettings({
if (platform !== 'vanilla' && loaderVersionId) {
editProfile.loader_version = loaderVersionId
}
- await edit(props.instance.path, editProfile).catch(handleError)
+ await edit(instance.path, editProfile).catch(handleError)
},
afterSave: async () => {
- await install(props.instance.path, false).catch(handleError)
+ await install(instance.path, false).catch(handleError)
trackEvent('InstanceRepair', {
- loader: props.instance.loader,
- game_version: props.instance.game_version,
+ loader: instance.loader,
+ game_version: instance.game_version,
})
},
async repair() {
repairing.value = true
- await install(props.instance.path, true).catch(handleError)
+ await install(instance.path, true).catch(handleError)
repairing.value = false
trackEvent('InstanceRepair', {
- loader: props.instance.loader,
- game_version: props.instance.game_version,
+ loader: instance.loader,
+ game_version: instance.game_version,
})
},
async reinstallModpack() {
reinstalling.value = true
- await update_repair_modrinth(props.instance.path).catch(handleError)
+ await update_repair_modrinth(instance.path).catch(handleError)
reinstalling.value = false
trackEvent('InstanceRepair', {
- loader: props.instance.loader,
- game_version: props.instance.game_version,
+ loader: instance.loader,
+ game_version: instance.game_version,
})
},
async unlinkModpack() {
- await edit(props.instance.path, {
+ await edit(instance.path, {
linked_data: null as unknown as undefined,
})
await queryClient.invalidateQueries({
- queryKey: ['linkedModpackInfo', props.instance.path],
+ queryKey: ['linkedModpackInfo', instance.path],
})
- emit('unlinked')
+ onUnlinked()
},
getCachedModpackVersions: () => null,
async fetchModpackVersions() {
- const versions = await get_project_versions(props.instance.linked_data!.project_id!).catch(
+ const versions = await get_project_versions(instance.linked_data!.project_id!).catch(
handleError,
)
return (versions ?? []) as Labrinth.Versions.v2.Version[]
@@ -255,25 +250,25 @@ provideInstallationSettings({
},
async onModpackVersionConfirm(version) {
- await update_managed_modrinth_version(props.instance.path, version.id)
+ await update_managed_modrinth_version(instance.path, version.id)
await queryClient.invalidateQueries({
- queryKey: ['linkedModpackInfo', props.instance.path],
+ queryKey: ['linkedModpackInfo', instance.path],
})
},
updaterModalProps: computed(() => ({
isApp: true,
currentVersionId:
- modpackInfo.value?.update_version_id ?? props.instance.linked_data?.version_id ?? '',
+ modpackInfo.value?.update_version_id ?? instance.linked_data?.version_id ?? '',
projectIconUrl: modpackInfo.value?.project?.icon_url,
projectName: modpackInfo.value?.project?.title ?? 'Modpack',
- currentGameVersion: props.instance.game_version,
- currentLoader: props.instance.loader,
+ currentGameVersion: instance.game_version,
+ currentLoader: instance.loader,
})),
isServer: false,
isApp: true,
- showModpackVersionActions: !props.isMinecraftServer,
+ showModpackVersionActions: !isMinecraftServer.value,
repairing,
reinstalling,
})
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index 0622de837a..39efa5fb1f 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -14,34 +14,31 @@ import JavaSelector from '@/components/ui/JavaSelector.vue'
import useMemorySlider from '@/composables/useMemorySlider'
import { edit, get_optimal_jre_key } from '@/helpers/profile'
import { get } from '@/helpers/settings.ts'
+import { injectInstanceSettings } from '@/providers/instance-settings'
-import type { AppSettings, InstanceSettingsTabProps } from '../../../helpers/types'
+import type { AppSettings } from '../../../helpers/types'
const { handleError } = injectNotificationManager()
const { formatMessage } = useVIntl()
-const props = defineProps()
+const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
-const overrideJavaInstall = ref(!!props.instance.java_path)
-const optimalJava = readonly(await get_optimal_jre_key(props.instance.path).catch(handleError))
-const javaInstall = ref({ path: optimalJava.path ?? props.instance.java_path })
+const overrideJavaInstall = ref(!!instance.java_path)
+const optimalJava = readonly(await get_optimal_jre_key(instance.path).catch(handleError))
+const javaInstall = ref({ path: optimalJava.path ?? instance.java_path })
-const overrideJavaArgs = ref((props.instance.extra_launch_args?.length ?? 0) > 0)
-const javaArgs = ref(
- (props.instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
-)
+const overrideJavaArgs = ref((instance.extra_launch_args?.length ?? 0) > 0)
+const javaArgs = ref((instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '))
-const overrideEnvVars = ref((props.instance.custom_env_vars?.length ?? 0) > 0)
+const overrideEnvVars = ref((instance.custom_env_vars?.length ?? 0) > 0)
const envVars = ref(
- (props.instance.custom_env_vars ?? globalSettings.custom_env_vars)
- .map((x) => x.join('='))
- .join(' '),
+ (instance.custom_env_vars ?? globalSettings.custom_env_vars).map((x) => x.join('=')).join(' '),
)
-const overrideMemorySettings = ref(!!props.instance.memory)
-const memory = ref(props.instance.memory ?? globalSettings.memory)
+const overrideMemorySettings = ref(!!instance.memory)
+const memory = ref(instance.memory ?? globalSettings.memory)
const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
maxMemory: number
snapPoints: number[]
@@ -79,7 +76,7 @@ watch(
memory,
],
async () => {
- await edit(props.instance.path, editProfileObject.value)
+ await edit(instance.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
index 8bc1bc5fed..342c820ccc 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -11,24 +11,23 @@ import { computed, type Ref, ref, watch } from 'vue'
import { edit } from '@/helpers/profile'
import { get } from '@/helpers/settings.ts'
+import { injectInstanceSettings } from '@/providers/instance-settings'
-import type { AppSettings, InstanceSettingsTabProps } from '../../../helpers/types'
+import type { AppSettings } from '../../../helpers/types'
const { handleError } = injectNotificationManager()
const { formatMessage } = useVIntl()
-const props = defineProps()
+const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as AppSettings
-const overrideWindowSettings = ref(
- !!props.instance.game_resolution || !!props.instance.force_fullscreen,
-)
+const overrideWindowSettings = ref(!!instance.game_resolution || !!instance.force_fullscreen)
const resolution: Ref<[number, number]> = ref(
- props.instance.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
+ instance.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
)
const fullscreenSetting: Ref = ref(
- props.instance.force_fullscreen ?? globalSettings.force_fullscreen,
+ instance.force_fullscreen ?? globalSettings.force_fullscreen,
)
const editProfileObject = computed(() => {
@@ -47,7 +46,7 @@ const editProfileObject = computed(() => {
watch(
[overrideWindowSettings, resolution, fullscreenSetting],
async () => {
- await edit(props.instance.path, editProfileObject.value)
+ await edit(instance.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index 3328fed4e6..1635b46a70 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -20,9 +20,8 @@ import {
} from '@modrinth/ui'
import { getVersion } from '@tauri-apps/api/app'
import { platform as getOsPlatform, version as getOsVersion } from '@tauri-apps/plugin-os'
-import { computed, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import AppearanceSettings from '@/components/ui/settings/AppearanceSettings.vue'
import DefaultInstanceSettings from '@/components/ui/settings/DefaultInstanceSettings.vue'
import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
@@ -106,15 +105,13 @@ const tabs = [
},
]
-const modal = ref()
+const modal = ref | null>(null)
function show() {
- modal.value.show()
+ modal.value?.show()
}
-const isOpen = computed(() => modal.value?.isOpen)
-
-defineExpose({ show, isOpen })
+defineExpose({ show })
const { progress, version: downloadingVersion } = injectAppUpdateDownloadProgress()
@@ -138,8 +135,8 @@ function devModeCount() {
settings.value.developer_mode = !!themeStore.devMode
devModeCounter.value = 0
- if (!themeStore.devMode && tabs[modal.value.selectedTab].developerOnly) {
- modal.value.setTab(0)
+ if (!themeStore.devMode && tabs[modal.value!.selectedTab].developerOnly) {
+ modal.value!.setTab(0)
}
}
}
@@ -152,49 +149,46 @@ const messages = defineMessages({
})
-
+
-
-
-
- | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'appearance', defaultMessage: 'Appearance' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Appearance'),
+ },
+ {
+ name: { id: 'privacy', defaultMessage: 'Privacy' },
+ icon: ShieldIcon,
+ content: makeTabContent('Privacy'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'appearance', defaultMessage: 'Appearance' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Appearance'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'appearance', defaultMessage: 'Appearance' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Appearance'),
+ },
+ {
+ name: { id: 'privacy', defaultMessage: 'Privacy' },
+ icon: ShieldIcon,
+ content: makeTabContent('Privacy'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'language', defaultMessage: 'Language' },
+ icon: LanguagesIcon,
+ content: makeTabContent('Language'),
+ badge: { id: 'beta', defaultMessage: 'Beta' },
+ },
+ {
+ name: { id: 'privacy', defaultMessage: 'Privacy' },
+ icon: ShieldIcon,
+ content: makeTabContent('Privacy'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'hidden', defaultMessage: 'Hidden Tab' },
+ icon: ReportIcon,
+ content: makeTabContent('Hidden'),
+ shown: false,
+ },
+ {
+ name: { id: 'appearance', defaultMessage: 'Appearance' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Appearance'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'general', defaultMessage: 'General' },
+ icon: InfoIcon,
+ content: makeTabContent('General'),
+ },
+ {
+ name: { id: 'appearance', defaultMessage: 'Appearance' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Appearance'),
+ },
+ {
+ name: { id: 'language', defaultMessage: 'Language' },
+ icon: LanguagesIcon,
+ content: makeTabContent('Language'),
+ },
+ {
+ name: { id: 'privacy', defaultMessage: 'Privacy' },
+ icon: ShieldIcon,
+ content: makeTabContent('Privacy'),
+ },
+ {
+ name: { id: 'java', defaultMessage: 'Java and memory' },
+ icon: CoffeeIcon,
+ content: makeTabContent('Java and memory'),
+ },
+ {
+ name: { id: 'instances', defaultMessage: 'Default instance options' },
+ icon: GameIcon,
+ content: makeTabContent('Default instance options'),
+ },
+ {
+ name: { id: 'resources', defaultMessage: 'Resource management' },
+ icon: GaugeIcon,
+ content: makeTabContent('Resource management'),
+ },
+ {
+ name: { id: 'window', defaultMessage: 'Window' },
+ icon: MonitorIcon,
+ content: makeTabContent('Window'),
+ },
+ {
+ name: { id: 'hooks', defaultMessage: 'Launch hooks' },
+ icon: WrenchIcon,
+ content: makeTabContent('Launch hooks'),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+ | null>(null)
+ const tabs = [
+ {
+ name: { id: 'long', defaultMessage: 'Long content' },
+ icon: InfoIcon,
+ content: makeTabContent('Long content', 30),
+ },
+ {
+ name: { id: 'short', defaultMessage: 'Short content' },
+ icon: PaintbrushIcon,
+ content: makeTabContent('Short content', 2),
+ },
+ ]
+ return { modalRef, tabs }
+ },
+ template: /* html */ `
+
Date: Thu, 19 Mar 2026 20:53:58 +0000
Subject: [PATCH 08/45] fix: reinstall soft_override: true (#5623)
---
apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
index 05a1adaea0..b0d9ccd2d9 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
@@ -410,7 +410,7 @@ provideInstallationSettings({
project_id: modpack.value.spec.project_id,
version_id: modpack.value.spec.version_id,
},
- soft_override: false,
+ soft_override: true,
})
debug('reinstallModpack: installContent succeeded, invalidating')
invalidateServerState()
From 3c5bd0756d30e21c9868de2690e7d3797a95de03 Mon Sep 17 00:00:00 2001
From: aecsocket
Date: Fri, 20 Mar 2026 04:01:19 +0000
Subject: [PATCH 09/45] Index search by original and split title (#5589)
* Index search by original and split title
* better normalization of title/author names for indexing
* replace println with warn
* fix test
---
.../src/search/backend/typesense/mod.rs | 21 ++++++---
apps/labrinth/src/search/indexing.rs | 45 +++++++++++++++++--
apps/labrinth/src/search/mod.rs | 2 +-
3 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/apps/labrinth/src/search/backend/typesense/mod.rs b/apps/labrinth/src/search/backend/typesense/mod.rs
index 026b940b76..dec7923e2c 100644
--- a/apps/labrinth/src/search/backend/typesense/mod.rs
+++ b/apps/labrinth/src/search/backend/typesense/mod.rs
@@ -105,18 +105,25 @@ impl Default for RequestConfig {
}
fn default_query_by() -> Vec {
- ["indexed_title", "slug", "summary", "indexed_author"]
- .into_iter()
- .map(str::to_string)
- .collect()
+ [
+ "name",
+ "indexed_name",
+ "slug",
+ "author",
+ "indexed_author",
+ "summary",
+ ]
+ .into_iter()
+ .map(str::to_string)
+ .collect()
}
fn default_query_by_weights() -> Vec {
- vec![15, 5, 2, 1]
+ vec![15, 15, 10, 3, 3, 1]
}
fn default_prefix() -> Vec {
- vec![true, true, true, true]
+ vec![true, true, true, true, true, true]
}
const fn default_prioritize_exact_match() -> bool {
@@ -491,7 +498,7 @@ impl Typesense {
let mut fields = vec![
json!({"name": "summary", "type": "string", "facet": false}),
json!({"name": "slug", "type": "string", "facet": false}),
- json!({"name": "indexed_title", "type": "string", "facet": false, "stem": true}),
+ json!({"name": "indexed_name", "type": "string", "facet": false, "stem": true}),
json!({"name": "indexed_author", "type": "string", "facet": false}),
json!({"name": "log_downloads", "type": "float", "sort": true}),
json!({"name": "follows", "type": "int32", "facet": true, "sort": true}),
diff --git a/apps/labrinth/src/search/indexing.rs b/apps/labrinth/src/search/indexing.rs
index cf4a92f931..b081ce9aae 100644
--- a/apps/labrinth/src/search/indexing.rs
+++ b/apps/labrinth/src/search/indexing.rs
@@ -4,8 +4,10 @@ use eyre::Result;
use futures::TryStreamExt;
use heck::ToKebabCase;
use itertools::Itertools;
+use regex::Regex;
use std::collections::HashMap;
-use tracing::info;
+use std::sync::LazyLock;
+use tracing::{info, warn};
use crate::database::PgPool;
use crate::database::models::loader_fields::{
@@ -25,6 +27,13 @@ use crate::routes::v2_reroute;
use crate::search::UploadSearchProject;
use crate::util::error::Context;
+fn normalize_for_search(s: &str) -> String {
+ static SPECIAL_CHARS_RE: LazyLock =
+ LazyLock::new(|| Regex::new(r"[^a-zA-Z0-9-.\s]").expect("valid regex"));
+
+ SPECIAL_CHARS_RE.replace_all(s, "").to_kebab_case()
+}
+
pub async fn index_local(
pool: &PgPool,
redis: &RedisPool,
@@ -262,7 +271,7 @@ pub async fn index_local(
{
team_owner
} else {
- println!(
+ warn!(
"org owner not found for project {} id: {}!",
project.name, project.id.0
);
@@ -427,7 +436,7 @@ pub async fn index_local(
project_id: crate::models::ids::ProjectId::from(project.id)
.to_string(),
name: project.name.clone(),
- indexed_title: project.name.to_kebab_case(),
+ indexed_name: normalize_for_search(&project.name),
summary: project.summary.clone(),
categories: categories.clone(),
display_categories: display_categories.clone(),
@@ -436,7 +445,7 @@ pub async fn index_local(
log_downloads: (project.downloads.max(1) as f64).ln(),
icon_url: project.icon_url.clone(),
author: owner.clone(),
- indexed_author: owner.to_kebab_case(),
+ indexed_author: normalize_for_search(&owner),
date_created: project.approved,
created_timestamp: project.approved.timestamp(),
date_modified: project.updated,
@@ -614,3 +623,31 @@ async fn index_versions(
Ok(res_versions)
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_normalize_for_search_removes_special_chars() {
+ assert_eq!(normalize_for_search("Xaero's Minimap"), "xaeros-minimap");
+ assert_eq!(normalize_for_search("JourneyMap"), "journey-map");
+ assert_eq!(normalize_for_search("journey-map"), "journey-map");
+ assert_eq!(normalize_for_search("SomeUserName"), "some-user-name");
+ }
+
+ #[test]
+ fn test_normalize_for_search_handles_whitespace() {
+ assert_eq!(
+ normalize_for_search("Some Project Name"),
+ "some-project-name"
+ );
+ assert_eq!(normalize_for_search(" padded "), "padded");
+ }
+
+ #[test]
+ fn test_normalize_for_search_handles_numbers() {
+ assert_eq!(normalize_for_search("Project 123"), "project-123");
+ assert_eq!(normalize_for_search("Test 1.0"), "test-1-0");
+ }
+}
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index 545a0c4fc6..843a6519ac 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -230,7 +230,7 @@ pub struct UploadSearchProject {
pub author: String,
pub indexed_author: String,
pub name: String,
- pub indexed_title: String,
+ pub indexed_name: String,
pub summary: String,
pub categories: Vec,
pub display_categories: Vec,
From 9e6a6cd385d31ed593c702b66720e69fcd7b299d Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Sat, 21 Mar 2026 18:04:55 +0000
Subject: [PATCH 10/45] fix: withdraw flow bug (zero bal) (#5629)
---
apps/frontend/src/providers/creator-withdraw.ts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/frontend/src/providers/creator-withdraw.ts b/apps/frontend/src/providers/creator-withdraw.ts
index 7e544ac3d8..fc9ce21381 100644
--- a/apps/frontend/src/providers/creator-withdraw.ts
+++ b/apps/frontend/src/providers/creator-withdraw.ts
@@ -408,11 +408,11 @@ export function createWithdrawContext(
const stages = computed(() => {
const dynamicStages: WithdrawStage[] = []
- const usedLimit = balance?.withdrawn_ytd ?? 0
- const available = balance?.available ?? 0
+ const usedLimit = balanceRef.value?.withdrawn_ytd ?? 0
+ const available = balanceRef.value?.available ?? 0
const needsTaxForm =
- balance?.form_completion_status !== 'complete' &&
+ balanceRef.value?.form_completion_status !== 'complete' &&
usedLimit + available >= getTaxThreshold(taxComplianceThresholds)
const threshold = getTaxThreshold(taxComplianceThresholds)
@@ -420,7 +420,7 @@ export function createWithdrawContext(
usedLimit,
available,
total: usedLimit + available,
- status: balance?.form_completion_status,
+ status: balanceRef.value?.form_completion_status,
needsTaxForm,
taxThreshold: threshold,
taxComplianceFilled: `${((usedLimit / threshold) * 100).toFixed(1)}%`,
@@ -448,14 +448,14 @@ export function createWithdrawContext(
})
const maxWithdrawAmount = computed(() => {
- const availableBalance = balance?.available ?? 0
- const formCompleted = balance?.form_completion_status === 'complete'
+ const availableBalance = balanceRef.value?.available ?? 0
+ const formCompleted = balanceRef.value?.form_completion_status === 'complete'
if (formCompleted) {
return Math.max(0, availableBalance)
}
- const usedLimit = balance?.withdrawn_ytd ?? 0
+ const usedLimit = balanceRef.value?.withdrawn_ytd ?? 0
const remainingLimit = Math.max(0, getTaxThresholdActual(taxComplianceThresholds) - usedLimit)
return Math.max(0, Math.min(remainingLimit, availableBalance))
})
From 92eddbe8323f05eb7d90aaf9e29b8caef995c6d2 Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Sat, 21 Mar 2026 18:06:03 +0000
Subject: [PATCH 11/45] feat: move switch version inline like update btn for
content tab (#5631)
* fix: switch version inline same as update btn
* fix: lint
---
.../app-frontend/src/locales/en-US/index.json | 3 ---
apps/app-frontend/src/pages/instance/Mods.vue | 17 +++------------
.../components/ContentCardItem.vue | 21 +++++++++++++++++--
.../components/ContentCardTable.vue | 7 +++++++
.../src/layouts/shared/content-tab/layout.vue | 8 +++++++
.../content-tab/providers/content-manager.ts | 3 +++
.../wrapped/hosting/manage/content.vue | 17 +++------------
packages/ui/src/locales/en-US/index.json | 3 ---
8 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 8d9bbdcdea..418f30d826 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -86,9 +86,6 @@
"app.instance.mods.successfully-uploaded": {
"message": "Successfully uploaded"
},
- "app.instance.mods.switch-version": {
- "message": "Switch version"
- },
"app.instance.mods.unknown-version": {
"message": "Unknown"
},
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index d08ef25327..dfc62c3ad2 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -63,7 +63,7 @@
diff --git a/packages/api-client/src/modules/archon/servers/v1.ts b/packages/api-client/src/modules/archon/servers/v1.ts
index 8d9f944ee7..9435bf11c7 100644
--- a/packages/api-client/src/modules/archon/servers/v1.ts
+++ b/packages/api-client/src/modules/archon/servers/v1.ts
@@ -54,4 +54,16 @@ export class ArchonServersV1Module extends AbstractModule {
method: 'DELETE',
})
}
+
+ /**
+ * Reset a world to onboarding
+ * POST /v1/servers/:id/worlds/:wid/onboard
+ */
+ public async resetToOnboarding(serverId: string, worldId: string): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/onboard`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ })
+ }
}
From 4b4282cfbff07779b9c2e925fa810f2eb62da2ed Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Wed, 25 Mar 2026 17:52:12 +0000
Subject: [PATCH 20/45] fix: 500 on oauth authorize page (#5661)
---
apps/frontend/src/pages/auth/authorize.vue | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/apps/frontend/src/pages/auth/authorize.vue b/apps/frontend/src/pages/auth/authorize.vue
index bd9d76d480..c411819eb7 100644
--- a/apps/frontend/src/pages/auth/authorize.vue
+++ b/apps/frontend/src/pages/auth/authorize.vue
@@ -5,11 +5,11 @@
-
-
- - {{ formatMessage(messages.downloading, { version: downloadingVersion }) }} -
-- {{ formatMessage(developerModeEnabled) }} -
-
-
- ()
+const props = defineProps<{
+ instance: GameInstance
+ offline?: boolean
+}>()
const emit = defineEmits<{
unlinked: []
}>()
@@ -41,6 +44,13 @@ const emit = defineEmits<{
const isMinecraftServer = ref(false)
const handleUnlinked = () => emit('unlinked')
+provideInstanceSettings({
+ instance: props.instance,
+ offline: props.offline,
+ isMinecraftServer,
+ onUnlinked: handleUnlinked,
+})
+
watch(
() => props.instance,
(instance) => {
@@ -58,7 +68,7 @@ watch(
{ immediate: true },
)
-const tabs = computed[]>(() => [
+const tabs = computed(() => [
{
name: defineMessage({
id: 'instance.settings.tabs.general',
@@ -102,8 +112,7 @@ const tabs = computed[]>(() => [
])
const queryClient = useQueryClient()
-const modal = ref()
-const tabbedModal = useTemplateRef('tabbedModal')
+const tabbedModal = ref | null>(null)
function show(tabIndex?: number) {
if (props.instance.linked_data?.project_id) {
@@ -112,7 +121,7 @@ function show(tabIndex?: number) {
queryFn: () => get_linked_modpack_info(props.instance.path, 'stale_while_revalidate'),
})
}
- modal.value.show()
+ tabbedModal.value?.show()
if (tabIndex !== undefined) {
nextTick(() => tabbedModal.value?.setTab(tabIndex))
}
@@ -121,8 +130,9 @@ function show(tabIndex?: number) {
defineExpose({ show })
-
@@ -139,19 +149,5 @@ defineExpose({ show })
}}
-
-
+ onUnlinked: () => void
+}
+
+export const [injectInstanceSettings, provideInstanceSettings] =
+ createContext('InstanceSettingsModal', 'instanceSettings')
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index 05e495c08e..2955e24792 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -1,24 +1,40 @@
+
+
-
+
diff --git a/packages/ui/src/stories/modal/TabbedModal.stories.ts b/packages/ui/src/stories/modal/TabbedModal.stories.ts
new file mode 100644
index 0000000000..6503064cf1
--- /dev/null
+++ b/packages/ui/src/stories/modal/TabbedModal.stories.ts
@@ -0,0 +1,320 @@
+import {
+ CoffeeIcon,
+ GameIcon,
+ GaugeIcon,
+ InfoIcon,
+ LanguagesIcon,
+ MonitorIcon,
+ PaintbrushIcon,
+ ReportIcon,
+ SettingsIcon,
+ ShieldIcon,
+ WrenchIcon,
+} from '@modrinth/assets'
+import type { StoryObj } from '@storybook/vue3-vite'
+import { defineComponent, h, ref } from 'vue'
+
+import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import TabbedModal from '../../components/modal/TabbedModal.vue'
+
+function makeTabContent(label: string, lines = 3) {
+ return defineComponent({
+ name: `${label}Tab`,
+ render() {
+ return h('div', { class: 'space-y-4 py-2' }, [
+ h('h2', { class: 'text-xl font-bold text-contrast m-0' }, label),
+ ...Array.from({ length: lines }, (_, i) =>
+ h('p', { class: 'text-secondary m-0' }, `${label} content paragraph ${i + 1}.`),
+ ),
+ ])
+ },
+ })
+}
+
+const meta = {
+ title: 'Modal/TabbedModal',
+ // @ts-ignore
+ component: TabbedModal,
+}
+
+export default meta
+
+export const Default: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
-
+
+ Modrinth App {{ version }}
-- macOS - {{ osPlatform }} - {{ osVersion }} -
-
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
index 3543a19b34..b866f2e02e 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -12,14 +12,13 @@ import {
Avatar,
commonMessages,
defineMessage,
- NewModal,
TabbedModal,
type TabbedModalTab,
useVIntl,
} from '@modrinth/ui'
import { useQueryClient } from '@tanstack/vue-query'
import { convertFileSrc } from '@tauri-apps/api/core'
-import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
import GeneralSettings from '@/components/ui/instance_settings/GeneralSettings.vue'
import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
@@ -28,12 +27,16 @@ import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
import { get_project_v3 } from '@/helpers/cache'
import { get_linked_modpack_info } from '@/helpers/profile'
+import { provideInstanceSettings } from '@/providers/instance-settings'
-import type { InstanceSettingsTabProps } from '../../../helpers/types'
+import type { GameInstance } from '../../../helpers/types'
const { formatMessage } = useVIntl()
-const props = defineProps
+
+
+ + {{ formatMessage(messages.downloading, { version: downloadingVersion }) }} +
++ {{ formatMessage(developerModeEnabled) }} +
+
+
+
-
-
-
+
+
Modrinth App {{ version }}
++ macOS + {{ osPlatform }} + {{ osVersion }} +
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+ ref="scrollContainer"
+ class="min-w-[400px] h-[500px] overflow-y-auto px-4"
+ @scroll="checkScrollState"
+ >
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
-
+
+
+
+
+ `,
+ }),
+}
+
+export const WithTitleSlot: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled, SettingsIcon },
+ setup() {
+ const modalRef = ref
+
+
+
+
+
+
+
+
+ `,
+ }),
+}
+
+export const WithFooter: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+
+
+
+
+
+ `,
+ }),
+}
+
+export const WithBadge: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+ App v1.0.0
+macOS 15.0
+
+
+
+
+
+ `,
+ }),
+}
+
+export const HiddenTabs: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+
+
+ `,
+ }),
+}
+
+export const ManyTabs: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+
+
+ `,
+ }),
+}
+
+export const ScrollableContent: StoryObj = {
+ render: () => ({
+ components: { TabbedModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+
+
+ `,
+ }),
+}
From 00e81adbbd6b7654c7e5fa2b41cc4047642bb8bd Mon Sep 17 00:00:00 2001
From: "Calum H." {{ formatMessage(commonMessages.errorLabel) }}
- {{ error.data.error }}: - {{ error.data.description }} + {{ error.data?.error }}: + {{ error.data?.description }}
+
Date: Wed, 25 Mar 2026 17:58:13 +0000
Subject: [PATCH 21/45] fix: various content tab hosting bugs (#5662)
* fix: qa
* fix: lint
---
.../src/pages/hosting/manage/[id]/options/loader.vue | 10 ++++++++--
.../shared/content-tab/components/ContentCardItem.vue | 8 ++++----
.../ui/src/layouts/wrapped/hosting/manage/content.vue | 3 ++-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
index 68557c5242..368479623b 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/loader.vue
@@ -398,11 +398,17 @@ provideInstallationSettings({
const currentPlatform = server.value?.loader?.toLowerCase() ?? 'vanilla'
const platformChanged = platform !== currentPlatform
+ let resolvedLoaderVersion = loaderVersionId
+ if (!resolvedLoaderVersion && platform !== 'vanilla') {
+ const versions = getLoaderVersionsForGameVersion(platform, gameVersion)
+ resolvedLoaderVersion = versions[0]?.id ?? null
+ }
+
debug('save: emitting reinstall before API call')
emit(
'reinstall',
platformChanged
- ? { loader: platform, lVersion: loaderVersionId, mVersion: gameVersion }
+ ? { loader: platform, lVersion: resolvedLoaderVersion, mVersion: gameVersion }
: { mVersion: gameVersion },
)
try {
@@ -410,7 +416,7 @@ provideInstallationSettings({
const request: Archon.Content.v1.InstallWorldContent = {
content_variant: 'bare',
loader: toApiLoader(platform),
- version: loaderVersionId ?? '',
+ version: resolvedLoaderVersion ?? '',
game_version: gameVersion || undefined,
soft_override: true,
}
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index 7e12cb55fe..dfc22431c8 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -212,8 +212,8 @@ const deleteHovered = ref(false)
>
{{
version.version_number.slice(0, Math.ceil(version.version_number.length / 2))
- }}
- {{
+ }}{{
version.version_number.slice(Math.ceil(version.version_number.length / 2))
}}
@@ -223,8 +223,8 @@ const deleteHovered = ref(false)
>
{{
version.file_name.slice(0, Math.ceil(version.file_name.length / 2))
- }}
- {{
+ }}{{
version.file_name.slice(Math.ceil(version.file_name.length / 2))
}}
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
index af1aff3f86..11c808469b 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
@@ -115,6 +115,7 @@ const contentQuery = useQuery({
queryFn: () =>
client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
enabled: computed(() => worldId.value !== null),
+ staleTime: 0,
})
const modpackProjectId = computed(() => contentQuery.data.value?.modpack?.spec.project_id ?? null)
@@ -483,7 +484,7 @@ function addonToContentItem(addon: Archon.Content.v1.Addon): ContentItem {
link: `/${addon.owner.type}/${addon.owner.id}`,
}
: undefined,
- id: addon.id,
+ id: addon.id ?? addon.filename,
enabled: !addon.disabled,
file_name: addon.filename,
project_type: addon.kind,
From 0731654a1c6015d9ebf8b99f6aee2d5d35be65b4 Mon Sep 17 00:00:00 2001
From: aecsocket
Date: Thu, 26 Mar 2026 06:33:58 +0000
Subject: [PATCH 22/45] maybe fix daedalus (#5665)
---
apps/daedalus_client/src/forge.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs
index 8bbd7cc943..1549f186cd 100644
--- a/apps/daedalus_client/src/forge.rs
+++ b/apps/daedalus_client/src/forge.rs
@@ -114,12 +114,12 @@ pub async fn fetch_neo(
}
let forge_versions = fetch_xml::(
- "https://maven.neoforged.net/net/neoforged/forge/maven-metadata.xml",
+ "https://maven.neoforged.net/releases/net/neoforged/forge/maven-metadata.xml",
&semaphore,
)
.await?;
let neo_versions = fetch_xml::(
- "https://maven.neoforged.net/net/neoforged/neoforge/maven-metadata.xml",
+ "https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml",
&semaphore,
)
.await?;
@@ -133,7 +133,7 @@ pub async fn fetch_neo(
Ok(ForgeVersion {
format_version: 2,
- installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{loader_version}/forge-{loader_version}-installer.jar"),
+ installer_url: format!("https://maven.neoforged.net/releases/net/neoforged/forge/{loader_version}/forge-{loader_version}-installer.jar"),
raw: loader_version,
loader_version: version_split,
game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
@@ -159,7 +159,7 @@ pub async fn fetch_neo(
Ok(ForgeVersion {
format_version: 2,
- installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{loader_version}/neoforge-{loader_version}-installer.jar"),
+ installer_url: format!("https://maven.neoforged.net/releases/net/neoforged/neoforge/{loader_version}/neoforge-{loader_version}-installer.jar"),
loader_version: loader_version.clone(),
raw: loader_version,
game_version,
From bf24ed8d12fa844a3c063071050742a20b4e4a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
<108630700+fetchfern@users.noreply.github.com>
Date: Thu, 26 Mar 2026 02:34:04 -0400
Subject: [PATCH 23/45] Add feature flag to force Archon requests to be traced
(#5666)
---
apps/frontend/src/composables/featureFlags.ts | 1 +
apps/frontend/src/helpers/api.ts | 4 ++++
packages/api-client/src/core/abstract-client.ts | 16 ++++++++++++++++
.../api-client/src/platform/xhr-upload-client.ts | 1 +
packages/api-client/src/types/client.ts | 8 ++++++++
5 files changed, 30 insertions(+)
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index a30b70a5d0..a1acb5878c 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -38,6 +38,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
showProjectPageQuickServerButton: false,
newProjectGeneralSettings: false,
newProjectEnvironmentSettings: true,
+ archonSentryCapture: false,
hideRussiaCensorshipBanner: false,
disablePrettyProjectUrlRedirects: false,
hidePreviewBanner: false,
diff --git a/apps/frontend/src/helpers/api.ts b/apps/frontend/src/helpers/api.ts
index 5b49bcf3c3..1434fe144f 100644
--- a/apps/frontend/src/helpers/api.ts
+++ b/apps/frontend/src/helpers/api.ts
@@ -13,6 +13,8 @@ import {
} from '@modrinth/api-client'
import type { Ref } from 'vue'
+import { useFeatureFlags } from '~/composables/featureFlags.ts'
+
async function getRateLimitKeyFromSecretsStore(): Promise {
try {
const mod = 'cloudflare:workers'
@@ -28,6 +30,7 @@ export function createModrinthClient(
auth: Ref<{ token: string | undefined }>,
config: { apiBaseUrl: string; archonBaseUrl: string; rateLimitKey?: string },
): NuxtModrinthClient {
+ const flags = useFeatureFlags()
const optionalFeatures = [
import.meta.dev ? (new VerboseLoggingFeature() as AbstractFeature) : undefined,
].filter(Boolean) as AbstractFeature[]
@@ -35,6 +38,7 @@ export function createModrinthClient(
const clientConfig: NuxtClientConfig = {
labrinthBaseUrl: config.apiBaseUrl,
archonBaseUrl: config.archonBaseUrl,
+ archonSentryCapture: () => flags.value.archonSentryCapture,
rateLimitKey: config.rateLimitKey || getRateLimitKeyFromSecretsStore,
features: [
// for modrinth hosting
diff --git a/packages/api-client/src/core/abstract-client.ts b/packages/api-client/src/core/abstract-client.ts
index 42429d3ae3..8ab7fee256 100644
--- a/packages/api-client/src/core/abstract-client.ts
+++ b/packages/api-client/src/core/abstract-client.ts
@@ -126,6 +126,7 @@ export abstract class AbstractModrinthClient extends AbstractUploadClient {
...options.headers,
},
}
+ this.attachArchonSentryCaptureHeader(mergedOptions)
const headers = mergedOptions.headers
if (headers && 'Content-Type' in headers && headers['Content-Type'] === '') {
@@ -309,6 +310,21 @@ export abstract class AbstractModrinthClient extends AbstractUploadClient {
return headers
}
+ protected attachArchonSentryCaptureHeader(options: RequestOptions): void {
+ if (options.api !== 'archon' || !options.headers || !this.shouldCaptureArchonRequests()) {
+ return
+ }
+
+ options.headers['modrinth-sentry-capture'] = '1'
+ }
+
+ private shouldCaptureArchonRequests(): boolean {
+ const archonSentryCapture = this.config.archonSentryCapture
+ return typeof archonSentryCapture === 'function'
+ ? archonSentryCapture()
+ : archonSentryCapture === true
+ }
+
/**
* Execute the actual HTTP request
*
diff --git a/packages/api-client/src/platform/xhr-upload-client.ts b/packages/api-client/src/platform/xhr-upload-client.ts
index de7dd9c233..c47b4c342f 100644
--- a/packages/api-client/src/platform/xhr-upload-client.ts
+++ b/packages/api-client/src/platform/xhr-upload-client.ts
@@ -46,6 +46,7 @@ export abstract class XHRUploadClient extends AbstractModrinthClient {
...options.headers,
},
}
+ this.attachArchonSentryCaptureHeader(mergedOptions)
const context = this.buildUploadContext(url, path, mergedOptions)
diff --git a/packages/api-client/src/types/client.ts b/packages/api-client/src/types/client.ts
index fa9d20a31c..5196f2209a 100644
--- a/packages/api-client/src/types/client.ts
+++ b/packages/api-client/src/types/client.ts
@@ -55,6 +55,14 @@ export interface ClientConfig {
*/
headers?: Record
+ /**
+ * Whether to attach `modrinth-sentry-capture: 1` to Archon requests.
+ * Can be a callback so apps can drive this from runtime feature flags.
+ *
+ * @default false
+ */
+ archonSentryCapture?: boolean | (() => boolean)
+
/**
* Features to enable for this client
* Features are applied in the order they appear in this array
From da48a12551fcbebb2febb88e378adedcabefc39b Mon Sep 17 00:00:00 2001
From: aecsocket
Date: Thu, 26 Mar 2026 06:34:20 +0000
Subject: [PATCH 24/45] Only mark servers as offline if they fail pings 3+
times (#5664)
* wip: online status fix
* use INCR
* properly clear cache
---
...5aabf13190a0b336089e6521022069813cf17.json | 5 +-
...dada47fb382a76fdcabad2077fb1ef6d1010a.json | 5 +-
...ba49f4963315fd7667c6db96e6153e54a2fd2.json | 3 +-
...de1e7cddd68ac956143bef994104280a8dc07.json | 3 +-
apps/labrinth/CLAUDE.md | 2 +-
apps/labrinth/src/database/redis/mod.rs | 14 ++++
apps/labrinth/src/env.rs | 1 +
apps/labrinth/src/queue/server_ping.rs | 75 ++++++++++++++-----
8 files changed, 83 insertions(+), 25 deletions(-)
diff --git a/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json b/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json
index 53cf350301..ed3215a695 100644
--- a/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json
+++ b/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json
@@ -29,7 +29,8 @@
"low",
"medium",
"high",
- "severe"
+ "severe",
+ "malware"
]
}
}
@@ -45,7 +46,7 @@
false,
true,
false,
- false
+ true
]
},
"hash": "10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17"
diff --git a/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json b/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json
index 23c13cd169..a854453595 100644
--- a/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json
+++ b/apps/labrinth/.sqlx/query-263ad3654f544ffb6061c839d49dada47fb382a76fdcabad2077fb1ef6d1010a.json
@@ -44,7 +44,8 @@
"low",
"medium",
"high",
- "severe"
+ "severe",
+ "malware"
]
}
}
@@ -79,7 +80,7 @@
true,
false,
false,
- false,
+ true,
null
]
},
diff --git a/apps/labrinth/.sqlx/query-9369f0659c5fbd08463923a9b2bba49f4963315fd7667c6db96e6153e54a2fd2.json b/apps/labrinth/.sqlx/query-9369f0659c5fbd08463923a9b2bba49f4963315fd7667c6db96e6153e54a2fd2.json
index 8ca4b69491..419c0ff25c 100644
--- a/apps/labrinth/.sqlx/query-9369f0659c5fbd08463923a9b2bba49f4963315fd7667c6db96e6153e54a2fd2.json
+++ b/apps/labrinth/.sqlx/query-9369f0659c5fbd08463923a9b2bba49f4963315fd7667c6db96e6153e54a2fd2.json
@@ -25,7 +25,8 @@
"low",
"medium",
"high",
- "severe"
+ "severe",
+ "malware"
]
}
}
diff --git a/apps/labrinth/.sqlx/query-f2054ae7dcc89b21ed6b2f04526de1e7cddd68ac956143bef994104280a8dc07.json b/apps/labrinth/.sqlx/query-f2054ae7dcc89b21ed6b2f04526de1e7cddd68ac956143bef994104280a8dc07.json
index 8cbe94abd5..c20c8ecdab 100644
--- a/apps/labrinth/.sqlx/query-f2054ae7dcc89b21ed6b2f04526de1e7cddd68ac956143bef994104280a8dc07.json
+++ b/apps/labrinth/.sqlx/query-f2054ae7dcc89b21ed6b2f04526de1e7cddd68ac956143bef994104280a8dc07.json
@@ -22,7 +22,8 @@
"low",
"medium",
"high",
- "severe"
+ "severe",
+ "malware"
]
}
}
diff --git a/apps/labrinth/CLAUDE.md b/apps/labrinth/CLAUDE.md
index 2d496b028d..fe4b705308 100644
--- a/apps/labrinth/CLAUDE.md
+++ b/apps/labrinth/CLAUDE.md
@@ -8,7 +8,7 @@ When the user refers to "perform[ing] pre-PR checks", do the following:
- Run `cargo clippy -p labrinth --all-targets` — there must be ZERO warnings, otherwise CI will fail
- DO NOT run tests unless explicitly requested (they take a long time)
-- Prepare the sqlx cache: cd into `apps/labrinth` and run `cargo sqlx prepare`
+- Prepare the sqlx cache: cd into `apps/labrinth` and run `cargo sqlx prepare -- --tests`
- NEVER run `cargo sqlx prepare --workspace`
## Testing
diff --git a/apps/labrinth/src/database/redis/mod.rs b/apps/labrinth/src/database/redis/mod.rs
index 1b8ac30c01..51e94cfb16 100644
--- a/apps/labrinth/src/database/redis/mod.rs
+++ b/apps/labrinth/src/database/redis/mod.rs
@@ -788,6 +788,20 @@ impl RedisConnection {
.await?;
Ok(values)
}
+
+ #[tracing::instrument(skip(self))]
+ pub async fn incr(
+ &mut self,
+ namespace: &str,
+ id: &str,
+ ) -> Result, DatabaseError> {
+ let key = format!("{}_{namespace}:{id}", self.meta_namespace);
+ let value = cmd("INCR")
+ .arg(key)
+ .query_async(&mut self.connection)
+ .await?;
+ Ok(value)
+ }
}
#[derive(Serialize, Deserialize)]
diff --git a/apps/labrinth/src/env.rs b/apps/labrinth/src/env.rs
index d275e2caee..ab5c6165b8 100644
--- a/apps/labrinth/src/env.rs
+++ b/apps/labrinth/src/env.rs
@@ -293,4 +293,5 @@ vars! {
SERVER_PING_RETRIES: usize = 3usize;
SERVER_PING_MIN_INTERVAL_SEC: u64 = 30u64 * 60;
SERVER_PING_TIMEOUT_MS: u64 = 3u64 * 1000;
+ SERVER_PING_MAX_FAIL_COUNT: u64 = 3u64;
}
diff --git a/apps/labrinth/src/queue/server_ping.rs b/apps/labrinth/src/queue/server_ping.rs
index c65ceb80ba..b53708290e 100644
--- a/apps/labrinth/src/queue/server_ping.rs
+++ b/apps/labrinth/src/queue/server_ping.rs
@@ -24,6 +24,7 @@ pub struct ServerPingQueue {
}
pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping";
+pub const REDIS_FAILURE_NAMESPACE: &str = "minecraft_java_server_ping_failures";
pub const CLICKHOUSE_TABLE: &str = "minecraft_java_server_pings";
impl ServerPingQueue {
@@ -118,27 +119,65 @@ impl ServerPingQueue {
.await
.wrap_err("failed to write ping record")?;
- redis
- .set_serialized_to_json(
- REDIS_NAMESPACE,
- project_id,
- ping,
+ let mut updated_project = false;
+ if data.is_some() {
+ // ping succeeded; immediately update its online status in redis
+
+ redis
+ .set_serialized_to_json(
+ REDIS_NAMESPACE,
+ project_id,
+ ping,
+ None,
+ )
+ .await
+ .wrap_err("failed to set redis key")?;
+ updated_project = true;
+
+ redis
+ .delete(REDIS_FAILURE_NAMESPACE, project_id)
+ .await
+ .wrap_err("failed to delete failure count")?;
+ } else {
+ // ping failed; if it's failed too many times, mark it as offline in redis
+ // otherwise, just add to the fail counter
+
+ let failure_count = redis
+ .incr(REDIS_FAILURE_NAMESPACE, &project_id.to_string())
+ .await
+ .wrap_err("failed to increment failure count")?;
+
+ if let Some(count) = failure_count
+ && count >= ENV.SERVER_PING_MAX_FAIL_COUNT
+ {
+ redis
+ .set_serialized_to_json(
+ REDIS_NAMESPACE,
+ project_id,
+ ping,
+ None,
+ )
+ .await
+ .wrap_err(
+ "failed to set failed ping record in redis",
+ )?;
+ updated_project = true;
+ }
+ }
+
+ if updated_project {
+ DBProject::clear_cache(
+ (*project_id).into(),
None,
+ None,
+ &self.redis,
)
.await
- .wrap_err("failed to set redis key")?;
-
- DBProject::clear_cache(
- (*project_id).into(),
- None,
- None,
- &self.redis,
- )
- .await
- .inspect_err(|err| {
- warn!("failed to clear project cache: {err:#}")
- })
- .ok();
+ .inspect_err(|err| {
+ warn!("failed to clear project cache: {err:#}")
+ })
+ .ok();
+ }
}
ch.end()
From 274325d97c6700c62e5bbc539e7985f45267e2cf Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 26 Mar 2026 00:21:19 -0700
Subject: [PATCH 25/45] fix: settings page error (#5668)
---
apps/frontend/src/pages/settings/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 5626d3d147..1591f1e318 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -196,10 +196,6 @@ import { isDarkTheme, type Theme } from '~/plugins/theme/index.ts'
const { addNotification } = injectNotificationManager()
const { formatMessage } = useVIntl()
-useHead({
- title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
-})
-
const messages = defineMessages({
headTitle: {
id: 'settings.head-title',
@@ -219,6 +215,10 @@ const developerModeBanner = defineMessages({
},
})
+useHead({
+ title: () => `${formatMessage(messages.headTitle)} - Modrinth`,
+})
+
const layoutMode = defineMessages({
rows: {
id: 'settings.display.project-list-layouts.mode.rows',
From 3c3cde19089ef1d05e368e0bf87b69c9b190d7cb Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 26 Mar 2026 00:22:40 -0700
Subject: [PATCH 26/45] changelog
---
packages/blog/changelog.ts | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 56b3b94557..be03c31b86 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,22 @@ export type VersionEntry = {
}
const VERSIONS: VersionEntry[] = [
+ {
+ date: `2026-03-26T07:22:22+00:00`,
+ product: 'web',
+ body: `## Fixed
+- Fixed error on settings page.
+- Fixed the "500 Server Error" error on the "Authorized apps" settings page.`,
+ },
+ {
+ date: `2026-03-26T07:22:22+00:00`,
+ product: 'hosting',
+ body: `## Fixed
+- Fixed wrong mod being disabled on hosted servers - Disabling a non-Modrinth mod could incorrectly disable a different mod instead
+- Fixed content list not refreshing after installing mods - Navigating back to the content tab after installing something from Browse would show stale data for up to 10 seconds
+- Fixed copying mod filenames inserting a newline - Copying a filename or version number from the content tab no longer includes a line break in the middle
+- Fixed NeoForge installs sending an empty loader version - Changing to NeoForge on a hosted server could send a blank loader version, resulting in a broken installation`,
+ },
{
date: `2026-03-24T21:14:30-08:00`,
product: 'hosting',
From f1648298c496dba2a5045777b62e4120fb66f41e Mon Sep 17 00:00:00 2001
From: "Calum H."
Date: Thu, 26 Mar 2026 17:53:27 +0000
Subject: [PATCH 27/45] fix: neoforge not existing for 26.1 breaking vers
picker (#5674)
* fix: neoforge for 26.1 -> other vers being picked not existing causing version picker to break
* fix: lint
---
.../components/CustomSetupStage.vue | 63 +++++++++++++++++--
1 file changed, 58 insertions(+), 5 deletions(-)
diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
index 9c256c6871..536b3057d8 100644
--- a/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
+++ b/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
@@ -254,6 +254,14 @@ async function fetchLoaderManifest(loader: string) {
let apiLoader = loader
if (apiLoader === 'neoforge') apiLoader = 'neo'
+ debug(
+ 'fetchLoaderManifest:',
+ loader,
+ 'apiLoader:',
+ apiLoader,
+ 'cached:',
+ !!loaderVersionsCache.value[apiLoader],
+ )
if (loaderVersionsCache.value[apiLoader]) return
try {
@@ -262,7 +270,9 @@ async function fetchLoaderManifest(loader: string) {
gameVersions: { id: string; loaders: LoaderVersionEntry[] }[]
}
loaderVersionsCache.value[apiLoader] = data.gameVersions
- } catch {
+ debug('fetchLoaderManifest: loaded', apiLoader, 'gameVersions:', data.gameVersions.length)
+ } catch (e) {
+ debug('fetchLoaderManifest: FAILED', apiLoader, e)
loaderVersionsCache.value[apiLoader] = []
}
}
@@ -319,13 +329,32 @@ function getLoaderVersionsForGameVersion(
if (apiLoader === 'neoforge') apiLoader = 'neo'
const manifest = loaderVersionsCache.value[apiLoader]
+ debug('getLoaderVersionsForGameVersion:', {
+ loader,
+ apiLoader,
+ gameVersion,
+ hasManifest: !!manifest,
+ manifestLength: manifest?.length,
+ })
if (!manifest) return []
// Some loaders (e.g. Fabric) list all versions under a placeholder entry
const placeholder = manifest.find((x) => x.id === '${modrinth.gameVersion}')
- if (placeholder) return placeholder.loaders
+ if (placeholder) {
+ debug(
+ 'getLoaderVersionsForGameVersion: using placeholder, loaders:',
+ placeholder.loaders.length,
+ )
+ return placeholder.loaders
+ }
const entry = manifest.find((x) => x.id === gameVersion)
+ debug(
+ 'getLoaderVersionsForGameVersion: entry for',
+ gameVersion,
+ ':',
+ entry ? entry.loaders.length + ' loaders' : 'NOT FOUND',
+ )
return entry?.loaders ?? []
}
@@ -348,9 +377,12 @@ watch(
)
// Watch loader + game version to resolve loader versions
+let loaderVersionWatchId = 0
watch(
[() => selectedLoader.value, () => selectedGameVersion.value],
async ([loader, gameVersion]) => {
+ const watchId = ++loaderVersionWatchId
+ debug('watch [loader, gameVersion] fired:', { loader, gameVersion, watchId })
loaderVersionsData.value = []
selectedLoaderVersion.value = null
@@ -360,8 +392,8 @@ watch(
if (loader === 'paper') {
await fetchPaperVersions(gameVersion)
+ if (watchId !== loaderVersionWatchId) return
loaderVersionsLoading.value = false
- // Auto-select latest build
const builds = paperVersions.value[gameVersion]
if (builds?.length) {
selectedLoaderVersion.value = `${builds[0]}`
@@ -371,8 +403,8 @@ watch(
if (loader === 'purpur') {
await fetchPurpurVersions(gameVersion)
+ if (watchId !== loaderVersionWatchId) return
loaderVersionsLoading.value = false
- // Auto-select latest build
const builds = purpurVersions.value[gameVersion]
if (builds?.length) {
selectedLoaderVersion.value = builds[0]
@@ -381,7 +413,18 @@ watch(
}
await fetchLoaderManifest(loader)
+ if (watchId !== loaderVersionWatchId) {
+ debug('watch [loader, gameVersion]: stale execution, skipping', {
+ watchId,
+ current: loaderVersionWatchId,
+ })
+ return
+ }
loaderVersionsData.value = getLoaderVersionsForGameVersion(loader, gameVersion)
+ debug(
+ 'watch [loader, gameVersion]: loaderVersionsData set, count:',
+ loaderVersionsData.value.length,
+ )
loaderVersionsLoading.value = false
// Auto-select based on loaderVersionType
@@ -395,6 +438,16 @@ watch(
)
function autoSelectLoaderVersion() {
+ debug(
+ 'autoSelectLoaderVersion: type:',
+ loaderVersionType.value,
+ 'dataCount:',
+ loaderVersionsData.value.length,
+ 'stableCount:',
+ loaderVersionsData.value.filter((v) => v.stable).length,
+ 'first:',
+ loaderVersionsData.value[0]?.id,
+ )
if (loaderVersionType.value === 'stable') {
const stable = loaderVersionsData.value.find((v) => v.stable)
selectedLoaderVersion.value = stable?.id ?? loaderVersionsData.value[0]?.id ?? null
@@ -403,7 +456,7 @@ function autoSelectLoaderVersion() {
} else if (loaderVersionType.value === 'other' && !selectedLoaderVersion.value) {
selectedLoaderVersion.value = loaderVersionsData.value[0]?.id ?? null
}
- debug('autoSelectLoaderVersion:', selectedLoaderVersion.value, 'type:', loaderVersionType.value)
+ debug('autoSelectLoaderVersion: result:', selectedLoaderVersion.value)
}
const loaderVersionOptions = computed[]>(() => {
From 706eb800cb56916ac0a2ac8da96ef0290e65f6f6 Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Thu, 26 Mar 2026 11:40:44 -0700
Subject: [PATCH 28/45] fix: website visual issues (#5675)
* fix no modpack loader showing as resource pack loader
* fix table overflow, add game version tags "+ {num}" overflow menu
* pnpm prepr
---
apps/app-frontend/src/pages/project/Index.vue | 2 +-
apps/frontend/src/pages/[type]/[id].vue | 2 +-
.../pages/[type]/[id]/version/[version].vue | 22 +++-
.../api-client/src/modules/labrinth/types.ts | 1 +
.../project/ProjectPageVersions.vue | 120 +++++++++++++++---
.../project/ProjectSidebarCompatibility.vue | 41 ++++--
6 files changed, 154 insertions(+), 34 deletions(-)
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 60548fd667..76ddd966ae 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -5,7 +5,7 @@
v-if="!isServerProject"
:project="data"
:tags="{ loaders: allLoaders, gameVersions: allGameVersions }"
- :v3-metadata="projectV3"
+ :project-v3="projectV3"
class="project-sidebar-section"
/>
(() => {
+ if (project.value.project_type !== 'modpack') {
+ return []
+ }
+
+ if (Array.isArray(version.value.mrpack_loaders) && version.value.mrpack_loaders.length > 0) {
+ return version.value.mrpack_loaders
+ }
+
+ return (version.value.loaders ?? []).filter((loader: string) => loader !== 'mrpack')
+})
+
+const noModpackLoader = computed(
+ () =>
+ project.value.project_type === 'modpack' &&
+ modpackLoaders.value.length === 1 &&
+ modpackLoaders.value[0] === 'minecraft',
+)
+
const description = computed(
() =>
`Download ${project.value.title} ${
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 71ce707acb..2426d700d9 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -593,6 +593,7 @@ export namespace Labrinth {
categories: string[]
additional_categories: string[]
loaders: string[]
+ mrpack_loaders: string[]
versions: string[]
icon_url?: string
link_urls: Record
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 6417f2ed90..30ef621f8d 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -3,7 +3,7 @@
@@ -233,6 +278,7 @@ import {
type GameVersionTag,
type Version,
} from '@modrinth/utils'
+import { Menu } from 'floating-vue'
import { computed, type Ref, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
@@ -251,6 +297,11 @@ const formatDateTime = useFormatDateTime({
type VersionWithDisplayUrlEnding = Version & {
displayUrlEnding: string
environment?: Labrinth.Projects.v3.Environment
+ mrpack_loaders?: string[]
+}
+
+type DisplayVersion = VersionWithDisplayUrlEnding & {
+ noModLoader: boolean
}
const props = withDefaults(
@@ -278,6 +329,39 @@ const props = withDefaults(
},
)
+function getModpackLoaders(version: VersionWithDisplayUrlEnding): string[] {
+ if (props.project.project_type !== 'modpack') {
+ return version.loaders
+ }
+
+ if (version.mrpack_loaders?.length) {
+ return version.mrpack_loaders
+ }
+
+ return version.loaders.filter((loader) => loader !== 'mrpack')
+}
+
+function hasNoModLoader(loaders: string[]): boolean {
+ return (
+ props.project.project_type === 'modpack' && loaders.length === 1 && loaders[0] === 'minecraft'
+ )
+}
+
+const normalizedVersions = computed(() =>
+ props.versions.map((version) => {
+ const loaders = getModpackLoaders(version)
+ const noModLoader = hasNoModLoader(loaders)
+
+ return {
+ ...version,
+ loaders: noModLoader ? [] : loaders,
+ noModLoader,
+ }
+ }),
+)
+
+const maxGameVersionTags = 6
+
const currentPage: Ref = ref(1)
const pageSize: Ref = ref(20)
const versionFilters: Ref | null> = ref(null)
@@ -296,7 +380,7 @@ const hasMultipleEnvironments = computed(() => {
})
const filteredVersions = computed(() => {
- return props.versions.filter(
+ return normalizedVersions.value.filter(
(version) =>
hasAnySelected(version.game_versions, selectedGameVersions.value) &&
hasAnySelected(version.loaders, selectedPlatforms.value) &&
diff --git a/packages/ui/src/components/project/ProjectSidebarCompatibility.vue b/packages/ui/src/components/project/ProjectSidebarCompatibility.vue
index 9a544d03f5..ca4396c0ba 100644
--- a/packages/ui/src/components/project/ProjectSidebarCompatibility.vue
+++ b/packages/ui/src/components/project/ProjectSidebarCompatibility.vue
@@ -15,15 +15,22 @@
@@ -85,6 +92,7 @@
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
index f8d4052209..bcac05a6a7 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -30,19 +30,19 @@ const deleteConfirmModal = ref()
const { instance } = injectInstanceSettings()
-const title = ref(instance.name)
-const icon: Ref = ref(instance.icon_path)
-const groups = ref(instance.groups)
+const title = ref(instance.value.name)
+const icon: Ref = ref(instance.value.icon_path)
+const groups = ref([...instance.value.groups])
const newCategoryInput = ref('')
-const installing = computed(() => instance.install_stage !== 'installed')
+const installing = computed(() => instance.value.install_stage !== 'installed')
async function duplicateProfile() {
- await duplicate(instance.path).catch(handleError)
+ await duplicate(instance.value.path).catch(handleError)
trackEvent('InstanceDuplicate', {
- loader: instance.loader,
- game_version: instance.game_version,
+ loader: instance.value.loader,
+ game_version: instance.value.game_version,
})
}
@@ -53,7 +53,7 @@ const availableGroups = computed(() => [
async function resetIcon() {
icon.value = undefined
- await edit_icon(instance.path, null).catch(handleError)
+ await edit_icon(instance.value.path, null).catch(handleError)
trackEvent('InstanceRemoveIcon')
}
@@ -71,7 +71,7 @@ async function setIcon() {
if (!value) return
icon.value = value
- await edit_icon(instance.path, icon.value).catch(handleError)
+ await edit_icon(instance.value.path, icon.value).catch(handleError)
trackEvent('InstanceSetIcon')
}
@@ -102,7 +102,7 @@ watch(
[title, groups, groups],
async () => {
if (removing.value) return
- await edit(instance.path, editProfileObject.value).catch(handleError)
+ await edit(instance.value.path, editProfileObject.value).catch(handleError)
},
{ deep: true },
)
@@ -110,11 +110,11 @@ watch(
const removing = ref(false)
async function removeProfile() {
removing.value = true
- const path = instance.path
+ const path = instance.value.path
trackEvent('InstanceRemove', {
- loader: instance.loader,
- game_version: instance.game_version,
+ loader: instance.value.loader,
+ game_version: instance.value.game_version,
})
await router.push({ path: '/' })
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
index 3061ea7fc6..ae576b6fce 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -22,9 +22,11 @@ const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as AppSettings
const overrideHooks = ref(
- !!instance.hooks.pre_launch || !!instance.hooks.wrapper || !!instance.hooks.post_exit,
+ !!instance.value.hooks.pre_launch ||
+ !!instance.value.hooks.wrapper ||
+ !!instance.value.hooks.post_exit,
)
-const hooks = ref(instance.hooks ?? globalSettings.hooks)
+const hooks = ref(instance.value.hooks ?? globalSettings.hooks)
const editProfileObject = computed(() => {
const editProfile: {
@@ -40,7 +42,7 @@ const editProfileObject = computed(() => {
watch(
[overrideHooks, hooks],
async () => {
- await edit(instance.path, editProfileObject.value)
+ await edit(instance.value.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index 2aa0201b0b..3ef0be1651 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -73,9 +73,9 @@ const [
])
const { data: modpackInfo } = useQuery({
- queryKey: computed(() => ['linkedModpackInfo', instance.path]),
- queryFn: () => get_linked_modpack_info(instance.path, 'must_revalidate'),
- enabled: computed(() => !!instance.linked_data?.project_id && !offline),
+ queryKey: computed(() => ['linkedModpackInfo', instance.value.path]),
+ queryFn: () => get_linked_modpack_info(instance.value.path, 'must_revalidate'),
+ enabled: computed(() => !!instance.value.linked_data?.project_id && !offline),
})
const repairing = ref(false)
@@ -101,13 +101,13 @@ function getManifest(loader: string) {
provideAppBackup({
async createBackup() {
const allProfiles = await list()
- const prefix = `${instance.name} - Backup #`
+ const prefix = `${instance.value.name} - Backup #`
const existingNums = allProfiles
.filter((p) => p.name.startsWith(prefix))
.map((p) => parseInt(p.name.slice(prefix.length), 10))
.filter((n) => !isNaN(n))
const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
- const newPath = await duplicate(instance.path)
+ const newPath = await duplicate(instance.value.path)
await edit(newPath, { name: `${prefix}${nextNum}` })
},
})
@@ -118,27 +118,30 @@ provideInstallationSettings({
const rows = [
{
label: formatMessage(commonMessages.platformLabel),
- value: formatLoaderLabel(instance.loader),
+ value: formatLoaderLabel(instance.value.loader),
},
{
label: formatMessage(commonMessages.gameVersionLabel),
- value: instance.game_version,
+ value: instance.value.game_version,
},
]
- if (instance.loader !== 'vanilla' && instance.loader_version) {
+ if (instance.value.loader !== 'vanilla' && instance.value.loader_version) {
rows.push({
label: formatMessage(messages.loaderVersion, {
- loader: formatLoaderLabel(instance.loader),
+ loader: formatLoaderLabel(instance.value.loader),
}),
- value: instance.loader_version,
+ value: instance.value.loader_version,
})
}
return rows
}),
- isLinked: computed(() => !!instance.linked_data?.locked),
+ isLinked: computed(() => !!instance.value.linked_data?.locked),
isBusy: computed(
() =>
- instance.install_stage !== 'installed' || repairing.value || reinstalling.value || !!offline,
+ instance.value.install_stage !== 'installed' ||
+ repairing.value ||
+ reinstalling.value ||
+ !!offline,
),
modpack: computed(() => {
if (!modpackInfo.value) return null
@@ -149,9 +152,9 @@ provideInstallationSettings({
versionNumber: modpackInfo.value.version?.version_number,
}
}),
- currentPlatform: computed(() => instance.loader),
- currentGameVersion: computed(() => instance.game_version),
- currentLoaderVersion: computed(() => instance.loader_version ?? ''),
+ currentPlatform: computed(() => instance.value.loader),
+ currentGameVersion: computed(() => instance.value.game_version),
+ currentLoaderVersion: computed(() => instance.value.loader_version ?? ''),
availablePlatforms: loaders?.value?.map((x) => x.name) ?? [],
resolveGameVersions(loader, showSnapshots) {
@@ -194,50 +197,50 @@ provideInstallationSettings({
if (platform !== 'vanilla' && loaderVersionId) {
editProfile.loader_version = loaderVersionId
}
- await edit(instance.path, editProfile).catch(handleError)
+ await edit(instance.value.path, editProfile).catch(handleError)
},
afterSave: async () => {
- await install(instance.path, false).catch(handleError)
+ await install(instance.value.path, false).catch(handleError)
trackEvent('InstanceRepair', {
- loader: instance.loader,
- game_version: instance.game_version,
+ loader: instance.value.loader,
+ game_version: instance.value.game_version,
})
},
async repair() {
repairing.value = true
- await install(instance.path, true).catch(handleError)
+ await install(instance.value.path, true).catch(handleError)
repairing.value = false
trackEvent('InstanceRepair', {
- loader: instance.loader,
- game_version: instance.game_version,
+ loader: instance.value.loader,
+ game_version: instance.value.game_version,
})
},
async reinstallModpack() {
reinstalling.value = true
- await update_repair_modrinth(instance.path).catch(handleError)
+ await update_repair_modrinth(instance.value.path).catch(handleError)
reinstalling.value = false
trackEvent('InstanceRepair', {
- loader: instance.loader,
- game_version: instance.game_version,
+ loader: instance.value.loader,
+ game_version: instance.value.game_version,
})
},
async unlinkModpack() {
- await edit(instance.path, {
+ await edit(instance.value.path, {
linked_data: null as unknown as undefined,
})
await queryClient.invalidateQueries({
- queryKey: ['linkedModpackInfo', instance.path],
+ queryKey: ['linkedModpackInfo', instance.value.path],
})
onUnlinked()
},
getCachedModpackVersions: () => null,
async fetchModpackVersions() {
- const versions = await get_project_versions(instance.linked_data!.project_id!).catch(
+ const versions = await get_project_versions(instance.value.linked_data!.project_id!).catch(
handleError,
)
return (versions ?? []) as Labrinth.Versions.v2.Version[]
@@ -250,20 +253,20 @@ provideInstallationSettings({
},
async onModpackVersionConfirm(version) {
- await update_managed_modrinth_version(instance.path, version.id)
+ await update_managed_modrinth_version(instance.value.path, version.id)
await queryClient.invalidateQueries({
- queryKey: ['linkedModpackInfo', instance.path],
+ queryKey: ['linkedModpackInfo', instance.value.path],
})
},
updaterModalProps: computed(() => ({
isApp: true,
currentVersionId:
- modpackInfo.value?.update_version_id ?? instance.linked_data?.version_id ?? '',
+ modpackInfo.value?.update_version_id ?? instance.value.linked_data?.version_id ?? '',
projectIconUrl: modpackInfo.value?.project?.icon_url,
projectName: modpackInfo.value?.project?.title ?? 'Modpack',
- currentGameVersion: instance.game_version,
- currentLoader: instance.loader,
+ currentGameVersion: instance.value.game_version,
+ currentLoader: instance.value.loader,
})),
isServer: false,
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index 39efa5fb1f..0649621d1b 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -25,20 +25,24 @@ const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
-const overrideJavaInstall = ref(!!instance.java_path)
-const optimalJava = readonly(await get_optimal_jre_key(instance.path).catch(handleError))
-const javaInstall = ref({ path: optimalJava.path ?? instance.java_path })
+const overrideJavaInstall = ref(!!instance.value.java_path)
+const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))
+const javaInstall = ref({ path: optimalJava.path ?? instance.value.java_path })
-const overrideJavaArgs = ref((instance.extra_launch_args?.length ?? 0) > 0)
-const javaArgs = ref((instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '))
-
-const overrideEnvVars = ref((instance.custom_env_vars?.length ?? 0) > 0)
-const envVars = ref(
- (instance.custom_env_vars ?? globalSettings.custom_env_vars).map((x) => x.join('=')).join(' '),
+const overrideJavaArgs = ref((instance.value.extra_launch_args?.length ?? 0) > 0)
+const javaArgs = ref(
+ (instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
)
-const overrideMemorySettings = ref(!!instance.memory)
-const memory = ref(instance.memory ?? globalSettings.memory)
+const overrideEnvVars = ref((instance.value.custom_env_vars?.length ?? 0) > 0)
+const envVars = ref(
+ (instance.value.custom_env_vars ?? globalSettings.custom_env_vars)
+ .map((x) => x.join('='))
+ .join(' '),
+)
+
+const overrideMemorySettings = ref(!!instance.value.memory)
+const memory = ref(instance.value.memory ?? globalSettings.memory)
const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
maxMemory: number
snapPoints: number[]
@@ -76,7 +80,7 @@ watch(
memory,
],
async () => {
- await edit(instance.path, editProfileObject.value)
+ await edit(instance.value.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
index 342c820ccc..f5ba69568a 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -22,12 +22,14 @@ const { instance } = injectInstanceSettings()
const globalSettings = (await get().catch(handleError)) as AppSettings
-const overrideWindowSettings = ref(!!instance.game_resolution || !!instance.force_fullscreen)
+const overrideWindowSettings = ref(
+ !!instance.value.game_resolution || !!instance.value.force_fullscreen,
+)
const resolution: Ref<[number, number]> = ref(
- instance.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
+ instance.value.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
)
const fullscreenSetting: Ref = ref(
- instance.force_fullscreen ?? globalSettings.force_fullscreen,
+ instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
)
const editProfileObject = computed(() => {
@@ -46,7 +48,7 @@ const editProfileObject = computed(() => {
watch(
[overrideWindowSettings, resolution, fullscreenSetting],
async () => {
- await edit(instance.path, editProfileObject.value)
+ await edit(instance.value.path, editProfileObject.value)
},
{ deep: true },
)
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
index b866f2e02e..76532a30c5 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -44,8 +44,10 @@ const emit = defineEmits<{
const isMinecraftServer = ref(false)
const handleUnlinked = () => emit('unlinked')
+const instanceRef = computed(() => props.instance)
+
provideInstanceSettings({
- instance: props.instance,
+ instance: instanceRef,
offline: props.offline,
isMinecraftServer,
onUnlinked: handleUnlinked,
diff --git a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
index 6b16e80229..daf238793f 100644
--- a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
@@ -1,21 +1,31 @@
-
- {{ formatMessage(messages.admonitionBody, { instanceName }) }}
-
+
-
+
+
@@ -24,8 +34,15 @@
@@ -243,13 +259,17 @@ const messages = defineMessages({
>
- Loading...
+ {{ formatMessage(commonMessages.loadingLabel) }}
- Incompatible version {{ serverStatus.version?.name }}
+ {{
+ formatMessage(messages.incompatibleVersion, {
+ version: serverStatus.version?.name,
+ })
+ }}
@@ -265,8 +285,11 @@ const messages = defineMessages({
/>
- {{ formatNumber(serverStatus.players?.online) }}
- online
+ {{
+ formatMessage(messages.playersOnline, {
+ count: formatNumber(serverStatus.players?.online ?? 0),
+ })
+ }}
@@ -299,7 +322,7 @@ const messages = defineMessages({
})
}}
- Not played yet
+ {{ formatMessage(messages.notPlayedYet) }}
Loaders
-Game versions
@@ -698,6 +699,25 @@ const title = computed( () => `${isCreating.value ? 'Create Version' : version.value.name} - ${project.value.title}`, ) +const modpackLoaders = computed
-
{{ version.version_number }}
- {{ version.name }}
+
+ {{ version.version_number }}
+
+
+ {{ version.name }}
+
@@ -127,7 +132,7 @@
v-for="gameVersion in formatVersionsForDisplay(
version.game_versions,
gameVersions,
- )"
+ ).slice(0, maxGameVersionTags)"
:key="`version-tag-${gameVersion}`"
v-tooltip="`Toggle filter for ${gameVersion}`"
class="z-[1]"
@@ -137,21 +142,61 @@
>
{{ gameVersion }}
+
-
-
+
+
+ No mod loader
+
+
+
+
+
+
@@ -162,7 +207,7 @@
class="z-[1] text-center"
>
{{ formatMessage(messages.platforms) }}
-
-
+
+
+ No mod loader
+
+
+
+
+
+
+
@@ -280,7 +303,7 @@ const messages = defineMessages({
- Offline
+ {{ formatMessage(messages.offline) }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
index 0991a2a263..d3977c2b26 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
@@ -5,11 +5,11 @@ import {
commonMessages,
defineMessage,
injectNotificationManager,
+ NewModal,
useVIntl,
} from '@modrinth/ui'
import { computed, ref } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
import type { GameInstance } from '@/helpers/types'
@@ -32,7 +32,7 @@ const props = defineProps<{
instance: GameInstance
}>()
-const modal = ref()
+const modal = ref
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
index 7d7479b5cf..d1603da948 100644
--- a/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
@@ -49,34 +49,40 @@ const messages = defineMessages({
id: 'instance.server-modal.placeholder-name',
defaultMessage: 'Minecraft Server',
},
+ placeholderAddress: {
+ id: 'app.world.server-modal.placeholder-address',
+ defaultMessage: 'example.modrinth.gg',
+ },
+ selectAnOption: {
+ id: 'app.world.server-modal.select-an-option',
+ defaultMessage: 'Select an option',
+ },
})
defineExpose({ resourcePackOptions })
-
- {
return await invoke('plugin:worlds|add_server_to_profile', {
path,
name,
address,
packStatus,
+ projectId,
+ contentKind,
})
}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 418f30d826..d33b0b5bd6 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -5,6 +5,39 @@
"app.auth-servers.unreachable.header": {
"message": "Cannot reach authentication servers"
},
+ "app.browse.add-server-to-instance": {
+ "message": "Add server to instance"
+ },
+ "app.browse.add-servers-to-instance": {
+ "message": "Add servers to your instance"
+ },
+ "app.browse.add-to-instance": {
+ "message": "Add to instance"
+ },
+ "app.browse.add-to-instance-name": {
+ "message": "Add to {instanceName}"
+ },
+ "app.browse.added": {
+ "message": "Added"
+ },
+ "app.browse.already-added": {
+ "message": "Already added"
+ },
+ "app.browse.discover-content": {
+ "message": "Discover content"
+ },
+ "app.browse.discover-servers": {
+ "message": "Discover servers"
+ },
+ "app.browse.hide-added-servers": {
+ "message": "Hide added servers"
+ },
+ "app.browse.hide-installed-content": {
+ "message": "Hide installed content"
+ },
+ "app.browse.install-content-to-instance": {
+ "message": "Install content to instance"
+ },
"app.export-modal.description-placeholder": {
"message": "Enter modpack description..."
},
@@ -41,33 +74,21 @@
"app.instance.confirm-delete.header": {
"message": "Delete instance"
},
- "app.instance.modpack-already-installed.admonition-body": {
- "message": "This modpack is already installed in the \"{instanceName}\" instance."
+ "app.instance.modpack-already-installed.body": {
+ "message": "This modpack is already installed in the {instanceName} instance. Are you sure you want to duplicate it?"
},
- "app.instance.modpack-already-installed.admonition-header": {
- "message": "Duplicate modpack"
- },
- "app.instance.modpack-already-installed.create-anyway": {
- "message": "Create anyway"
- },
- "app.instance.modpack-already-installed.go-to-instance": {
- "message": "Go to instance"
+ "app.instance.modpack-already-installed.create": {
+ "message": "Create"
},
"app.instance.modpack-already-installed.header": {
"message": "Modpack already installed"
},
+ "app.instance.modpack-already-installed.instance": {
+ "message": "Instance"
+ },
"app.instance.mods.content-type-project": {
"message": "project"
},
- "app.instance.mods.copy-link": {
- "message": "Copy link"
- },
- "app.instance.mods.installing": {
- "message": "Installing..."
- },
- "app.instance.mods.modpack-fallback": {
- "message": "Modpack"
- },
"app.instance.mods.project-was-added": {
"message": "\"{name}\" was added"
},
@@ -80,17 +101,53 @@
"app.instance.mods.share-title": {
"message": "Sharing modpack content"
},
- "app.instance.mods.show-file": {
- "message": "Show file"
- },
"app.instance.mods.successfully-uploaded": {
"message": "Successfully uploaded"
},
- "app.instance.mods.unknown-version": {
- "message": "Unknown"
+ "app.instance.worlds.add-server": {
+ "message": "Add server"
},
- "app.instance.mods.updating": {
- "message": "Updating..."
+ "app.instance.worlds.browse-servers": {
+ "message": "Browse servers"
+ },
+ "app.instance.worlds.delete-world-description": {
+ "message": "'{name}' will be **permanently deleted**, and there will be no way to recover it."
+ },
+ "app.instance.worlds.delete-world-title": {
+ "message": "Are you sure you want to permanently delete this world?"
+ },
+ "app.instance.worlds.filter-modded": {
+ "message": "Modded"
+ },
+ "app.instance.worlds.filter-offline": {
+ "message": "Offline"
+ },
+ "app.instance.worlds.filter-online": {
+ "message": "Online"
+ },
+ "app.instance.worlds.filter-vanilla": {
+ "message": "Vanilla"
+ },
+ "app.instance.worlds.no-worlds-description": {
+ "message": "Add a server or browse to get started"
+ },
+ "app.instance.worlds.no-worlds-heading": {
+ "message": "No servers or worlds added"
+ },
+ "app.instance.worlds.remove-server-description": {
+ "message": "'{name}' will be removed from your list, including in-game, and there will be no way to recover it."
+ },
+ "app.instance.worlds.remove-server-description-with-address": {
+ "message": "'{name}' ({address}) will be removed from your list, including in-game, and there will be no way to recover it."
+ },
+ "app.instance.worlds.remove-server-title": {
+ "message": "Are you sure you want to remove {name}?"
+ },
+ "app.instance.worlds.search-worlds-placeholder": {
+ "message": "Search {count} worlds..."
+ },
+ "app.instance.worlds.this-server": {
+ "message": "this server"
},
"app.modal.install-to-play.content-required": {
"message": "Content required"
@@ -197,6 +254,24 @@
"app.update.reload-to-update": {
"message": "Reload to install update"
},
+ "app.world.server-modal.placeholder-address": {
+ "message": "example.modrinth.gg"
+ },
+ "app.world.server-modal.select-an-option": {
+ "message": "Select an option"
+ },
+ "app.world.world-item.incompatible-version": {
+ "message": "Incompatible version {version}"
+ },
+ "app.world.world-item.not-played-yet": {
+ "message": "Not played yet"
+ },
+ "app.world.world-item.offline": {
+ "message": "Offline"
+ },
+ "app.world.world-item.players-online": {
+ "message": "{count} online"
+ },
"friends.action.add-friend": {
"message": "Add a friend"
},
@@ -296,6 +371,12 @@
"instance.edit-world.title": {
"message": "Edit world"
},
+ "instance.files.adding-files": {
+ "message": "Adding files ({completed}/{total})"
+ },
+ "instance.files.save-as": {
+ "message": "Save as..."
+ },
"instance.server-modal.address": {
"message": "Address"
},
@@ -467,9 +548,6 @@
"instance.worlds.dont_show_on_home": {
"message": "Don't show on Home"
},
- "instance.worlds.filter.available": {
- "message": "Available"
- },
"instance.worlds.game_already_open": {
"message": "Instance is already open"
},
@@ -494,12 +572,6 @@
"instance.worlds.play_instance": {
"message": "Play instance"
},
- "instance.worlds.type.server": {
- "message": "Server"
- },
- "instance.worlds.type.singleplayer": {
- "message": "Singleplayer"
- },
"instance.worlds.view_instance": {
"message": "View instance"
},
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index ce2f8502e5..f7ec4dcef4 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -1,6 +1,7 @@
+
+
+
Never played
-
-
-
-
diff --git a/packages/ui/src/components/servers/backups/BackupItem.vue b/packages/ui/src/components/servers/backups/BackupItem.vue
index cecf43e10c..ae4e25e720 100644
--- a/packages/ui/src/components/servers/backups/BackupItem.vue
+++ b/packages/ui/src/components/servers/backups/BackupItem.vue
@@ -154,7 +154,11 @@ const messages = defineMessages({
- {{ formatMessage(messages.name) }} -
-- {{ formatMessage(messages.address) }} -
-- {{ formatMessage(messages.resourcePack) }} -
-
+
diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
index 0ddcaa62fa..fd25b945a2 100644
--- a/apps/app-frontend/src/helpers/worlds.ts
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -30,6 +30,8 @@ export type ServerWorld = BaseWorld & {
index: number
address: string
pack_status: ServerPackStatus
+ project_id?: string
+ content_kind?: string
}
export type World = SingleplayerWorld | ServerWorld
@@ -140,12 +142,16 @@ export async function add_server_to_profile(
name: string,
address: string,
packStatus: ServerPackStatus,
+ projectId?: string,
+ contentKind?: string,
): Promise
+
+
+
+
- Linked to
-
- {{ linkedProjectV3.name }}
-
-
@@ -285,6 +265,7 @@
diff --git a/apps/app-frontend/src/pages/instance/index.js b/apps/app-frontend/src/pages/instance/index.js
index be2167e6bc..b96705e883 100644
--- a/apps/app-frontend/src/pages/instance/index.js
+++ b/apps/app-frontend/src/pages/instance/index.js
@@ -1,7 +1,8 @@
+import Files from './Files.vue'
import Index from './Index.vue'
import Logs from './Logs.vue'
import Mods from './Mods.vue'
import Overview from './Overview.vue'
import Worlds from './Worlds.vue'
-export { Index, Logs, Mods, Overview, Worlds }
+export { Files, Index, Logs, Mods, Overview, Worlds }
diff --git a/apps/app-frontend/src/pages/library/Index.vue b/apps/app-frontend/src/pages/library/Index.vue
index 46f039827a..327ab44d90 100644
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -1,11 +1,10 @@
+
@@ -319,12 +320,14 @@ import { MIN_SUMMARY_CHARS } from '@modrinth/moderation'
import {
Avatar,
Combobox,
+ ConfirmLeaveModal,
ConfirmModal,
injectModrinthClient,
injectNotificationManager,
injectProjectPageContext,
StyledInput,
UnsavedChangesPopup,
+ usePageLeaveSafety,
} from '@modrinth/ui'
import { fileIsValid, formatProjectStatus, formatProjectType } from '@modrinth/utils'
@@ -480,6 +483,12 @@ const modified = computed(() => ({
deletedBanner: deletedBanner.value,
}))
+const hasChanges = computed(() =>
+ Object.keys(modified.value).some((key) => original.value[key] !== modified.value[key]),
+)
+
+const { confirmLeaveModal } = usePageLeaveSafety(hasChanges)
+
function resetChanges() {
name.value = project.value.title
slug.value = project.value.slug
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/license.vue b/apps/frontend/src/pages/[type]/[id]/settings/license.vue
index 4a18ed2201..682b60ecf4 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/license.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/license.vue
@@ -1,5 +1,6 @@
+
License
@@ -154,10 +155,12 @@ diff --git a/packages/ui/src/components/modal/index.ts b/packages/ui/src/components/modal/index.ts index 49b0c51fb5..412be2b2b2 100644 --- a/packages/ui/src/components/modal/index.ts +++ b/packages/ui/src/components/modal/index.ts @@ -1,3 +1,4 @@ +export { default as ConfirmLeaveModal } from './ConfirmLeaveModal.vue' export { default as ConfirmModal } from './ConfirmModal.vue' export { default as InstallToPlayModal } from './InstallToPlayModal.vue' export { default as Modal } from './Modal.vue' diff --git a/packages/ui/src/components/servers/ServerListing.vue b/packages/ui/src/components/servers/ServerListing.vue index 40c460b989..fe8dd4f4be 100644 --- a/packages/ui/src/components/servers/ServerListing.vue +++ b/packages/ui/src/components/servers/ServerListing.vue @@ -49,7 +49,7 @@ :show-game-label="showGameLabel" :show-loader-label="showLoaderLabel" :linked="false" - class="pointer-events-none flex w-full flex-row flex-wrap items-center gap-4 text-secondary *:hidden sm:flex-row sm:*:flex" + class="pointer-events-none flex w-full flex-row flex-wrap items-center gap-2 text-secondary *:hidden sm:flex-row sm:*:flex" />
-import type { Archon } from '@modrinth/api-client'
-import {
- CheckCircleIcon,
- ClockIcon,
- InfoIcon,
- RotateCounterClockwiseIcon,
- TriangleAlertIcon,
- XIcon,
-} from '@modrinth/assets'
-import { computed } from 'vue'
-
-import { useRelativeTime } from '../../../composables'
-import { defineMessages, useVIntl } from '../../../composables/i18n'
-import { commonMessages } from '../../../utils'
-import ButtonStyled from '../../base/ButtonStyled.vue'
-import ProgressBar from '../../base/ProgressBar.vue'
-
-const { formatMessage } = useVIntl()
-const relativeTime = useRelativeTime()
-
-const props = withDefaults(
- defineProps<{
- type: 'create' | 'restore'
- state: Archon.Backups.v1.BackupState
- progress: number
- backupName?: string
- createdAt?: string
- }>(),
- {
- backupName: undefined,
- createdAt: undefined,
- },
-)
-
-const emit = defineEmits<{
- (e: 'cancel' | 'retry' | 'dismiss'): void
-}>()
-
-const isQueued = computed(() => props.state === 'ongoing' && props.progress === 0)
-const isInProgress = computed(() => props.state === 'ongoing' && props.progress > 0)
-const isFailed = computed(() => props.state === 'failed')
-const isSuccess = computed(() => props.state === 'done')
-
-const showCancel = computed(() => isQueued.value || isInProgress.value)
-const showRetry = computed(() => isFailed.value)
-const showDismiss = computed(() => isFailed.value || isSuccess.value)
-const showProgress = computed(() => isInProgress.value)
-
-const colorClasses = computed(() => {
- if (isFailed.value) return 'border-brand-red bg-bg-red'
- if (isSuccess.value) return 'border-brand-green bg-bg-green'
- return 'border-brand-blue bg-bg-blue'
-})
-
-const icon = computed(() => {
- if (isFailed.value) return TriangleAlertIcon
- if (isSuccess.value) return CheckCircleIcon
- return InfoIcon
-})
-
-const iconClass = computed(() => {
- if (isFailed.value) return 'text-brand-red'
- if (isSuccess.value) return 'text-brand-green'
- return 'text-brand-blue'
-})
-
-const buttonColor = computed<'red' | 'green' | 'blue'>(() => {
- if (isFailed.value) return 'red'
- if (isSuccess.value) return 'green'
- return 'blue'
-})
-
-const name = computed(() => props.backupName ?? formatMessage(messages.fallbackName))
-
-const title = computed(() => {
- if (props.type === 'create') {
- if (isQueued.value) return formatMessage(messages.backupQueuedTitle)
- if (isInProgress.value) return formatMessage(messages.creatingBackupTitle)
- if (isFailed.value) return formatMessage(messages.backupFailedTitle)
- }
- if (isQueued.value) return formatMessage(messages.restoreQueuedTitle)
- if (isInProgress.value) return formatMessage(messages.restoringBackupTitle)
- if (isSuccess.value) return formatMessage(messages.restoreSuccessfulTitle)
- if (isFailed.value) return formatMessage(messages.restoreFailedTitle)
- return ''
-})
-
-const description = computed(() => {
- if (props.type === 'create') {
- if (isQueued.value)
- return formatMessage(messages.backupQueuedDescription, { backupName: name.value })
- if (isInProgress.value)
- return formatMessage(messages.creatingBackupDescription, { backupName: name.value })
- if (isFailed.value)
- return formatMessage(messages.backupFailedDescription, { backupName: name.value })
- }
- if (isQueued.value)
- return formatMessage(messages.restoreQueuedDescription, { backupName: name.value })
- if (isInProgress.value)
- return formatMessage(messages.restoringBackupDescription, { backupName: name.value })
- if (isSuccess.value)
- return formatMessage(messages.restoreSuccessfulDescription, { backupName: name.value })
- if (isFailed.value)
- return formatMessage(messages.restoreFailedDescription, { backupName: name.value })
- return ''
-})
-
-const messages = defineMessages({
- fallbackName: {
- id: 'servers.backups.admonition.fallback-name',
- defaultMessage: 'Your backup',
- },
- backupQueuedTitle: {
- id: 'servers.backups.admonition.backup-queued.title',
- defaultMessage: 'Backup queued',
- },
- backupQueuedDescription: {
- id: 'servers.backups.admonition.backup-queued.description',
- defaultMessage: '{backupName} is queued and will start shortly.',
- },
- creatingBackupTitle: {
- id: 'servers.backups.admonition.creating-backup.title',
- defaultMessage: 'Creating backup',
- },
- creatingBackupDescription: {
- id: 'servers.backups.admonition.creating-backup.description',
- defaultMessage:
- 'Saving world data and server configuration for {backupName}. This can take a few minutes.',
- },
- backupFailedTitle: {
- id: 'servers.backups.admonition.backup-failed.title',
- defaultMessage: 'Backup failed',
- },
- backupFailedDescription: {
- id: 'servers.backups.admonition.backup-failed.description',
- defaultMessage:
- 'Something went wrong while creating {backupName}. Please try again or contact support if the issue continues.',
- },
- restoreQueuedTitle: {
- id: 'servers.backups.admonition.restore-queued.title',
- defaultMessage: 'Restoring from backup queued',
- },
- restoreQueuedDescription: {
- id: 'servers.backups.admonition.restore-queued.description',
- defaultMessage: 'Restoring from {backupName} is queued and will start shortly.',
- },
- restoringBackupTitle: {
- id: 'servers.backups.admonition.restoring-backup.title',
- defaultMessage: 'Restoring from backup',
- },
- restoringBackupDescription: {
- id: 'servers.backups.admonition.restoring-backup.description',
- defaultMessage: 'Restoring your server from {backupName}. This may take a couple of minutes.',
- },
- restoreSuccessfulTitle: {
- id: 'servers.backups.admonition.restore-successful.title',
- defaultMessage: 'Restoring from backup successful',
- },
- restoreSuccessfulDescription: {
- id: 'servers.backups.admonition.restore-successful.description',
- defaultMessage: 'Your server has been restored to {backupName} and is ready to start.',
- },
- restoreFailedTitle: {
- id: 'servers.backups.admonition.restore-failed.title',
- defaultMessage: 'Restoring from backup failed',
- },
- restoreFailedDescription: {
- id: 'servers.backups.admonition.restore-failed.description',
- defaultMessage:
- 'Something went wrong while restoring from {backupName}. Please try again or contact support if the issue continues.',
- },
-})
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/components/servers/backups/index.ts b/packages/ui/src/components/servers/backups/index.ts
index abcd1d34a9..abee9897a5 100644
--- a/packages/ui/src/components/servers/backups/index.ts
+++ b/packages/ui/src/components/servers/backups/index.ts
@@ -1,7 +1,6 @@
export { default as BackupCreateModal } from './BackupCreateModal.vue'
export { default as BackupDeleteModal } from './BackupDeleteModal.vue'
export { default as BackupItem } from './BackupItem.vue'
-export { default as BackupProgressAdmonition } from './BackupProgressAdmonition.vue'
export { default as BackupProgressAdmonitions } from './BackupProgressAdmonitions.vue'
export { default as BackupRenameModal } from './BackupRenameModal.vue'
export { default as BackupRestoreModal } from './BackupRestoreModal.vue'
diff --git a/packages/ui/src/components/servers/files/FileNavbar.vue b/packages/ui/src/components/servers/files/FileNavbar.vue
deleted file mode 100644
index e8993204ee..0000000000
--- a/packages/ui/src/components/servers/files/FileNavbar.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/editor/FileEditor.vue b/packages/ui/src/components/servers/files/editor/FileEditor.vue
deleted file mode 100644
index 340879d14c..0000000000
--- a/packages/ui/src/components/servers/files/editor/FileEditor.vue
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/explorer/FileLabelBar.vue b/packages/ui/src/components/servers/files/explorer/FileLabelBar.vue
deleted file mode 100644
index 3f93afb20c..0000000000
--- a/packages/ui/src/components/servers/files/explorer/FileLabelBar.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/explorer/FileVirtualList.vue b/packages/ui/src/components/servers/files/explorer/FileVirtualList.vue
deleted file mode 100644
index 210cb181cc..0000000000
--- a/packages/ui/src/components/servers/files/explorer/FileVirtualList.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/FileDeleteItemModal.vue b/packages/ui/src/components/servers/files/modals/FileDeleteItemModal.vue
deleted file mode 100644
index 88a9c32811..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileDeleteItemModal.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/FileMoveItemModal.vue b/packages/ui/src/components/servers/files/modals/FileMoveItemModal.vue
deleted file mode 100644
index 378532df80..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileMoveItemModal.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/FileRenameItemModal.vue b/packages/ui/src/components/servers/files/modals/FileRenameItemModal.vue
deleted file mode 100644
index 3dfc3aa39e..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileRenameItemModal.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/FileUploadConflictModal.vue b/packages/ui/src/components/servers/files/modals/FileUploadConflictModal.vue
deleted file mode 100644
index e5d7f123e3..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileUploadConflictModal.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/FileUploadZipUrlModal.vue b/packages/ui/src/components/servers/files/modals/FileUploadZipUrlModal.vue
deleted file mode 100644
index 4b63f6f27d..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileUploadZipUrlModal.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/modals/index.ts b/packages/ui/src/components/servers/files/modals/index.ts
deleted file mode 100644
index 1f2fd5694d..0000000000
--- a/packages/ui/src/components/servers/files/modals/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as FileCreateItemModal } from './FileCreateItemModal.vue'
-export { default as FileDeleteItemModal } from './FileDeleteItemModal.vue'
-export { default as FileMoveItemModal } from './FileMoveItemModal.vue'
-export { default as FileRenameItemModal } from './FileRenameItemModal.vue'
-export { default as FileUploadConflictModal } from './FileUploadConflictModal.vue'
-export { default as FileUploadZipUrlModal } from './FileUploadZipUrlModal.vue'
diff --git a/packages/ui/src/components/servers/files/upload/index.ts b/packages/ui/src/components/servers/files/upload/index.ts
deleted file mode 100644
index d44ae326ac..0000000000
--- a/packages/ui/src/components/servers/files/upload/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as FileUploadDragAndDrop } from './FileUploadDragAndDrop.vue'
-export { default as FileUploadDropdown } from './FileUploadDropdown.vue'
diff --git a/packages/ui/src/components/servers/index.ts b/packages/ui/src/components/servers/index.ts
index de615e239d..1c434c9e6d 100644
--- a/packages/ui/src/components/servers/index.ts
+++ b/packages/ui/src/components/servers/index.ts
@@ -1,5 +1,4 @@
export * from './backups'
-export * from './files'
export * from './flows'
export * from './icons'
export { default as InstallingBanner } from './InstallingBanner.vue'
diff --git a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
index 8b7de765de..c5136acd8e 100644
--- a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
@@ -1,6 +1,6 @@
-
-
-
diff --git a/packages/ui/src/components/servers/backups/BackupProgressAdmonitions.vue b/packages/ui/src/components/servers/backups/BackupProgressAdmonitions.vue
index 1e56e0671c..3e72d68ae6 100644
--- a/packages/ui/src/components/servers/backups/BackupProgressAdmonitions.vue
+++ b/packages/ui/src/components/servers/backups/BackupProgressAdmonitions.vue
@@ -1,12 +1,27 @@
@@ -186,18 +320,55 @@ function handleDismiss(key: string) {
tag="div"
class="flex flex-col gap-3"
>
-
-
-
-
-
-
-
- {{ title }}
-
- {{ description }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {{ getTitle(item) }}
+
+
+ {{ getDescription(item) }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- New file
- New folder
- Upload file
-
- Upload from .zip file
-
-
- Upload from .zip URL
-
-
- Install CurseForge pack
-
-
-
-
-
-
-
-
-
-
-
- Save
- Save as...
-
-
- Save & restart
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/editor/FileImageViewer.vue b/packages/ui/src/components/servers/files/editor/FileImageViewer.vue
deleted file mode 100644
index 094cbfdfdd..0000000000
--- a/packages/ui/src/components/servers/files/editor/FileImageViewer.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/editor/index.ts b/packages/ui/src/components/servers/files/editor/index.ts
deleted file mode 100644
index 3f5fed318a..0000000000
--- a/packages/ui/src/components/servers/files/editor/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as FileEditor } from './FileEditor.vue'
-export { default as FileImageViewer } from './FileImageViewer.vue'
diff --git a/packages/ui/src/components/servers/files/explorer/FileItem.vue b/packages/ui/src/components/servers/files/explorer/FileItem.vue
deleted file mode 100644
index 36bd56bdcc..0000000000
--- a/packages/ui/src/components/servers/files/explorer/FileItem.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
-
- ![Viewed image]()
-
-
-
- {{ state.errorMessage || 'Invalid or empty image file.' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ name }}
-
-
-
-
- {{ formattedSize }}
-
-
- {{ formattedCreationDate }}
-
-
- {{ formattedModifiedDate }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/servers/files/explorer/index.ts b/packages/ui/src/components/servers/files/explorer/index.ts
deleted file mode 100644
index a19d7a7774..0000000000
--- a/packages/ui/src/components/servers/files/explorer/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as FileItem } from './FileItem.vue'
-export { default as FileLabelBar } from './FileLabelBar.vue'
-export { default as FileManagerError } from './FileManagerError.vue'
-export { default as FileVirtualList } from './FileVirtualList.vue'
-export { default as TeleportOverflowMenu } from './TeleportOverflowMenu.vue'
diff --git a/packages/ui/src/components/servers/files/index.ts b/packages/ui/src/components/servers/files/index.ts
deleted file mode 100644
index 93f3acbc51..0000000000
--- a/packages/ui/src/components/servers/files/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './editor'
-export * from './explorer'
-export { default as FileNavbar } from './FileNavbar.vue'
-export * from './modals'
-export * from './upload'
diff --git a/packages/ui/src/components/servers/files/modals/FileCreateItemModal.vue b/packages/ui/src/components/servers/files/modals/FileCreateItemModal.vue
deleted file mode 100644
index 5897a84a76..0000000000
--- a/packages/ui/src/components/servers/files/modals/FileCreateItemModal.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
- -
-
-
- - - Over 100 files will be overwritten if you proceed with extraction; here is just some of - them: - - - The following {{ files.length }} files already exist on your server, and will be - overwritten if you proceed with extraction: - -
--
-
-
-
{{ file }} -
-
-
-
-
-
-
-
-
-
-
-
+
@@ -52,18 +60,20 @@
+
@@ -176,13 +170,13 @@ const bulkProgressMessage = computed(() => {
v-tooltip="
allDisabled
? formatMessage(messages.allAlreadyDisabled)
- : formatMessage(messages.disable)
+ : formatMessage(commonMessages.disableButton)
"
:disabled="isBusy || allDisabled"
@click="emit('disable')"
>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmLeaveModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmLeaveModal.vue
deleted file mode 100644
index 74f70b93a4..0000000000
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmLeaveModal.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
index 38e66a3516..13e054d127 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
@@ -13,7 +13,7 @@
formatMessage(messages.admonitionHeader, { action: downgrade ? 'downgrade' : 'update' })
"
>
- {{ formatMessage(messages.admonitionBody) }}
+ {{ formatMessage(server ? messages.admonitionBody : messages.admonitionBodyApp) }}
{{
inst.installing
- ? formatMessage(messages.installingLabel)
+ ? formatMessage(commonMessages.installingLabel)
: formatMessage(messages.installButton)
}}
@@ -176,7 +176,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileTableHeader.vue b/packages/ui/src/layouts/shared/files-tab/components/FileTableHeader.vue
new file mode 100644
index 0000000000..490ee14d71
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileTableHeader.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue b/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue
new file mode 100644
index 0000000000..28e88baa72
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue
@@ -0,0 +1,360 @@
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/FileEditor.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/FileEditor.vue
new file mode 100644
index 0000000000..e3f4ada2c9
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/FileEditor.vue
@@ -0,0 +1,288 @@
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue
new file mode 100644
index 0000000000..7c705476dc
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue
@@ -0,0 +1,80 @@
+
+
+
+ {{ formatMessage(messages.deletingName, { name: item?.name }) }}
+ {{ formatMessage(messages.deleteWarning, { type: item?.type }) }}
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue
new file mode 100644
index 0000000000..a01771c80b
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue
new file mode 100644
index 0000000000..186230f7c4
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue
new file mode 100644
index 0000000000..a18634e142
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue
new file mode 100644
index 0000000000..9050d67392
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue
new file mode 100644
index 0000000000..1a6824ae8c
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue
@@ -0,0 +1,291 @@
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/file-validation-messages.ts b/packages/ui/src/layouts/shared/files-tab/components/modals/file-validation-messages.ts
new file mode 100644
index 0000000000..f5d7db1147
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/file-validation-messages.ts
@@ -0,0 +1,22 @@
+import { defineMessages } from '#ui/composables/i18n'
+
+export const fileValidationMessages = defineMessages({
+ nameLabel: {
+ id: 'files.validation.name-label',
+ defaultMessage: 'Name',
+ },
+ nameRequired: {
+ id: 'files.validation.name-required',
+ defaultMessage: 'Name is required.',
+ },
+ nameInvalidFile: {
+ id: 'files.validation.name-invalid-file',
+ defaultMessage:
+ 'Name must contain only alphanumeric characters, dashes, underscores, dots, or spaces.',
+ },
+ nameInvalidDirectory: {
+ id: 'files.validation.name-invalid-directory',
+ defaultMessage:
+ 'Name must contain only alphanumeric characters, dashes, underscores, or spaces.',
+ },
+})
diff --git a/packages/ui/src/components/servers/files/upload/FileUploadDragAndDrop.vue b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDragAndDrop.vue
similarity index 73%
rename from packages/ui/src/components/servers/files/upload/FileUploadDragAndDrop.vue
rename to packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDragAndDrop.vue
index 3d03699feb..6a9900fcf0 100644
--- a/packages/ui/src/components/servers/files/upload/FileUploadDragAndDrop.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDragAndDrop.vue
@@ -16,7 +16,11 @@
@@ -27,6 +31,10 @@
import { UploadIcon } from '@modrinth/assets'
import { ref } from 'vue'
+import { defineMessages, useVIntl } from '#ui/composables/i18n'
+
+const { formatMessage } = useVIntl()
+
const emit = defineEmits<{
filesDropped: [files: File[]]
}>()
@@ -36,15 +44,20 @@ defineProps<{
type?: string
}>()
+const messages = defineMessages({
+ dropToUpload: {
+ id: 'files.upload.drag-and-drop.drop-to-upload',
+ defaultMessage: 'Drop {type, select, undefined {files} other {{type}s}} here to upload',
+ },
+})
+
const isDragging = ref(false)
const dragCounter = ref(0)
const handleDragEnter = (event: DragEvent) => {
event.preventDefault()
- if (!event.dataTransfer?.types.includes('application/modrinth-file-move')) {
- dragCounter.value++
- isDragging.value = true
- }
+ dragCounter.value++
+ isDragging.value = true
}
const handleDragOver = (event: DragEvent) => {
@@ -64,9 +77,6 @@ const handleDrop = (event: DragEvent) => {
isDragging.value = false
dragCounter.value = 0
- const isInternalMove = event.dataTransfer?.types.includes('application/modrinth-file-move')
- if (isInternalMove) return
-
const files = event.dataTransfer?.files
if (files) {
emit('filesDropped', Array.from(files))
diff --git a/packages/ui/src/components/servers/files/upload/FileUploadDropdown.vue b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
similarity index 76%
rename from packages/ui/src/components/servers/files/upload/FileUploadDropdown.vue
rename to packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
index 580754c31f..e9244087e8 100644
--- a/packages/ui/src/components/servers/files/upload/FileUploadDropdown.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
@@ -12,9 +12,17 @@
-
+
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
index 2f5359338d..5bef2412e4 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
@@ -21,14 +21,6 @@ const messages = defineMessages({
id: 'content.selection-bar.selected-count-simple',
defaultMessage: '{count, number} selected',
},
- enable: {
- id: 'content.selection-bar.enable',
- defaultMessage: 'Enable',
- },
- disable: {
- id: 'content.selection-bar.disable',
- defaultMessage: 'Disable',
- },
bulkEnabling: {
id: 'content.selection-bar.bulk.enabling',
defaultMessage: 'Enabling {progress}/{total} {contentType}...',
@@ -162,13 +154,15 @@ const bulkProgressMessage = computed(() => {
-
- {{ cat.name }}
-
+
-
- {{ formatMessage(messages.leavePageBody) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatMessage(messages.gameVersionLabel) }}
+ {{ formatMessage(commonMessages.gameVersionLabel) }}
@@ -26,7 +26,22 @@
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileOperationAdmonitions.vue b/packages/ui/src/layouts/shared/files-tab/components/FileOperationAdmonitions.vue
new file mode 100644
index 0000000000..8a9c666ef0
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileOperationAdmonitions.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+ {{ name }}
+
+
+
+
+ {{ formattedSize }}
+
+
+ {{ formattedCreationDate }}
+
+
+ {{ formattedModifiedDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue
new file mode 100644
index 0000000000..6bd8bfec48
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue
@@ -0,0 +1,178 @@
+
+
+
+
+ ![]()
+
+
+
+
+
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue
new file mode 100644
index 0000000000..461ab5eca5
--- /dev/null
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue
@@ -0,0 +1,128 @@
+
+
+
+ + {{ state.errorMessage || formatMessage(messages.invalidImage) }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.body) }} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatMessage(messages.overwriteManyWarning) }}
+
+
+ {{ formatMessage(messages.overwriteWarning, { count: files.length }) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ formatMessage(messages.overwrittenLabel)
+ }}
+
+ {{ file }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Drop {{ type ? type.toLocaleLowerCase() : 'file' }}s here to upload + {{ + formatMessage(messages.dropToUpload, { + type: type ? type.toLocaleLowerCase() : undefined, + }) + }}
- Done
+ {{ formatMessage(commonMessages.doneLabel) }}
- Failed - File already exists
+ {{ formatMessage(messages.failedFileExists) }}
- Failed - {{ item.error?.message || 'An unexpected error occured.' }}
+ {{
+ formatMessage(messages.failedGeneric, {
+ error: item.error?.message || formatMessage(messages.unexpectedError),
+ })
+ }}
- Failed - Incorrect file type
+ {{ formatMessage(messages.failedIncorrectType) }}
@@ -75,11 +85,11 @@
/>
-
-
-
-
- {{ formatMessage(nonBackupBusyReasons[0].reason) }}
- File operations are disabled while the operation is in progress.
-
-
-
-
-
- {{ selectedItems.size }} selected
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This folder is empty
-There are no files or folders.
-
-
-
-
-
-
-
-
-
+
+ Uploading server files...
+
+
+
+
+
+
+
+ Something went wrong while extracting the archive.
+
+
+
+
+
+
+
+
+
+
+ All files have been extracted successfully.
+
+
+
+
+
+
+
+ `,
+ }),
+}
+
+export const WithProgressBar: Story = {
+ render: () => ({
+ components: { Admonition, ButtonStyled, ProgressBar },
+ template: /*html*/ `
+
+
+ 128 KB / 1.2 MB (45%)
+
+
+
+
+
+
+
+
+ 24 MB extracted — config/settings.yml
+
+
+
+
+
+
+
+
+ 56 MB extracted
+
+
+
+
+
+
+
+
+ `,
+ }),
+}
diff --git a/packages/ui/src/stories/base/NavTabs.stories.ts b/packages/ui/src/stories/base/NavTabs.stories.ts
new file mode 100644
index 0000000000..8a8e578972
--- /dev/null
+++ b/packages/ui/src/stories/base/NavTabs.stories.ts
@@ -0,0 +1,97 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { getCurrentInstance, ref } from 'vue'
+import { createMemoryHistory, createRouter } from 'vue-router'
+
+import NavTabs from '../../components/base/NavTabs.vue'
+
+const router = createRouter({
+ history: createMemoryHistory(),
+ routes: [{ path: '/', component: { template: '' } }],
+})
+
+const meta = {
+ title: 'Base/NavTabs',
+ component: NavTabs,
+ decorators: [
+ (story) => {
+ return {
+ components: { story },
+ setup() {
+ const app = getCurrentInstance()?.appContext.app
+ if (app && !app.config.globalProperties.$router) {
+ app.use(router)
+ }
+ },
+ template: '
+
+
+
+
+ `,
+ }),
+}
+
+export const CustomMessages: Story = {
+ render: () => ({
+ components: { ConfirmLeaveModal, ButtonStyled },
+ setup() {
+ const modalRef = ref{{ result }}
+
+
+
+
+
+ `,
+ }),
+}
+
+export const WarningAdmonition: Story = {
+ render: () => ({
+ components: { ConfirmLeaveModal, ButtonStyled },
+ setup() {
+ const modalRef = ref
+
+
+
+
+ `,
+ }),
+}
diff --git a/packages/ui/src/stories/servers/BackupProgressAdmonition.stories.ts b/packages/ui/src/stories/servers/BackupProgressAdmonition.stories.ts
deleted file mode 100644
index 83a3a96515..0000000000
--- a/packages/ui/src/stories/servers/BackupProgressAdmonition.stories.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import BackupProgressAdmonition from '../../components/servers/backups/BackupProgressAdmonition.vue'
-
-const meta = {
- title: 'Servers/BackupProgressAdmonition',
- component: BackupProgressAdmonition,
- parameters: {
- layout: 'padded',
- },
-} satisfies Meta
-
- `,
- }),
-}
-
-export const BackupQueued: Story = {
- args: {
- type: 'create',
- state: 'ongoing',
- progress: 0,
- backupName: 'World Backup 1',
- createdAt: justNow,
- },
-}
-
-export const CreatingBackup: Story = {
- args: {
- type: 'create',
- state: 'ongoing',
- progress: 0.33,
- backupName: 'World Backup 1',
- createdAt: eightMinsAgo,
- },
-}
-
-export const BackupFailed: Story = {
- args: {
- type: 'create',
- state: 'failed',
- progress: 0,
- backupName: 'World Backup 1',
- createdAt: fiveHoursAgo,
- },
-}
-
-export const RestoreQueued: Story = {
- args: {
- type: 'restore',
- state: 'ongoing',
- progress: 0,
- backupName: 'World Backup 1',
- createdAt: justNow,
- },
-}
-
-export const RestoringBackup: Story = {
- args: {
- type: 'restore',
- state: 'ongoing',
- progress: 0.33,
- backupName: 'World Backup 1',
- createdAt: eightMinsAgo,
- },
-}
-
-export const RestoreSuccessful: Story = {
- args: {
- type: 'restore',
- state: 'done',
- progress: 1,
- backupName: 'World Backup 1',
- createdAt: fiveHoursAgo,
- },
-}
-
-export const RestoreFailed: Story = {
- args: {
- type: 'restore',
- state: 'failed',
- progress: 0,
- backupName: 'World Backup 1',
- createdAt: fiveHoursAgo,
- },
-}
diff --git a/packages/ui/src/utils/ace-mode-log.ts b/packages/ui/src/utils/ace-mode-log.ts
new file mode 100644
index 0000000000..720ff6f30e
--- /dev/null
+++ b/packages/ui/src/utils/ace-mode-log.ts
@@ -0,0 +1,71 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import ace from 'ace-builds'
+
+ace['define'](
+ 'ace/mode/mclog_highlight_rules',
+ ['require', 'exports', 'ace/lib/oop', 'ace/mode/text_highlight_rules'],
+ function (require: any, exports: any) {
+ const oop = require('ace/lib/oop')
+ const TextHighlightRules = require('ace/mode/text_highlight_rules').TextHighlightRules
+
+ const MclogHighlightRules = function (this: any) {
+ this.$rules = {
+ start: [
+ {
+ token: 'comment.timestamp',
+ regex: /^\[\d\d:\d\d:\d\d\]/.source,
+ },
+ {
+ token: 'invalid.error',
+ regex: /\[.+?\/ERROR\]:?/.source,
+ },
+ {
+ token: 'keyword.warn',
+ regex: /\[.+?\/WARN\]:?/.source,
+ },
+ {
+ token: 'string.info',
+ regex: /\[.+?\/INFO\]:/.source,
+ },
+ {
+ token: 'support.command',
+ regex: /: \/.+/.source,
+ },
+ {
+ token: 'comment.stacktrace',
+ regex: /\tat\s.+/.source,
+ },
+ {
+ token: 'entity.name.function',
+ regex: /\w+?\[\/\d+?\.\d+?\.\d+?\.\d+?:\d+?\]/.source,
+ },
+ {
+ token: 'storage.chat',
+ regex: /\[CHAT\]/.source,
+ },
+ ],
+ }
+ this.normalizeRules()
+ }
+
+ oop.inherits(MclogHighlightRules, TextHighlightRules)
+ exports.MclogHighlightRules = MclogHighlightRules
+ },
+)
+
+ace['define'](
+ 'ace/mode/mclog',
+ ['require', 'exports', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/mclog_highlight_rules'],
+ function (require: any, exports: any) {
+ const oop = require('ace/lib/oop')
+ const TextMode = require('ace/mode/text').Mode
+ const MclogHighlightRules = require('ace/mode/mclog_highlight_rules').MclogHighlightRules
+
+ const Mode = function (this: any) {
+ this.HighlightRules = MclogHighlightRules
+ }
+
+ oop.inherits(Mode, TextMode)
+ exports.Mode = Mode
+ },
+)
diff --git a/packages/ui/src/utils/ace-theme.ts b/packages/ui/src/utils/ace-theme.ts
index a1cde94088..e78e42d483 100644
--- a/packages/ui/src/utils/ace-theme.ts
+++ b/packages/ui/src/utils/ace-theme.ts
@@ -1,3 +1,5 @@
+import 'ace-builds/esm-resolver'
+
import cssText from '@modrinth/assets/styles/ace.css?raw'
import ace from 'ace-builds'
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index db2dd285ee..5e6a5764cf 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -470,10 +470,94 @@ export const commonMessages = defineMessages({
id: 'label.plan-custom',
defaultMessage: 'Custom',
},
+ copyLinkButton: {
+ id: 'button.copy-link',
+ defaultMessage: 'Copy link',
+ },
switchVersionButton: {
id: 'button.switch-version',
defaultMessage: 'Switch version',
},
+ updatingLabel: {
+ id: 'label.updating',
+ defaultMessage: 'Updating...',
+ },
+ deleteFailedLabel: {
+ id: 'label.delete-failed',
+ defaultMessage: 'Delete failed',
+ },
+ uploadFailedLabel: {
+ id: 'label.upload-failed',
+ defaultMessage: 'Upload failed',
+ },
+ renameFailedLabel: {
+ id: 'label.rename-failed',
+ defaultMessage: 'Rename failed',
+ },
+ moveFailedLabel: {
+ id: 'label.move-failed',
+ defaultMessage: 'Move failed',
+ },
+ createFailedLabel: {
+ id: 'label.create-failed',
+ defaultMessage: 'Create failed',
+ },
+ extractFailedLabel: {
+ id: 'label.extract-failed',
+ defaultMessage: 'Extract failed',
+ },
+ showFileButton: {
+ id: 'button.show-file',
+ defaultMessage: 'Show file',
+ },
+ enableButton: {
+ id: 'button.enable',
+ defaultMessage: 'Enable',
+ },
+ disableButton: {
+ id: 'button.disable',
+ defaultMessage: 'Disable',
+ },
+ renameButton: {
+ id: 'button.rename',
+ defaultMessage: 'Rename',
+ },
+ moveButton: {
+ id: 'button.move',
+ defaultMessage: 'Move',
+ },
+ extractButton: {
+ id: 'button.extract',
+ defaultMessage: 'Extract',
+ },
+ doneLabel: {
+ id: 'label.done',
+ defaultMessage: 'Done',
+ },
+ copyFilenameButton: {
+ id: 'button.copy-filename',
+ defaultMessage: 'Copy filename',
+ },
+ copyFullPathButton: {
+ id: 'button.copy-full-path',
+ defaultMessage: 'Copy full path',
+ },
+ copiedFilenameLabel: {
+ id: 'label.copied-filename',
+ defaultMessage: 'Copied filename',
+ },
+ copiedPathLabel: {
+ id: 'label.copied-path',
+ defaultMessage: 'Copied path',
+ },
+ openInFolderButton: {
+ id: 'button.open-in-folder',
+ defaultMessage: 'Open in folder',
+ },
+ downloadFailedLabel: {
+ id: 'label.download-failed',
+ defaultMessage: 'Download failed',
+ },
projectCreated: {
id: 'project.about.details.created',
defaultMessage: 'Created {date}',
@@ -638,6 +722,14 @@ export const financialMessages = defineMessages({
},
})
+const PROJECT_TYPE_ALIASES: RecordBackup Creation
-Backup Restoration
-
-
-
diff --git a/apps/frontend/src/pages/settings.vue b/apps/frontend/src/pages/settings.vue
index e698c8e2e9..3c9690faae 100644
--- a/apps/frontend/src/pages/settings.vue
+++ b/apps/frontend/src/pages/settings.vue
@@ -20,6 +20,13 @@
icon: LanguagesIcon,
badge: `${formatMessage(commonMessages.beta)}`,
},
+ flags.developerMode
+ ? {
+ link: '/settings/flags',
+ label: formatMessage(commonSettingsMessages.featureFlags),
+ icon: ToggleRightIcon,
+ }
+ : null,
auth.user ? { type: 'heading', label: formatMessage(messages.account) } : null,
auth.user
? {
@@ -91,6 +98,7 @@ import {
PaintbrushIcon,
ServerIcon,
ShieldIcon,
+ ToggleRightIcon,
UserIcon,
} from '@modrinth/assets'
import { commonMessages, commonSettingsMessages, defineMessages, useVIntl } from '@modrinth/ui'
@@ -116,6 +124,7 @@ const messages = defineMessages({
const route = useNativeRoute()
const auth = await useAuth()
+const flags = useFeatureFlags()
useSeoMeta({
robots: 'noindex',
diff --git a/apps/frontend/src/pages/settings/flags.vue b/apps/frontend/src/pages/settings/flags.vue
new file mode 100644
index 0000000000..d175e0f471
--- /dev/null
+++ b/apps/frontend/src/pages/settings/flags.vue
@@ -0,0 +1,87 @@
+
+
+
+ Feature flags
-
-
-
-
-
-
-
- - No flags found matching "{{ searchQuery }}" -
-
+
+
+
+
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 5bb2fc1693..60c4415618 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -2714,6 +2714,9 @@
"settings.display.theme.title": {
"defaultMessage": "Color theme"
},
+ "settings.feature-flags.title": {
+ "defaultMessage": "Feature flags"
+ },
"settings.language.categories.default": {
"defaultMessage": "Standard languages"
},
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 5e6a5764cf..42237784f3 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -856,6 +856,10 @@ export const commonSettingsMessages = defineMessages({
id: 'settings.billing.title',
defaultMessage: 'Billing and subscriptions',
},
+ featureFlags: {
+ id: 'settings.feature-flags.title',
+ defaultMessage: 'Feature flags',
+ },
language: {
id: 'settings.language.title',
defaultMessage: 'Language',
From b11b54cbc97528eba91c88e17ebf294f259abfc9 Mon Sep 17 00:00:00 2001
From: "Calum H."
+
+
+
+
+
+
+
+ + No flags found matching "{{ searchQuery }}" +
+
-
+ {{ filename }}
+
+ void
onclickVersion?: () => void
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index 3aaa22023a..8e19e4abb4 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -25,7 +25,12 @@ import { useVIntl } from '#ui/composables/i18n'
import { commonMessages } from '#ui/utils/common-messages'
import { truncatedTooltip } from '#ui/utils/truncate'
-import type { ContentCardProject, ContentCardVersion, ContentOwner } from '../types'
+import type {
+ ClientWarningType,
+ ContentCardProject,
+ ContentCardVersion,
+ ContentOwner,
+} from '../types'
const { formatMessage } = useVIntl()
@@ -39,6 +44,8 @@ interface Props {
installing?: boolean
hasUpdate?: boolean
isClientOnly?: boolean
+ clientWarning?: ClientWarningType | null
+ hideSwitchVersion?: boolean
overflowOptions?: OverflowMenuOption[]
disabled?: boolean
showCheckbox?: boolean
@@ -55,6 +62,8 @@ const props = withDefaults(defineProps(), {
installing: false,
hasUpdate: false,
isClientOnly: false,
+ clientWarning: null,
+ hideSwitchVersion: false,
overflowOptions: undefined,
disabled: false,
showCheckbox: false,
@@ -83,6 +92,17 @@ const fileNameRef = ref(null)
const isDisabled = computed(() => props.disabled || props.installing)
+const clientWarningMessage = computed(() => {
+ switch (props.clientWarning) {
+ case 'retained':
+ return commonMessages.clientRetainedWarning
+ case 'depends':
+ return commonMessages.clientDependsWarning
+ default:
+ return commonMessages.clientOnlyWarning
+ }
+})
+
const { shift: shiftHeld } = useMagicKeys()
const deleteHovered = ref(false)
@@ -147,7 +167,7 @@ const deleteHovered = ref(false)
+
- {{ formatMessage(commonMessages.clientOnlyWarning) }}
+ {{ formatMessage(clientWarningMessage) }}
@@ -260,7 +280,11 @@ const deleteHovered = ref(false)