From 9958600121a78565243bbe5c37ea1d79fa597e96 Mon Sep 17 00:00:00 2001 From: Truman Gao <106889354+tdgao@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:56:15 -0800 Subject: [PATCH] feat: managing project versions (#4811) * start modal, working show modal * add stages and implement MultiModalStage component * add project versions context and add file button * implement add files stage * export interfaces * move MultiStageModal to /base * small update to file input * add version types to api-client * wrap version namespace under v3 * implement add details stage fields and loaders component * start create MC versions stage * implement changelog stage and bring width into a per stage concern * implement loader picker with grouping * improve grouping and sorting for loader picker * use chips component * small updaets * fix loader icon color * componentize mc version picker * initial version of shift click to select range * use newModal for markdown editor * start add dependencies stage with search * implement showing mod options in search * componentize modselect and add version/dependency relation select * hide version and dependency relation when no project selected * fix project facet search * implement api-client versions requests * fix search api request facet type to be string * fix new modal outer container scroll * implement add dependency stage * fix parse error * add placeholders * fix types * update dependency row styles * small change * fix the types on manage versions to be correct with labrinth request bodies * fix create version file parts * use draft version ref in flow and implement proper file handlling * use draft version ref for mc versions select * implement reactive modal state and conditionally disabled next buttons * ensure all data is using draftVersion ref * remove shift click to select range since it sucks * fix up add dependencies stage state/types * small fixes * implement adding dependencies connected to api calls and make adding dependencies work * add final create version button config * start create version backend call and bring versions table to project settings * set add files stage width * remove version file upload in project page * small fix * fix create version api call * implement error handling * implement mc versions search * implement showing all mc versions * small fix * implement prefill data * add success notification * add cancel button * add new dropzone file input * run pnpm run fix * add tailwind preset in ui package * polish file version row * fix modal widths * hide added versions when no versions added * implement add loaders stage * implement small chips and small fixes * implement grouping for all releases * implement new all releases grouping * implement better shift click for version select * small fixes * fix search input style * delete versions provider and start project type inferring * implement getting project type * add versions empty state, add folder up icon and pnpm run fix * implement create version in project versions table * update side nav * implement dynamic create version flow depending on project type and detected data * add id to stages and fix calling setStage not working * move added loaded out of loader picker * remove selected and detected MC versions * add loading message to dependency search and fix dependency type always being "required" * fix components in ref * fix width on dropdown * implement toggle all mc versions based on state of last in range * fix mc version text colour * do proper clean up * update loaders to use tag item * update UI to use TagItem and better match styles * handle detected data when setting primary file * add progress bar * hide progress bar for non-progress stage * add loading state on submit * properly cache dependencies projects/versions * pnpm run fix * add dragover show purple border on dropzone file input * better handle added dependencies * move versions in side nav * implement adding file type * fix api body format for file type * implement working edit existing version - working add/remove file - working edit version details * a step towards proper versions refresh * add gallery to project settings * actually figured out refresh versions * move checklist into settings page * remove editing version from version page and add button to versions table in project settings * remove edit and delete buttons from gallery in project page * add empty state messages for project page * add default scroll bar styles * implement support for new file types * remove edit from dropdown in project page versions table * redirect to settings page * move changelog to row with actions * fix overflow on added dependencies * fix redirect * update scroll styles * implement add environment stage (create and modify version not persisting environment to backend) * small style fixes * small spacing fix * small style fixes * add a flag for loading dependency projects * address PR comments * fix modrinth ui imports * use magic keys instead of window.addeventlistener * add spacing in bottom of settings page * useDebounceFn from vue * fix inconsistent stroke * persist scroll through * fix remove button * fix api fields * fix version file dropdown: hide primary option in edit mode and fix setting initial value * fix links in nags * implement skipped field for skipping steps instead of mutating stages array's elements * implement suggested dependencies components * implement suggested dependencies api call * refactor cached get project and get version calls * always hide environments * update links * set scroll in 10ms * update links * fix links pt2 * fix shadow * fix progress bar * dont include mc versions in suggested versions finder * fix text overflow styles * use tooltip * fix change version name api * implement set environment api call * delete unused vue pages * implement detected environment, edit environment step, and fix showing loaders in details for no loader projects * small fix * no loaders project wrong check * fix not having 'minecraft' loader for resource pack * implement updating existing files file type * move add minecraft loader outside try catch * add datapack to have environment * fix being able to select duplicate MC versions * remove datapack project from environment * fix version fetch * fix having detected environment not properly skipping step * only add detected data when primary file changes * fix unknown environemtn * implement gallery and versions have moved admonition * update project page for creator view * small copy update * merge fixes * pnpm run fix * fix checkmark squished * fix version type can be deselected * refactor: DI context + better typed MultistageModal * fix type import * Misc QA fixes * fix allowed file types with no project type * implement new add files stage * fix versiosn header with new pagination * hide buttons when no files for add file stage * use prettier formatter * allow signature file types * add detecting primary file * fix progress bar in firefox * fix environment not correctly being hidden/shown * remove environment missing nag * temp bring back environment page * remove delete version action from project page * replace "continue" next button label with actual next step * fix types * pnpm run fix * move supplementary files alert up and update border radius style on dropzone * copy updates * small update on version num placeholder * update placeholder * make timeout on upload routes 2 minutes * fix lint issues * run pnpm intl:extract --------- Co-authored-by: Calum H. (IMB11) --- .vscode/settings.json | 2 +- apps/app-frontend/package.json | 1 + apps/frontend/package.json | 1 + .../src/components/ui/ProjectMemberHeader.vue | 28 - .../CreateProjectVersionModal.vue | 34 + .../components/AddedDependencyRow.vue | 56 ++ .../components/LoaderPicker.vue | 121 +++ .../components/McVersionPicker.vue | 208 +++++ .../components/ModSelect.vue | 70 ++ .../SuggestedDependencies.vue | 65 ++ .../SuggestedDependency.vue | 54 ++ .../components/VersionFileRow.vue | 107 +++ .../stages/AddChangelogStage.vue | 21 + .../stages/AddDependenciesStage.vue | 283 ++++++ .../stages/AddDetailsStage.vue | 269 ++++++ .../stages/AddEnvironmentStage.vue | 11 + .../stages/AddFilesStage.vue | 240 ++++++ .../stages/AddLoadersStage.vue | 72 ++ .../stages/AddMcVersionsStage.vue | 59 ++ .../ui/create/ProjectCreateModal.vue | 8 +- apps/frontend/src/locales/en-US/index.json | 9 +- apps/frontend/src/pages/[type]/[id].vue | 42 +- .../src/pages/[type]/[id]/gallery.vue | 108 ++- apps/frontend/src/pages/[type]/[id]/index.vue | 9 + .../src/pages/[type]/[id]/settings.vue | 139 ++- .../pages/[type]/[id]/settings/gallery.vue | 810 ++++++++++++++++++ .../pages/[type]/[id]/settings/versions.vue | 366 ++++++++ .../[type]/[id]/version/[version]-new.vue | 163 ---- .../pages/[type]/[id]/version/[version].vue | 21 +- .../[type]/[id]/version/[version]/edit.vue | 8 - .../src/pages/[type]/[id]/versions.vue | 136 +-- .../providers/version/manage-version-modal.ts | 418 +++++++++ .../providers/version/stages/add-changelog.ts | 28 + .../version/stages/add-dependencies.ts | 25 + .../providers/version/stages/add-details.ts | 25 + .../version/stages/add-environment.ts | 49 ++ .../src/providers/version/stages/add-files.ts | 41 + .../providers/version/stages/add-loaders.ts | 49 ++ .../version/stages/add-mc-versions.ts | 47 + .../src/providers/version/stages/index.ts | 30 + .../api-client/src/core/abstract-client.ts | 5 + packages/api-client/src/modules/index.ts | 2 + .../api-client/src/modules/labrinth/index.ts | 1 + .../src/modules/labrinth/projects/v2.ts | 5 +- .../api-client/src/modules/labrinth/types.ts | 128 ++- .../src/modules/labrinth/versions/v3.ts | 282 ++++++ packages/assets/generated-icons.ts | 2 + packages/assets/icons/folder-up.svg | 1 + packages/assets/styles/defaults.scss | 20 + packages/moderation/src/data/nags/core.ts | 46 +- .../moderation/src/locales/en-US/index.json | 9 - packages/ui/package.json | 1 + packages/ui/src/components/base/Chips.vue | 11 +- packages/ui/src/components/base/Combobox.vue | 6 +- .../src/components/base/DropzoneFileInput.vue | 122 +++ packages/ui/src/components/base/FileInput.vue | 2 +- .../ui/src/components/base/MarkdownEditor.vue | 28 +- .../src/components/base/MultiStageModal.vue | 227 +++++ .../ui/src/components/base/Pagination.vue | 17 +- packages/ui/src/components/base/index.ts | 4 + packages/ui/src/components/modal/NewModal.vue | 2 +- .../project/ProjectPageVersions.vue | 62 +- .../ProjectSettingsEnvSelector.vue | 7 +- packages/ui/src/providers/project-page.ts | 1 + packages/ui/tailwind-preset.js | 267 ++++++ packages/ui/tailwind.config.js | 5 + packages/utils/types.ts | 11 +- packages/utils/utils.ts | 16 +- pnpm-lock.yaml | 16 +- 69 files changed, 4954 insertions(+), 585 deletions(-) create mode 100644 apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/ModSelect.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue create mode 100644 apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue create mode 100644 apps/frontend/src/pages/[type]/[id]/settings/gallery.vue create mode 100644 apps/frontend/src/pages/[type]/[id]/settings/versions.vue delete mode 100644 apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue delete mode 100644 apps/frontend/src/pages/[type]/[id]/version/[version]/edit.vue create mode 100644 apps/frontend/src/providers/version/manage-version-modal.ts create mode 100644 apps/frontend/src/providers/version/stages/add-changelog.ts create mode 100644 apps/frontend/src/providers/version/stages/add-dependencies.ts create mode 100644 apps/frontend/src/providers/version/stages/add-details.ts create mode 100644 apps/frontend/src/providers/version/stages/add-environment.ts create mode 100644 apps/frontend/src/providers/version/stages/add-files.ts create mode 100644 apps/frontend/src/providers/version/stages/add-loaders.ts create mode 100644 apps/frontend/src/providers/version/stages/add-mc-versions.ts create mode 100644 apps/frontend/src/providers/version/stages/index.ts create mode 100644 packages/api-client/src/modules/labrinth/versions/v3.ts create mode 100644 packages/assets/icons/folder-up.svg create mode 100644 packages/ui/src/components/base/DropzoneFileInput.vue create mode 100644 packages/ui/src/components/base/MultiStageModal.vue create mode 100644 packages/ui/tailwind-preset.js create mode 100644 packages/ui/tailwind.config.js diff --git a/.vscode/settings.json b/.vscode/settings.json index ec2392f5..d4d338f6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,7 +13,7 @@ }, "editor.defaultFormatter": "esbenp.prettier-vscode", "[vue]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json index d68bcf03..44439c79 100644 --- a/apps/app-frontend/package.json +++ b/apps/app-frontend/package.json @@ -58,6 +58,7 @@ "tailwindcss": "^3.4.4", "typescript": "^5.5.4", "vite": "^5.4.6", + "vue-component-type-helpers": "^3.1.8", "vue-tsc": "^2.1.6" }, "packageManager": "pnpm@9.4.0", diff --git a/apps/frontend/package.json b/apps/frontend/package.json index b0d48e94..7dfa2598 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -32,6 +32,7 @@ "tailwindcss": "^3.4.4", "typescript": "^5.4.5", "vite-svg-loader": "^5.1.0", + "vue-component-type-helpers": "^3.1.8", "vue-tsc": "^2.0.24" }, "dependencies": { diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue index 10202c12..be287995 100644 --- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue +++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue @@ -20,20 +20,6 @@ - diff --git a/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue b/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue new file mode 100644 index 00000000..680d6289 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue @@ -0,0 +1,56 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue b/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue new file mode 100644 index 00000000..78960908 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue @@ -0,0 +1,121 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue new file mode 100644 index 00000000..575617a6 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue @@ -0,0 +1,208 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/ModSelect.vue b/apps/frontend/src/components/ui/create-project-version/components/ModSelect.vue new file mode 100644 index 00000000..8041dd8f --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/ModSelect.vue @@ -0,0 +1,70 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue new file mode 100644 index 00000000..f92ed383 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue @@ -0,0 +1,65 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue new file mode 100644 index 00000000..c3e21f1c --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue @@ -0,0 +1,54 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue new file mode 100644 index 00000000..49b6a75c --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue @@ -0,0 +1,107 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue new file mode 100644 index 00000000..476863a0 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue @@ -0,0 +1,21 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue new file mode 100644 index 00000000..68305141 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue @@ -0,0 +1,283 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue new file mode 100644 index 00000000..be134c00 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue @@ -0,0 +1,269 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue new file mode 100644 index 00000000..94ab570f --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue @@ -0,0 +1,11 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue new file mode 100644 index 00000000..c4661d59 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue @@ -0,0 +1,240 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue new file mode 100644 index 00000000..15a29a01 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue @@ -0,0 +1,72 @@ + + + diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue new file mode 100644 index 00000000..d28345b7 --- /dev/null +++ b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue @@ -0,0 +1,59 @@ + + + diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue index b3679674..5c6ebba6 100644 --- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue +++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue @@ -247,13 +247,7 @@ async function createProject() { }) modal.value.hide() - await router.push({ - name: 'type-id', - params: { - type: 'project', - id: slug.value, - }, - }) + await router.push(`/project/${slug.value}/settings`) } catch (err) { addNotification({ title: formatMessage(messages.errorTitle), diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index 3936c292..1ccef00a 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -437,6 +437,9 @@ "common.yes": { "message": "Yes" }, + "create-project-version.create-modal.stage.add-files.admonition": { + "message": "Supplementary files are for supporting resources like source code, not for alternative versions or variants." + }, "create.collection.cancel": { "message": "Cancel" }, @@ -2246,12 +2249,6 @@ "project.status.archived.message": { "message": "{title} has been archived. {title} will not receive any further updates unless the author decides to unarchive the project." }, - "project.version.all-versions": { - "message": "All versions" - }, - "project.version.back-to-versions": { - "message": "Back to versions" - }, "project.versions.title": { "message": "Versions" }, diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue index 92052bda..ec395089 100644 --- a/apps/frontend/src/pages/[type]/[id].vue +++ b/apps/frontend/src/pages/[type]/[id].vue @@ -32,10 +32,7 @@ :versions="versions" :current-member="currentMember" :is-settings="route.name.startsWith('type-id-settings')" - :route-name="route.name" :set-processing="setProcessing" - :collapsed="collapsedChecklist" - :toggle-collapsed="() => (collapsedChecklist = !collapsedChecklist)" :all-members="allMembers" :update-members="updateMembers" :auth="auth" @@ -55,6 +52,7 @@ :patch-project="patchProject" :patch-icon="patchIcon" :reset-project="resetProject" + :reset-versions="resetVersions" :reset-organization="resetOrganization" :reset-members="resetMembers" :route="route" @@ -447,14 +445,34 @@
@@ -280,30 +266,27 @@ import { CalendarIcon, ContractIcon, - EditIcon, ExpandIcon, ExternalIcon, ImageIcon, - InfoIcon, LeftArrowIcon, PlusIcon, RightArrowIcon, SaveIcon, + SettingsIcon, StarIcon, TransferIcon, - TrashIcon, - UploadIcon, XIcon, } from '@modrinth/assets' import { + Admonition, + ButtonStyled, ConfirmModal, - DropArea, FileInput, injectNotificationManager, NewModal as Modal, } from '@modrinth/ui' - -import { isPermission } from '~/utils/permissions.ts' +import { useLocalStorage } from '@vueuse/core' const props = defineProps({ project: { @@ -334,6 +317,11 @@ useSeoMeta({ ogTitle: title, ogDescription: description, }) + +const hideGalleryAdmonition = useLocalStorage( + 'hideGalleryHasMovedAdmonition', + !props.project.gallery.length, +) + diff --git a/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue new file mode 100644 index 00000000..92de1e97 --- /dev/null +++ b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue @@ -0,0 +1,810 @@ +