diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options.vue b/apps/frontend/src/pages/hosting/manage/[id]/options.vue index edd274cd9..9d4697de0 100644 --- a/apps/frontend/src/pages/hosting/manage/[id]/options.vue +++ b/apps/frontend/src/pages/hosting/manage/[id]/options.vue @@ -1,8 +1,5 @@ @@ -18,7 +15,7 @@ import { VersionIcon, WrenchIcon, } from '@modrinth/assets' -import { Admonition, injectModrinthServerContext, useVIntl } from '@modrinth/ui' +import { injectModrinthServerContext } from '@modrinth/ui' import { isAdmin as isUserAdmin, type User } from '@modrinth/utils' import ServerSidebar from '~/components/ui/servers/ServerSidebar.vue' @@ -27,17 +24,7 @@ const route = useRoute() const serverId = route.params.id as string const auth = await useAuth() -const { formatMessage } = useVIntl() -const { server, busyReasons } = injectModrinthServerContext() - -const backupBusyReason = computed(() => { - const reason = busyReasons.value.find( - (r) => - r.reason.id === 'servers.busy.backup-creating' || - r.reason.id === 'servers.busy.backup-restoring', - ) - return reason ? formatMessage(reason.reason) : null -}) +const { server } = injectModrinthServerContext() useHead({ title: `Options - ${server.value?.name ?? 'Server'} - Modrinth`, diff --git a/packages/api-client/src/modules/labrinth/projects/v2.ts b/packages/api-client/src/modules/labrinth/projects/v2.ts index 96e1c4b70..1da1c1231 100644 --- a/packages/api-client/src/modules/labrinth/projects/v2.ts +++ b/packages/api-client/src/modules/labrinth/projects/v2.ts @@ -71,6 +71,7 @@ export class LabrinthProjectsV2Module extends AbstractModule { params: { ...params, facets: params.facets ? JSON.stringify(params.facets) : undefined, + new_filters: params.new_filters ?? undefined, }, }) } diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts index 74e815d8f..24b4656f6 100644 --- a/packages/api-client/src/modules/labrinth/types.ts +++ b/packages/api-client/src/modules/labrinth/types.ts @@ -307,6 +307,7 @@ export namespace Labrinth { export type ProjectSearchParams = { query?: string facets?: string[][] // in the format of [["categories:forge"],["versions:1.17.1"]] + new_filters?: string filters?: string index?: 'relevance' | 'downloads' | 'follows' | 'newest' | 'updated' offset?: number diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/FinalConfigStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/FinalConfigStage.vue index 347d1b372..00ace6bc8 100644 --- a/packages/ui/src/components/flows/creation-flow-modal/components/FinalConfigStage.vue +++ b/packages/ui/src/components/flows/creation-flow-modal/components/FinalConfigStage.vue @@ -97,6 +97,12 @@ + + @@ -106,6 +112,7 @@ import { computed, watch } from 'vue' import { useDebugLogger } from '#ui/composables/debug-logger' +import InlineBackupCreator from '../../../../layouts/shared/content-tab/components/modals/InlineBackupCreator.vue' import { injectTags } from '../../../../providers' import Accordion from '../../../base/Accordion.vue' import Chips from '../../../base/Chips.vue' diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/SetupTypeStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/SetupTypeStage.vue index dac9055c3..8aeecf61d 100644 --- a/packages/ui/src/components/flows/creation-flow-modal/components/SetupTypeStage.vue +++ b/packages/ui/src/components/flows/creation-flow-modal/components/SetupTypeStage.vue @@ -59,7 +59,6 @@ @click="setSetupType('vanilla')" /> - @@ -69,7 +68,6 @@ import { BoxesIcon, BoxIcon, BoxImportIcon, PackageIcon } from '@modrinth/assets import { useDebugLogger } from '#ui/composables/debug-logger' -import InlineBackupCreator from '../../../../layouts/shared/content-tab/components/modals/InlineBackupCreator.vue' import BigOptionButton from '../../../base/BigOptionButton.vue' import { injectCreationFlowContext } from '../creation-flow-context' diff --git a/packages/ui/src/components/servers/ServerSetupModal.vue b/packages/ui/src/components/servers/ServerSetupModal.vue index 875b41fad..af9c11d41 100644 --- a/packages/ui/src/components/servers/ServerSetupModal.vue +++ b/packages/ui/src/components/servers/ServerSetupModal.vue @@ -82,7 +82,8 @@ const serverLoaders = ['vanilla', 'fabric', 'neoforge', 'forge', 'quilt', 'paper async function searchModpacks(query: string, limit: number = 10) { return client.labrinth.projects_v2.search({ query: query || undefined, - facets: [['project_type:modpack'], ['client_side:required'], ['server_side:required']], + new_filters: + 'project_types = "modpack" AND (client_side = "optional" OR client_side = "required") AND server_side = "required"', limit, }) } diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue index 64c3bc3c7..ef1598ef4 100644 --- a/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue +++ b/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue @@ -43,7 +43,7 @@ class="size-5 shrink-0 text-brand-orange hover:brightness-110" /> - + {{ formatMessage(messages.shiftClickHint) }} @@ -60,6 +60,7 @@ import { useInlineBackup } from '../../composables/use-inline-backup' const props = defineProps<{ backupName: string + hideShiftClickHint?: boolean }>() const emit = defineEmits<{ diff --git a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue index 684c728dd..089312b01 100644 --- a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue +++ b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue @@ -3,15 +3,10 @@
- {{ description }} - - - - {{ formatMessage(messages.unknownContentBody) }} +
+ {{ description }} + {{ formatMessage(messages.unknownContentBody) }} +
@@ -192,10 +187,6 @@ const messages = defineMessages({ id: 'content.diff-modal.updated-count', defaultMessage: '{count} updated', }, - unknownContentHeader: { - id: 'content.diff-modal.unknown-content-header', - defaultMessage: 'Unknown content', - }, unknownContentBody: { id: 'content.diff-modal.unknown-content-body', defaultMessage: diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json index 9cb5e9624..09dafa498 100644 --- a/packages/ui/src/locales/en-US/index.json +++ b/packages/ui/src/locales/en-US/index.json @@ -263,9 +263,6 @@ "content.diff-modal.unknown-content-body": { "defaultMessage": "Some content on your server could not be analyzed and may be affected by this change." }, - "content.diff-modal.unknown-content-header": { - "defaultMessage": "Unknown content" - }, "content.diff-modal.updated-count": { "defaultMessage": "{count} updated" },