Merge remote-tracking branch 'origin/cal/content-tab-rewrite-hosting' into cal/creation-flow-modals

Author: IMB11

apps/app-frontend/src/pages/instance/Mods.vue

@@ -39,6 +39,7 @@
 				:loading="loadingVersions"
 				:loading-changelog="loadingChangelog"
 				@update="handleModalUpdate"
+				@cancel="resetUpdateState"
 				@version-select="handleVersionSelect"
 				@version-hover="handleVersionHover"
 			/>
@@ -294,6 +295,7 @@ async function handleUpdate(id: string) {
 	const item = projects.value.find((p) => p.file_name === id)
 	if (!item?.has_update || !item.project?.id || !item.version?.id) return
 
+	updatingModpack.value = false
 	updatingProject.value = item
 	updatingProjectVersions.value = []
 	loadingVersions.value = true
@@ -401,6 +403,14 @@ async function handleVersionHover(version: Labrinth.Versions.v2.Version) {
 	}
 }
 
+function resetUpdateState() {
+	updatingModpack.value = false
+	updatingProject.value = null
+	updatingProjectVersions.value = []
+	loadingVersions.value = false
+	loadingChangelog.value = false
+}
+
 async function handleModalUpdate(selectedVersion: Labrinth.Versions.v2.Version) {
 	if (updatingModpack.value) {
 		if (!props.instance?.path) return
@@ -411,10 +421,7 @@ async function handleModalUpdate(selectedVersion: Labrinth.Versions.v2.Version)
 			await initProjects()
 		} finally {
 			isModpackUpdating.value = false
-			updatingModpack.value = false
-			updatingProjectVersions.value = []
-			loadingVersions.value = false
-			loadingChangelog.value = false
+			resetUpdateState()
 		}
 	} else if (updatingProject.value) {
 		const mod = updatingProject.value
@@ -423,10 +430,7 @@ async function handleModalUpdate(selectedVersion: Labrinth.Versions.v2.Version)
 
 		await updateProject(mod)
 
-		updatingProject.value = null
-		updatingProjectVersions.value = []
-		loadingVersions.value = false
-		loadingChangelog.value = false
+		resetUpdateState()
 	}
 }
 

apps/frontend/src/composables/featureFlags.ts

@@ -43,7 +43,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
 	hidePreviewBanner: false,
 	i18nDebug: false,
 	showDiscoverProjectButtons: false,
-	useV1ContentTabAPI: false,
+	useV1ContentTabAPI: true,
 } as const)
 
 export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS

packages/app-lib/src/state/instances/content.rs

@@ -235,11 +235,16 @@ fn check_modpack_update(
             let supports_game = v.game_versions.contains(game_version);
 
             // Must support the profile's loader
-            // Modpacks list "mrpack" as a loader, but also list actual loaders
-            let supports_loader = v.loaders.iter().any(|l| {
-                let l_lower = l.to_lowercase();
-                l_lower == loader_str || l_lower == "mrpack"
-            });
+            // The v2 API replaces "mrpack" with actual loaders from mrpack_loaders,
+            // but if mrpack_loaders is missing, loaders may be just ["mrpack"].
+            // In that case we can't filter by loader, so accept the version.
+            let real_loaders: Vec<_> = v
+                .loaders
+                .iter()
+                .filter(|l| l.to_lowercase() != "mrpack")
+                .collect();
+            let supports_loader = real_loaders.is_empty()
+                || real_loaders.iter().any(|l| l.to_lowercase() == loader_str);
 
             supports_game && supports_loader
         })

packages/ui/src/components/instances/ContentPageLayout.vue

@@ -303,8 +303,11 @@ async function handleToggleEnabledById(id: string, _value: boolean) {
 	const item = ctx.items.value.find((i) => ctx.getItemId(i) === id)
 	if (!item) return
 	markChanging(id)
-	await ctx.toggleEnabled(item)
-	unmarkChanging(id)
+	try {
+		await ctx.toggleEnabled(item)
+	} finally {
+		unmarkChanging(id)
+	}
 }
 
 async function bulkEnable() {

packages/ui/src/composables/content/bulk-operations.ts

@@ -20,16 +20,18 @@ export function useBulkOperation() {
 		bulkTotal.value = items.length
 		bulkProgress.value = 0
 
-		for (const item of items) {
-			await fn(item)
-			bulkProgress.value++
-			if (delayMs > 0 && bulkProgress.value < items.length) {
-				await new Promise((resolve) => setTimeout(resolve, delayMs))
+		try {
+			for (const item of items) {
+				await fn(item)
+				bulkProgress.value++
+				if (delayMs > 0 && bulkProgress.value < items.length) {
+					await new Promise((resolve) => setTimeout(resolve, delayMs))
+				}
 			}
+		} finally {
+			isBulkOperating.value = false
+			bulkOperation.value = null
 		}
-
-		isBulkOperating.value = false
-		bulkOperation.value = null
 	}
 
 	function handleBeforeUnload(e: BeforeUnloadEvent) {

packages/ui/src/pages/hosting/manage/content.vue

@@ -528,9 +528,27 @@ provideContentManager({
 	contentTypeLabel: type,
 	toggleEnabled: handleToggleEnabled,
 	deleteItem: handleDeleteItem,
-	bulkDeleteItems: useV1.value ? handleBulkDelete : undefined,
-	bulkEnableItems: useV1.value ? handleBulkEnable : undefined,
-	bulkDisableItems: useV1.value ? handleBulkDisable : undefined,
+	bulkDeleteItems: async (items) => {
+		if (useV1.value) {
+			await handleBulkDelete(items)
+		} else {
+			for (const item of items) await handleDeleteItem(item)
+		}
+	},
+	bulkEnableItems: async (items) => {
+		if (useV1.value) {
+			await handleBulkEnable(items)
+		} else {
+			for (const item of items) await handleToggleEnabled(item)
+		}
+	},
+	bulkDisableItems: async (items) => {
+		if (useV1.value) {
+			await handleBulkDisable(items)
+		} else {
+			for (const item of items) await handleToggleEnabled(item)
+		}
+	},
 	refresh: async () => {
 		await refetchContent()
 	},