mirror of
https://github.com/modrinth/code.git
synced 2026-08-27 01:54:47 +00:00
feat: content tab rewrite for worlds (#5136)
* feat: base content card component * fix: tooltips + colors * feat: fix orgs * feat: base content tab internals rewrite * feat: fix invalidmodal * feat: add ContentModpackCard * fix: extract types * draft: layout * feat: unlink modal * feat: impl content tab * fix: lint * fix: toggling * temp: disable updating stuff * feat: selection v-model * feat: bulk selection * feat: mods tab rough draft * feat: use fuse.js * feat: add project combobox * clean up project combobox * feat: start install to play modal * fix: events * feat: use v-on * feat: bulk actions + fix floating action bar width * feat: figma alignments * feat: migrate toggle to tailwind * fix: row borders * feat: disabled state * feat: virtual list impl for card table based on window scroll * fix: lint * feat: virtualization + smaller contentcard items * feat: use ContentCardTable + ContentCardItems * feat: fix gap + border issues on last elm * feat: cleanup + use proper searching * fix: use TeleportOverflowMenu * fix: fallback to svg if src is invalid on avatar component * fix: storybook * feat: start on updater modal * feat: finish content updater modal * feat: i18n pass * feat: impl modal * feat(app): backend changes for content tab refactor (#5237) * feat: include_changelog=false for updater modal * fix: hash overrides * feat: update checking for modpack * feat: qa * feat: modpack content modal * fix: padding in table to match modals + tightness * fix: lint * feat: delete modal * feat: fix toggle bugs * fix: prepr * fix: duplicate messages * qa: full width search * qa: use bg-surface-1.5 * qa: animation for filter pills * qa: standardize hover colors * fix: border-[1px] is border * qa: mass de-select actually mass selecting * qa: match figma designs for floating action bar * qa: modal fixes * q: modal fixes x2 * fix: table border * qa: confirm modals * qa: modal alignment * qa: re-add stuck heading + dedupe logic * qa: dedupe virtual scrolling + remove dead components * qa: responsiveness for content table + link fixes * qa: version column link, tooltips + lint fixes * qa: instance busy protections * fix: installation freeze bug * chore: remove old mods page * refactor: deduplicate layout * chore: delete old content page(s) * qa * qa * qa * feat: sort btn - to iterate * fix: ml * feat: date added * fix: lint * fix: formatting.ts removal * feat: get_dependencies_as_content_items * qa: final QA changes * refactor: deduplicate + polish content.rs * feat: hook up content.vue with v1 * feat: hide v1 content api behind frontend feature flag * fix: query keys + copy on empty state * chore: i18n pass * feat: reimpl unlink + upload endpoint * feat: use bulk endpoints v1 * fix: lint * fix: flags * fix: responsiveness via container queries * fix: lint * qa: 1 * qa: fixes * qa: fix ssr issues with browse content * qa: header page divider * qa: modals * fix: prepr * fix: issues * fix: lint * fix: toggle v1 ff * qa: 5 * qa: delete modal copy * feat: creation flow modals (#5383) * refactor: delete content v0 usages + impl * feat: qa + fixes * feat: installing banner using state event * feat: fix modpack card bugs + filtering issues * refactor: delete backups v0 api module * feat: v1 servers GET endpoint * fix: backups * feat: swap to kyros upload v1 addon * fix: use tanstack for loader.vue * feat: finish install from discovery modal * qa: bug fixes * feat: set up installation settings * fix: lint * fix: typos * fix: bugs * fix: disable inline content * feat: content tab improvements — upload UX, installation settings, and client-only indicators Upload cancellation and navigation guard: - Add ConfirmLeaveModal that prompts when navigating away during upload - Cancel in-flight XHR uploads when user confirms leaving the page - Add beforeunload handler to warn on browser/tab close during upload - Track uploadedBytes/totalBytes in UploadState for progress display - Replace Collapsible with Transition for upload progress admonition - Show byte progress and percentage in upload banner - Clamp upload progress to prevent exceeding 100% Installation settings (server.properties): - Add KnownPropertiesFields and PropertiesFields types to Archon types - Add buildProperties() to creation flow context to collect gamemode, difficulty, seed, world type, structures, and generator settings - Pass properties through installContent on onboarding, discovery, and ServerSetupModal flows Server setup and discovery flow improvements: - Migrate ServerSetupModal from servers_v0.reinstall to content_v1.installContent - Replace loaderApiNames lookup with toApiLoader() helper - Remove eraseDataOnInstall toggle — always use soft_override: false - Simplify modpack install on discovery page to use first available version and route through creation flow modal for both onboarding and non-onboarding - Differentiate post-install navigation: content page for onboarding, loader options for existing servers Modpack update flow: - Replace updateModpack() call with installContent() using soft_override: true to support version selection in the content updater modal Client-only mod indicators: - Add environment field to AddonVersion (reuses Labrinth.Projects.v3.Environment) - Add environment to ContentItem and isClientOnly to ContentCardTableItem - Show orange TriangleAlertIcon with tooltip on client-only mods in content table - Add "Client-only" filter pill to content filtering (controlled via showClientOnlyFilter on ContentManagerContext) - Apply client-only indicators in both ContentPageLayout and ModpackContentModal Misc: - Add CLAUDE.md note about using prepr commands for lint checks - Export ConfirmLeaveModal from instances barrel * fix: piping * fix: switch content disable for linked server instances * feat: client only filter * fix: prepr * feat: hasUpdate shape update * feat: bulk update endpoint impl for content in panel * feat: websocket state impl again with new phases * fix: ws * fix: use timeout fn for sync admon + fix content card layout scroll for browsers with overflow anchor bug * fix: qa bugs * fix: lint, a11y and i18n * refactor: set up layouts folder properly * fix: linked data cache stuff + lint * feat: move installationsettings to shared layout * fix: lint * fix: issues * feat: temp fuck staging up * fix: lockfile * fix: data sync issues on loader.vue * fix: lint * Hide shader configuration files from content list (#5499) * feat: workaround search problem + split out reset * fix: qa * fix: changelog not showing on first open * fix: qa + optimistic updating improvements * fix: prepr+lint * fix: qa * feat: qa * fix: lint * fix: lint * fix: build * fix: build * fix: type errors * fix: fade and JAVA_HOME passthrough * feat: qa * feat: impl diff shit * fix: qa * fix: app qa * feat: update diff modal * fix: endpoint * fix: qa * fix: qa * fix: use bulk in modpack modal * feat: abort signal impl + fix issues * fix: diff modal trunc * feat: qa * fix: qa * feat: tooltip content tab * fix: prepr * fix: dismiss on settings btn * feat: qa * feat: dont clear handlers on disconnect * fix: lint * fix: wrangler + introduce staging-archon env file --------- Signed-off-by: Calum H. <calum@modrinth.com> Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Artyom Ezri <61311568+Artezon@users.noreply.github.com>
This commit is contained in:
co-authored by
tdgao
Artyom Ezri
parent
f0224dfff7
commit
7d92e4ec7f
@@ -36,6 +36,9 @@ pub enum CacheValueType {
|
||||
FileUpdate,
|
||||
SearchResults,
|
||||
SearchResultsV3,
|
||||
ModpackFiles,
|
||||
/// Cached list of versions for a project (without changelogs for fast loading)
|
||||
ProjectVersions,
|
||||
}
|
||||
|
||||
impl CacheValueType {
|
||||
@@ -59,6 +62,8 @@ impl CacheValueType {
|
||||
CacheValueType::FileUpdate => "file_update",
|
||||
CacheValueType::SearchResults => "search_results",
|
||||
CacheValueType::SearchResultsV3 => "search_results_v3",
|
||||
CacheValueType::ModpackFiles => "modpack_files",
|
||||
CacheValueType::ProjectVersions => "project_versions",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +87,8 @@ impl CacheValueType {
|
||||
"file_update" => CacheValueType::FileUpdate,
|
||||
"search_results" => CacheValueType::SearchResults,
|
||||
"search_results_v3" => CacheValueType::SearchResultsV3,
|
||||
"modpack_files" => CacheValueType::ModpackFiles,
|
||||
"project_versions" => CacheValueType::ProjectVersions,
|
||||
_ => CacheValueType::Project,
|
||||
}
|
||||
}
|
||||
@@ -91,7 +98,10 @@ impl CacheValueType {
|
||||
match self {
|
||||
CacheValueType::File => 30 * 24 * 60 * 60, // 30 days
|
||||
CacheValueType::FileHash => 30 * 24 * 60 * 60, // 30 days
|
||||
_ => 30 * 60, // 30 minutes
|
||||
// ModpackFiles never expire - version_id is immutable so hashes never change
|
||||
// TODO: There has to be a way to exclude this from the "Purge cache" stuff?
|
||||
CacheValueType::ModpackFiles => 100 * 365 * 24 * 60 * 60, // 100 years (effectively never)
|
||||
_ => 30 * 60, // 30 minutes
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,11 +136,27 @@ impl CacheValueType {
|
||||
| CacheValueType::LoaderManifest
|
||||
| CacheValueType::FileUpdate
|
||||
| CacheValueType::SearchResults
|
||||
| CacheValueType::SearchResultsV3 => None,
|
||||
| CacheValueType::SearchResultsV3
|
||||
| CacheValueType::ModpackFiles
|
||||
| CacheValueType::ProjectVersions => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Cached modpack file hashes for filtering content
|
||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
pub struct CachedModpackFiles {
|
||||
pub version_id: String,
|
||||
pub file_hashes: Vec<String>,
|
||||
}
|
||||
|
||||
/// Cached list of versions for a project (without changelogs for fast loading)
|
||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
pub struct CachedProjectVersions {
|
||||
pub project_id: String,
|
||||
pub versions: Vec<Version>,
|
||||
}
|
||||
|
||||
// De/serialization strategy:
|
||||
// - on serialize:
|
||||
// - in the `cache` table, save the `data_type` (variant of this value) alongside
|
||||
@@ -165,6 +191,8 @@ pub enum CacheValue {
|
||||
FileUpdate(CachedFileUpdate),
|
||||
SearchResults(SearchResults),
|
||||
SearchResultsV3(SearchResultsV3),
|
||||
ModpackFiles(CachedModpackFiles),
|
||||
ProjectVersions(CachedProjectVersions),
|
||||
ProjectV3(ProjectV3),
|
||||
}
|
||||
|
||||
@@ -349,7 +377,8 @@ pub struct Version {
|
||||
|
||||
pub name: String,
|
||||
pub version_number: String,
|
||||
pub changelog: String,
|
||||
#[serde(default)]
|
||||
pub changelog: Option<String>,
|
||||
pub changelog_url: Option<String>,
|
||||
|
||||
pub date_published: DateTime<Utc>,
|
||||
@@ -499,6 +528,8 @@ impl CacheValue {
|
||||
CacheValue::FileUpdate(_) => CacheValueType::FileUpdate,
|
||||
CacheValue::SearchResults(_) => CacheValueType::SearchResults,
|
||||
CacheValue::SearchResultsV3(_) => CacheValueType::SearchResultsV3,
|
||||
CacheValue::ModpackFiles(_) => CacheValueType::ModpackFiles,
|
||||
CacheValue::ProjectVersions(_) => CacheValueType::ProjectVersions,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -541,6 +572,8 @@ impl CacheValue {
|
||||
}
|
||||
CacheValue::SearchResults(search) => search.search.clone(),
|
||||
CacheValue::SearchResultsV3(search) => search.search.clone(),
|
||||
CacheValue::ModpackFiles(files) => files.version_id.clone(),
|
||||
CacheValue::ProjectVersions(pv) => pv.project_id.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -567,7 +600,9 @@ impl CacheValue {
|
||||
| CacheValue::LoaderManifest { .. }
|
||||
| CacheValue::FileUpdate(_)
|
||||
| CacheValue::SearchResults(_)
|
||||
| CacheValue::SearchResultsV3(_) => None,
|
||||
| CacheValue::SearchResultsV3(_)
|
||||
| CacheValue::ModpackFiles(_)
|
||||
| CacheValue::ProjectVersions(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -601,6 +636,8 @@ impl CacheValue {
|
||||
CacheValue::FileUpdate(update) => serde_json::to_value(update),
|
||||
CacheValue::SearchResults(search) => serde_json::to_value(search),
|
||||
CacheValue::SearchResultsV3(search) => serde_json::to_value(search),
|
||||
CacheValue::ModpackFiles(files) => serde_json::to_value(files),
|
||||
CacheValue::ProjectVersions(pv) => serde_json::to_value(pv),
|
||||
}
|
||||
.map_err(|err| {
|
||||
crate::ErrorKind::OtherError(format!(
|
||||
@@ -1515,6 +1552,56 @@ impl CachedEntry {
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
CacheValueType::ModpackFiles => {
|
||||
// ModpackFiles are only stored locally during modpack installation,
|
||||
// not fetched from an external API
|
||||
vec![]
|
||||
}
|
||||
CacheValueType::ProjectVersions => {
|
||||
let mut values = vec![];
|
||||
|
||||
for key in keys {
|
||||
let project_id = key.to_string();
|
||||
let url = format!(
|
||||
"{}project/{}/version?include_changelog=false",
|
||||
env!("MODRINTH_API_URL"),
|
||||
project_id
|
||||
);
|
||||
|
||||
match fetch_json::<Vec<Version>>(
|
||||
Method::GET,
|
||||
&url,
|
||||
None,
|
||||
None,
|
||||
fetch_semaphore,
|
||||
pool,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(versions) => {
|
||||
values.push((
|
||||
CacheValue::ProjectVersions(
|
||||
CachedProjectVersions {
|
||||
project_id,
|
||||
versions,
|
||||
},
|
||||
)
|
||||
.get_entry(),
|
||||
true,
|
||||
));
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!(
|
||||
"Failed to fetch versions for project {}: {:?}",
|
||||
project_id,
|
||||
e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
values
|
||||
}
|
||||
CacheValueType::SearchResultsV3 => {
|
||||
let fetch_urls = keys
|
||||
.iter()
|
||||
@@ -1628,6 +1715,12 @@ impl CachedEntry {
|
||||
CacheValueType::SearchResultsV3 => CacheValue::SearchResultsV3(
|
||||
parse(data, id, "search_results_v3")?,
|
||||
),
|
||||
CacheValueType::ModpackFiles => {
|
||||
CacheValue::ModpackFiles(parse(data, id, "modpack_files")?)
|
||||
}
|
||||
CacheValueType::ProjectVersions => CacheValue::ProjectVersions(
|
||||
parse(data, id, "project_versions")?,
|
||||
),
|
||||
};
|
||||
|
||||
Ok(value)
|
||||
@@ -1700,6 +1793,83 @@ impl CachedEntry {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Store modpack file hashes in cache
|
||||
pub async fn cache_modpack_files(
|
||||
version_id: &str,
|
||||
file_hashes: Vec<String>,
|
||||
pool: &SqlitePool,
|
||||
) -> crate::Result<()> {
|
||||
let data = CachedModpackFiles {
|
||||
version_id: version_id.to_string(),
|
||||
file_hashes,
|
||||
};
|
||||
|
||||
let entry = CachedEntry {
|
||||
id: version_id.to_string(),
|
||||
alias: None,
|
||||
expires: Utc::now().timestamp()
|
||||
+ CacheValueType::ModpackFiles.expiry(),
|
||||
type_: CacheValueType::ModpackFiles,
|
||||
data: Some(CacheValue::ModpackFiles(data)),
|
||||
};
|
||||
|
||||
Self::upsert_many(&[entry], pool).await
|
||||
}
|
||||
|
||||
/// Get modpack file hashes from cache
|
||||
pub async fn get_modpack_files(
|
||||
version_id: &str,
|
||||
pool: &SqlitePool,
|
||||
fetch_semaphore: &FetchSemaphore,
|
||||
) -> crate::Result<Option<CachedModpackFiles>> {
|
||||
let entry = Self::get(
|
||||
CacheValueType::ModpackFiles,
|
||||
version_id,
|
||||
None,
|
||||
pool,
|
||||
fetch_semaphore,
|
||||
)
|
||||
.await?;
|
||||
|
||||
if let Some(CachedEntry {
|
||||
data: Some(CacheValue::ModpackFiles(files)),
|
||||
..
|
||||
}) = entry
|
||||
{
|
||||
return Ok(Some(files));
|
||||
}
|
||||
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
/// Get versions for a project (without changelogs for fast loading)
|
||||
#[tracing::instrument(skip(pool, fetch_semaphore))]
|
||||
pub async fn get_project_versions(
|
||||
project_id: &str,
|
||||
cache_behaviour: Option<CacheBehaviour>,
|
||||
pool: &SqlitePool,
|
||||
fetch_semaphore: &FetchSemaphore,
|
||||
) -> crate::Result<Option<Vec<Version>>> {
|
||||
let entry = Self::get(
|
||||
CacheValueType::ProjectVersions,
|
||||
project_id,
|
||||
cache_behaviour,
|
||||
pool,
|
||||
fetch_semaphore,
|
||||
)
|
||||
.await?;
|
||||
|
||||
if let Some(CachedEntry {
|
||||
data: Some(CacheValue::ProjectVersions(pv)),
|
||||
..
|
||||
}) = entry
|
||||
{
|
||||
return Ok(Some(pv.versions));
|
||||
}
|
||||
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn cache_file_hash(
|
||||
|
||||
Reference in New Issue
Block a user