refactor: content tab styling

Cargo.toml

@@ -113,6 +113,7 @@ indicatif = "0.18.0"
 itertools = "0.14.0"
 jemalloc_pprof = "0.8.1"
 json-patch = { version = "4.1.0", default-features = false }
+json5 = "1.3.1"
 lettre = { version = "0.11.19", default-features = false, features = [
   "aws-lc-rs",
   "builder",
@@ -224,6 +225,7 @@ tikv-jemallocator = "0.6.0"
 tokio = "1.47.1"
 tokio-stream = "0.1.17"
 tokio-util = "0.7.16"
+toml = "0.9.8"
 totp-rs = "5.7.0"
 tracing = "0.1.41"
 tracing-actix-web = { version = "0.7.19", default-features = false }

apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue

@@ -141,10 +141,11 @@
 		</div>
 	</NewModal>
 
-	<ModpackContentModal
-		ref="modpackContentModal"
-		:modpack-name="project?.name ?? ''"
-		:modpack-icon-url="project?.icon_url ?? undefined"
+	<ManagedContentModal
+		ref="managedContentModal"
+		:header="formatMessage(messages.modpackContent)"
+		:source-name="project?.name ?? ''"
+		:source-icon-url="project?.icon_url ?? undefined"
 	/>
 </template>
 
@@ -159,7 +160,7 @@ import {
 	type ContentItem,
 	defineMessages,
 	formatLoader,
-	ModpackContentModal,
+	ManagedContentModal,
 	NewModal,
 	Table,
 	type TableColumn,
@@ -269,10 +270,10 @@ function handleReport() {
 	}
 }
 
-const modpackContentModal = ref<InstanceType<typeof ModpackContentModal>>()
+const managedContentModal = ref<InstanceType<typeof ManagedContentModal>>()
 
 async function openViewContents() {
-	modpackContentModal.value?.showLoading()
+	managedContentModal.value?.showLoading()
 	try {
 		// Ensure version data is available — the useQuery may not have resolved yet
 		const versionId = modpackVersionId.value
@@ -330,10 +331,10 @@ async function openViewContents() {
 				}
 			},
 		)
-		modpackContentModal.value?.show(contentItems)
+		managedContentModal.value?.show(contentItems)
 	} catch (err) {
 		console.error('Failed to load modpack contents:', err)
-		modpackContentModal.value?.show([])
+		managedContentModal.value?.show([])
 	}
 }
 
@@ -363,6 +364,10 @@ function hide() {
 }
 
 const messages = defineMessages({
+	modpackContent: {
+		id: 'app.modal.install-to-play.managed-content.modpack-header',
+		defaultMessage: 'Modpack content',
+	},
 	installToPlay: {
 		id: 'app.modal.install-to-play.header',
 		defaultMessage: 'Install to play',

apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue

@@ -229,11 +229,11 @@
 			</div>
 		</template>
 	</NewModal>
-	<ModpackContentModal
+	<ManagedContentModal
 		ref="contentModal"
 		:header="formatMessage(messages.sharedInstanceContent)"
-		:modpack-name="preview?.name ?? ''"
-		:modpack-icon-url="preview?.iconUrl ?? undefined"
+		:source-name="preview?.name ?? ''"
+		:source-icon-url="preview?.iconUrl ?? undefined"
 	/>
 </template>
 
@@ -255,8 +255,8 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
+	ManagedContentModal,
 	MarkdownEditor,
-	ModpackContentModal,
 	NewModal,
 	Table,
 	type TableColumn,
@@ -289,7 +289,7 @@ type SharedInstanceCreator = {
 }
 
 const modal = ref<InstanceType<typeof NewModal>>()
-const contentModal = ref<InstanceType<typeof ModpackContentModal>>()
+const contentModal = ref<InstanceType<typeof ManagedContentModal>>()
 const externalFileTable = ref<HTMLElement | null>(null)
 const preview = ref<SharedInstanceInstallPreview | null>(null)
 const creator = ref<SharedInstanceCreator | null>(null)

apps/app-frontend/src/helpers/instance-content.ts

@@ -1,17 +1,10 @@
-import type {
-	ContentItem,
-	ContentModpackCardCategory,
-	ContentModpackCardProject,
-	ContentModpackCardVersion,
-	ContentOwner,
-} from '@modrinth/ui'
+import type { ContentItem, ManagedContentProject, ManagedContentVersion } from '@modrinth/ui'
 
 import {
 	get_content_items,
 	get_linked_modpack_info,
 	type LinkedModpackInfo,
 } from '@/helpers/instance'
-import { get_categories } from '@/helpers/tags.js'
 import type { CacheBehaviour } from '@/helpers/types'
 
 export type InstanceContentData = {
@@ -21,11 +14,8 @@ export type InstanceContentData = {
 }
 
 export type InstanceContentModpackData = {
-	project: ContentModpackCardProject
-	version: ContentModpackCardVersion
-	owner: ContentOwner | null
-	categories: ContentModpackCardCategory[]
-	hasUpdate: boolean
+	project: ManagedContentProject
+	version: ManagedContentVersion
 	updateVersionId: string | null
 }
 
@@ -34,19 +24,15 @@ export async function loadInstanceContentData(
 	cacheBehaviour?: CacheBehaviour,
 	onError?: (error: Error) => unknown,
 ): Promise<InstanceContentData> {
-	const [contentItems, modpackInfo, allCategories] = await Promise.all([
+	const [contentItems, modpackInfo] = await Promise.all([
 		get_content_items(path, cacheBehaviour).catch((error) => handleLoadError(error, onError)),
 		get_linked_modpack_info(path, cacheBehaviour).catch((error) => handleLoadError(error, onError)),
-		get_categories().catch((error) => handleLoadError(error, onError)),
 	])
 
 	return {
 		path,
 		contentItems: (contentItems as ContentItem[] | null | undefined) ?? null,
-		modpack: normalizeLinkedModpackInfo(
-			modpackInfo as LinkedModpackInfo | null | undefined,
-			allCategories as ContentModpackCardCategory[] | null | undefined,
-		),
+		modpack: normalizeLinkedModpackInfo(modpackInfo as LinkedModpackInfo | null | undefined),
 	}
 }
 
@@ -58,7 +44,6 @@ function handleLoadError(error: unknown, onError?: (error: Error) => unknown) {
 
 function normalizeLinkedModpackInfo(
 	modpackInfo: LinkedModpackInfo | null | undefined,
-	allCategories: ContentModpackCardCategory[] | null | undefined,
 ): InstanceContentModpackData | null {
 	if (!modpackInfo) return null
 
@@ -72,30 +57,6 @@ function normalizeLinkedModpackInfo(
 			...modpackInfo.version,
 			date_published: modpackInfo.version.date_published.toString(),
 		},
-		owner: modpackInfo.owner
-			? {
-					...modpackInfo.owner,
-					avatar_url: modpackInfo.owner.avatar_url ?? undefined,
-				}
-			: null,
-		categories: resolveLinkedModpackCategories(modpackInfo, allCategories),
-		hasUpdate: modpackInfo.has_update,
 		updateVersionId: modpackInfo.update_version_id,
 	}
 }
-
-function resolveLinkedModpackCategories(
-	modpackInfo: LinkedModpackInfo,
-	allCategories: ContentModpackCardCategory[] | null | undefined,
-) {
-	if (!allCategories || !modpackInfo.project.categories) return []
-
-	const seen = new Set<string>()
-	return allCategories.filter((category) => {
-		if (modpackInfo.project.categories.includes(category.name) && !seen.has(category.name)) {
-			seen.add(category.name)
-			return true
-		}
-		return false
-	})
-}

apps/app-frontend/src/helpers/instance.ts

@@ -5,7 +5,7 @@
  */
 import type { Labrinth } from '@modrinth/api-client'
 import type { ContentItem, ContentOwner } from '@modrinth/ui'
-import { invoke } from '@tauri-apps/api/core'
+import { convertFileSrc, invoke } from '@tauri-apps/api/core'
 
 import type { InstallJobSnapshot, SharedInstanceUpdateDiff } from './install'
 import type {
@@ -74,7 +74,11 @@ export async function get_content_items(
 	instanceId: string,
 	cacheBehaviour?: CacheBehaviour,
 ): Promise<ContentItem[]> {
-	return await invoke('plugin:instance|instance_get_content_items', { instanceId, cacheBehaviour })
+	const items = await invoke<ContentItem[]>('plugin:instance|instance_get_content_items', {
+		instanceId,
+		cacheBehaviour,
+	})
+	return adaptContentItems(items)
 }
 
 export async function refresh_content_updates(instanceId: string): Promise<void> {
@@ -111,20 +115,40 @@ export async function get_linked_modpack_content(
 	instanceId: string,
 	cacheBehaviour?: CacheBehaviour,
 ): Promise<ContentItem[]> {
-	return await invoke('plugin:instance|instance_get_linked_modpack_content', {
+	const items = await invoke<ContentItem[]>('plugin:instance|instance_get_linked_modpack_content', {
 		instanceId,
 		cacheBehaviour,
 	})
+	return adaptContentItems(items)
 }
 
 // Convert a list of dependencies into ContentItems with rich metadata
 export async function get_dependencies_as_content_items(
 	dependencies: Labrinth.Versions.v3.Dependency[],
 	cacheBehaviour?: CacheBehaviour,
 ): Promise<ContentItem[]> {
-	return await invoke('plugin:instance|instance_get_dependencies_as_content_items', {
-		dependencies,
-		cacheBehaviour,
+	const items = await invoke<ContentItem[]>(
+		'plugin:instance|instance_get_dependencies_as_content_items',
+		{
+			dependencies,
+			cacheBehaviour,
+		},
+	)
+	return adaptContentItems(items)
+}
+
+function adaptContentItems(items: ContentItem[]): ContentItem[] {
+	return items.map((item) => {
+		const embeddedMetadata = item.embedded_metadata
+		if (!embeddedMetadata?.icon_path) return item
+
+		return {
+			...item,
+			embedded_metadata: {
+				...embeddedMetadata,
+				icon_url: convertFileSrc(embeddedMetadata.icon_path),
+			},
+		}
 	})
 }
 
@@ -264,6 +288,18 @@ export async function toggle_disable_project(
 	})
 }
 
+export async function set_project_locked(
+	instanceId: string,
+	projectPath: string,
+	locked: boolean,
+): Promise<void> {
+	return await invoke('plugin:instance|instance_set_project_locked', {
+		instanceId,
+		projectPath,
+		locked,
+	})
+}
+
 // Remove a project
 export async function remove_project(instanceId: string, projectPath: string): Promise<void> {
 	return await invoke('plugin:instance|instance_remove_project', { instanceId, projectPath })

apps/app-frontend/src/helpers/types.d.ts

@@ -128,6 +128,7 @@ export type ContentSourceKind =
 
 type ContentFile = {
 	enabled: boolean
+	locked: boolean
 	source_kind?: ContentSourceKind | null
 	metadata?: {
 		project_id: string

apps/app-frontend/src/locales/ar-SA/index.json

@@ -1073,16 +1073,7 @@
   "search.filter.locked.instance.sync": {
     "message": "مزامنة مع النسخة"
   },
-  "search.filter.locked.server": {
-    "message": "يقدمها الخادم"
-  },
   "search.filter.locked.server-environment.title": {
     "message": "يمكن إضافة التعديلات **المحليه** فقط إلى نموذج الخادم"
-  },
-  "search.filter.locked.server-game-version.title": {
-    "message": "يتم توفير نسخة اللعبة من قبل الخادم"
-  },
-  "search.filter.locked.server-loader.title": {
-    "message": "يتم توفير المحمّل من قبل الخادم"
   }
 }

apps/app-frontend/src/locales/cs-CZ/index.json

@@ -965,16 +965,7 @@
   "search.filter.locked.instance.sync": {
     "message": "Synchronizováno s instancí"
   },
-  "search.filter.locked.server": {
-    "message": "Poskytováno serverem"
-  },
   "search.filter.locked.server-environment.title": {
     "message": "Pouze módy ze strany klientu mohou být přidány na server"
-  },
-  "search.filter.locked.server-game-version.title": {
-    "message": "Verze hry je poskytována serverem"
-  },
-  "search.filter.locked.server-loader.title": {
-    "message": "Loader zprostředkovává server"
   }
 }