StrafesNET/maps-service
4
Fork 4
Code Issues 21 Pull Requests Packages Projects Releases Wiki Activity

Ui refactor part 2 #183

Merged
itzaname merged 18 commits from feature/Ui-Rework-Pt2 into staging 2025-06-09 00:33:27 +00:00
Conversation 10 Commits 18 Files Changed 56 +2621 -2304
itzaname commented 2025-06-08 20:20:38 +00:00
Owner
Copy Link
  • Added mobile nav
  • Reworked maps page
  • Reworked mapfix/submission pages
  • Reworked submit pages
  • Reworked operation page

Comments should work but there seems to be an API side bug not saving the comment text.

- Added mobile nav - Reworked maps page - Reworked mapfix/submission pages - Reworked submit pages - Reworked operation page Comments should work but there seems to be an API side bug not saving the comment text.
itzaname added the frontend label 2025-06-08 20:20:38 +00:00
itzaname self-assigned this 2025-06-08 20:20:38 +00:00
itzaname added 11 commits 2025-06-08 20:20:38 +00:00
Rework nav to include mobile menu 98b846ccd6
Simplify container layouts and remove unused CSS causing alignment issues 06cc9ef6e9
Remove maps styles and use standard breadcrumb icon 03176ad586
Rework submit page 17af3fb0e7
Rework operation page
All checks were successful
continuous-integration/drone/push Build is passing
Details
6c42d0e9b4
Rework maps/fix submit 6cdab0e5cd
Rework submission view 269fbd7bbf
Refactor onto common base fa43379492
Add before/after image, cleanup submission references in mapfix
All checks were successful
continuous-integration/drone/push Build is passing
Details
3b022fe93d
Resolve errors warnings
All checks were successful
continuous-integration/drone/push Build is passing
Details
4645a5b5f4
Pass through profile images
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
76b97292c6
itzaname requested review from Quaternions 2025-06-08 20:20:38 +00:00
itzaname commented 2025-06-08 20:21:55 +00:00
Author
Owner
Copy Link
image.png image.png image.png image.png
<img width="1668" alt="image.png" src="attachments/fe3f1bc4-1345-4002-9eae-2833bf33e6d4"> <img width="1674" alt="image.png" src="attachments/2febd32e-412a-4662-bb44-b581e411fa3b"> <img width="1679" alt="image.png" src="attachments/8403a622-e604-4fa5-b2f3-e7d55bbd7ebf"> <img width="1664" alt="image.png" src="attachments/1bcd1f2b-eeb2-479e-a9f2-03dcc68afc47">
image.png
205 KiB
image.png
173 KiB
image.png
579 KiB
image.png
260 KiB
itzaname commented 2025-06-08 20:22:46 +00:00
Author
Owner
Copy Link
image.png image.png image.png
<img width="1675" alt="image.png" src="attachments/4c214b38-b327-4db6-805f-a775aa1f2f3b"> <img width="1673" alt="image.png" src="attachments/a6f9c4de-99da-4c39-b3f9-d5ce700632a2"> <img width="1677" alt="image.png" src="attachments/2d0e5572-0b3f-4d42-ba1b-93a5d051c47e">
image.png
283 KiB
image.png
302 KiB
image.png
322 KiB
itzaname commented 2025-06-08 20:24:21 +00:00
Author
Owner
Copy Link

I didn't really check the submission flow because I didn't have any models that would pass the initial submit stage. Lot of this was written in a haze so logic could be screwed up.

I didn't really check the submission flow because I didn't have any models that would pass the initial submit stage. Lot of this was written in a haze so logic could be screwed up.
itzaname commented 2025-06-08 20:26:40 +00:00
Author
Owner
Copy Link

Mapfix has a description, I just somehow chose the one that didn't have it set.

image.png
Mapfix has a description, I just somehow chose the one that didn't have it set. <img width="1672" alt="image.png" src="attachments/f4ca6c2d-d9dd-46d9-aa8a-578e90d49fe4">
image.png
408 KiB
itzaname added 1 commit 2025-06-08 20:34:37 +00:00
Remove vibe header comments
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
3bf7ed5b12
itzaname commented 2025-06-08 20:36:05 +00:00
Author
Owner
Copy Link

Limit feedback to logical errors or actual issues. Minor tweaks or enhancements can happen later.

Limit feedback to logical errors or actual issues. Minor tweaks or enhancements can happen later.
Quaternions requested changes 2025-06-08 22:42:03 +00:00
Dismissed
web/src/app/_components/review/ReviewButtons.tsx Outdated
@@ -0,0 +2,4 @@
import { Button, Stack } from '@mui/material';
import {MapfixInfo } from "@/app/ts/Mapfix";
import {hasRole, Roles, RolesConstants} from "@/app/ts/Roles";
import {SubmissionInfo, SubmissionStatus} from "@/app/ts/Submission"; // You'll need to create this type definition
Quaternions commented 2025-06-08 20:56:37 +00:00
Owner
Copy Link

latent ai comment

latent ai comment
itzaname commented 2025-06-08 22:42:50 +00:00
Author
Owner
Copy Link

I did in fact create the type definition

I did in fact create the type definition
itzaname marked this conversation as resolved
web/src/app/_components/review/ReviewButtons.tsx
@@ -0,0 +86,4 @@
}
}
if (hasRole(roles, RolesConstants.SubmissionReview)) {
Quaternions commented 2025-06-08 21:01:21 +00:00
Owner
Copy Link

SubmissionReview and MapfixReview are separate permissions: the logic and availability of certain actions are different on Mapfixes and Submissions. So Reviewer means SubmissionReview for submissions and MapfixReview for mapfixes, same with Upload permission.

Here's my best shot at a complete table:

When is each button visible?
Multiple buttons can be visible at once.

Action Has Role When Current Status is One of Additional Restructions
Submit Submitter UnderConstruction, ChangesRequested
Reset Submitting Submitter Submitting UpdatedAt is older than 10s
Revoke Submitter Submitted, ChangesRequested
Bypass Submit Review ChangesRequested
Accept Review Submitted
Validate Review Accepted
Reset Validating Review Validating UpdatedAt is older than 10s
Reject Review Submitted
Request Changes Review Validated, Accepted, Submitted
Upload Upload Validated
Reset Uploading Upload Uploading UpdatedAt is older than 10s
Admin Submit Review ChangesRequested Only on Submissions
SubmissionReview and MapfixReview are separate permissions: the logic and availability of certain actions are different on Mapfixes and Submissions. So Reviewer means SubmissionReview for submissions and MapfixReview for mapfixes, same with Upload permission. Here's my best shot at a complete table: When is each button visible? Multiple buttons can be visible at once. Action | Has Role | When Current Status is One of | Additional Restructions ---------------|-----------|-----------------------|--------- Submit | Submitter | UnderConstruction, ChangesRequested Reset Submitting| Submitter | Submitting | UpdatedAt is older than 10s Revoke | Submitter | Submitted, ChangesRequested Bypass Submit | Review | ChangesRequested Accept | Review | Submitted Validate | Review | Accepted Reset Validating| Review | Validating | UpdatedAt is older than 10s Reject | Review | Submitted Request Changes | Review | Validated, Accepted, Submitted Upload | Upload | Validated Reset Uploading | Upload | Uploading | UpdatedAt is older than 10s Admin Submit | Review | ChangesRequested | Only on Submissions
Quaternions marked this conversation as resolved
web/src/app/_components/review/ReviewItem.tsx Outdated
@@ -0,0 +41,4 @@
} else if (isMapfix) {
// Fields for Mapfix
fields = [
{ key: 'Submitter', label: 'Submitter' },
Quaternions commented 2025-06-08 22:01:48 +00:00
Owner
Copy Link

Inconsistent with submission fields label above label: 'Submitter ID'

Inconsistent with submission fields label above `label: 'Submitter ID'`
itzaname marked this conversation as resolved
Quaternions commented 2025-06-08 22:42:46 +00:00
Owner
Copy Link

There's also a dangling empty file located at maps-service/web/src/app/ts/Game.ts, but I couldn't leave a review comment.

There's also a dangling empty file located at `maps-service/web/src/app/ts/Game.ts`, but I couldn't leave a review comment.
👍 1
itzaname added 1 commit 2025-06-08 22:45:48 +00:00
Remove rogue vibe comment
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
43968e09c5
itzaname added 1 commit 2025-06-08 22:48:39 +00:00
Remove empty game.ts
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
9611f027ca
Quaternions commented 2025-06-09 00:03:25 +00:00
Owner
Copy Link

Operations should probably show "View mapfix" instead of "View submission" on success when creating a mapfix

Operations should probably show "View mapfix" instead of "View submission" on success when creating a mapfix
itzaname added 1 commit 2025-06-09 00:20:31 +00:00
Fix logic for buttons
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
d32892637d
itzaname added 1 commit 2025-06-09 00:21:36 +00:00
Fix submitter OCD
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
f3a12458c6
itzaname added 1 commit 2025-06-09 00:24:29 +00:00
Update status texts
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
0e3e21b1a0
Quaternions commented 2025-06-09 00:24:33 +00:00
Owner
Copy Link

We're removing the AdminSubmit action since all new maps have been submitted. Future maps will all be submitted by the creator.

We're removing the AdminSubmit action since all new maps have been submitted. Future maps will all be submitted by the creator.
itzaname requested review from Quaternions 2025-06-09 00:26:00 +00:00
itzaname added 1 commit 2025-06-09 00:29:08 +00:00
Switch operation language to "Next Step"
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
a57e53ade7
Quaternions approved these changes 2025-06-09 00:32:54 +00:00
itzaname merged commit 8f2a0b53e4 into staging 2025-06-09 00:33:27 +00:00
itzaname deleted branch feature/Ui-Rework-Pt2 2025-06-09 00:33:28 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Quaternions
Labels
Clear labels
backend
Submissions api related
 bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 frontend
Website related
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 validator
Map validation related
 wontfix
This won't be fixed
No Label frontend
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
aidan9382 CI dowoge ic3w0lf22 interpreterK itzaname Quaternions
No Assignees itzaname
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: StrafesNET/maps-service#183
Delete Branch "feature/Ui-Rework-Pt2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?