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

Drive an AI Truck Through the Maps Page + Rename Status #95

Merged
Quaternions merged 3 commits from pr into staging 2025-04-05 02:49:11 +00:00
Conversation 0 Commits 3 Files Changed 8 +102 -56
8 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/submission.go
View File

@@ -14,7 +14,7 @@ const (
SubmissionStatusUploading SubmissionStatus = 6
SubmissionStatusValidated SubmissionStatus = 5
SubmissionStatusValidating SubmissionStatus = 4
SubmissionStatusAccepted SubmissionStatus = 3 // pending script review, can re-trigger validation
SubmissionStatusAcceptedUnvalidated SubmissionStatus = 3 // pending script review, can re-trigger validation
// Phase: Creation
SubmissionStatusChangesRequested SubmissionStatus = 2

8
pkg/service/submissions.go
View File

@@ -25,7 +25,7 @@ var(
model.SubmissionStatusUploading,
model.SubmissionStatusValidated,
model.SubmissionStatusValidating,
model.SubmissionStatusAccepted,
model.SubmissionStatusAcceptedUnvalidated,
}
)
@@ -276,7 +276,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a
// transaction
smap := datastore.Optional()
smap.Add("status_id", model.SubmissionStatusChangesRequested)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidated, model.SubmissionStatusAccepted, model.SubmissionStatusSubmitted}, smap)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidated, model.SubmissionStatusAcceptedUnvalidated, model.SubmissionStatusSubmitted}, smap)
}
// ActionSubmissionRevoke invokes actionSubmissionRevoke operation.
@@ -520,7 +520,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap
// transaction
smap := datastore.Optional()
smap.Add("status_id", model.SubmissionStatusValidating)
submission, err := svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusAccepted}, smap)
submission, err := svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusAcceptedUnvalidated}, smap)
if err != nil {
return err
}
@@ -579,7 +579,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act
// transaction
smap := datastore.Optional()
smap.Add("status_id", model.SubmissionStatusAccepted)
smap.Add("status_id", model.SubmissionStatusAcceptedUnvalidated)
smap.Add("status_message", "Manually forced reset")
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap)
}

4
pkg/service_internal/submissions.go
View File

@@ -16,7 +16,7 @@ var(
model.SubmissionStatusUploading,
model.SubmissionStatusValidated,
model.SubmissionStatusValidating,
model.SubmissionStatusAccepted,
model.SubmissionStatusAcceptedUnvalidated,
model.SubmissionStatusChangesRequested,
model.SubmissionStatusSubmitted,
model.SubmissionStatusUnderConstruction,
@@ -62,7 +62,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params intern
func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params internal.ActionSubmissionAcceptedParams) error {
// transaction
smap := datastore.Optional()
smap.Add("status_id", model.SubmissionStatusAccepted)
smap.Add("status_id", model.SubmissionStatusAcceptedUnvalidated)
smap.Add("status_message", params.StatusMessage)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap)
}

4
web/src/app/mapfixes/[mapfixId]/_reviewButtons.tsx
View File

@@ -109,7 +109,7 @@ export default function ReviewButtons(props: ReviewId) {
visibleButtons.push({ name: "Accept", action: "trigger-validate", color: "info", mapfixId });
visibleButtons.push({ name: "Reject", action: "reject", color: "error", mapfixId });
}
if (mapfixStatus === MapfixStatus.Accepted) {
if (mapfixStatus === MapfixStatus.AcceptedUnvalidated) {
visibleButtons.push({ name: "Validate", action: "retry-validate", color: "info", mapfixId });
}
if (mapfixStatus === MapfixStatus.Validating) {
@@ -118,7 +118,7 @@ export default function ReviewButtons(props: ReviewId) {
// this button serves the same purpose as Revoke if you are both
// the map submitter and have MapfixReview when status is Submitted
if (
[MapfixStatus.Validated, MapfixStatus.Accepted].includes(mapfixStatus!)
[MapfixStatus.Validated, MapfixStatus.AcceptedUnvalidated].includes(mapfixStatus!)
|| !is_submitter && mapfixStatus == MapfixStatus.Submitted
) {
visibleButtons.push({ name: "Request Changes", action: "request-changes", color: "error", mapfixId });

124
web/src/app/maps/[mapId]/page.tsx
View File

@@ -4,54 +4,100 @@ import { MapInfo } from "@/app/ts/Map";
import { MapImage } from "./_mapImage";
import Webpage from "@/app/_components/webpage";
import { useParams } from "next/navigation";
import Link from "next/link";
import { useState, useEffect } from "react";
import Link from "next/link";
interface Button {
name: string,
href: string,
// MUI Components
import {
Typography,
Box,
Button as MuiButton,
Card,
CardContent,
Skeleton,
ThemeProvider,
createTheme,
CssBaseline
} from "@mui/material";
interface ButtonProps {
name: string;
href: string;
}
function Button(button: Button) {
return (
<Link href={button.href}>
<button>{button.name}</button>
</Link>
)
function Button({ name, href }: ButtonProps) {
return (
<Link href={href} passHref>
<MuiButton variant="contained" color="primary" sx={{ mt: 2 }}>
{name}
</MuiButton>
</Link>
);
}
const darkTheme = createTheme({
palette: {
mode: "dark",
},
});
export default function Map() {
const {mapId} = useParams()
const { mapId } = useParams();
const [map, setMap] = useState<MapInfo | null>(null);
const [map, setMap] = useState<MapInfo | null>(null)
useEffect(() => {
async function getMap() {
const res = await fetch(`/api/maps/${mapId}`);
if (res.ok) {
setMap(await res.json());
}
}
getMap();
}, [mapId]);
useEffect(() => { // needs to be client sided since server doesn't have a session, nextjs got mad at me for exporting an async function: (https://nextjs.org/docs/messages/no-async-client-component)
async function getMap() {
const res = await fetch(`/api/maps/${mapId}`)
if (res.ok) {
setMap(await res.json())
}
}
getMap()
}, [mapId])
if (!map) {
return <Webpage>
{/* TODO: Add skeleton loading thingy ? Maybe ? (https://mui.com/material-ui/react-skeleton/) */}
</Webpage>
}
return (
<ThemeProvider theme={darkTheme}>
<CssBaseline />
<Webpage>
<p>MapID: { mapId }</p>
<p>Display Name: { map.DisplayName }</p>
<p>Creator: { map.Creator }</p>
<p>GameID: { map.GameID }</p>
<p>Release Date: { new Date(map.Date * 1000).toLocaleString() }</p>
<Button name="Submit A Mapfix For This Map" href={`/maps/${mapId}/fix`}/>
<aside className="review-area">
<section className="map-image-area">
<MapImage id={map.ID}/>
</section>
</aside>
{!map ? (
<Card>
<CardContent>
<Skeleton variant="text" width={200} height={40} />
<Skeleton variant="text" width={300} />
<Skeleton variant="rectangular" height={200} />
</CardContent>
</Card>
) : (
<Box display="flex" flexDirection={{ xs: "column", md: "row" }} gap={4}>
<Box flex={1}>
<Card>
<CardContent>
<Typography variant="h5" gutterBottom>
Map Info
</Typography>
<Typography variant="body1"><strong>Map ID:</strong> {mapId}</Typography>
<Typography variant="body1"><strong>Display Name:</strong> {map.DisplayName}</Typography>
<Typography variant="body1"><strong>Creator:</strong> {map.Creator}</Typography>
<Typography variant="body1"><strong>Game ID:</strong> {map.GameID}</Typography>
<Typography variant="body1"><strong>Release Date:</strong> {new Date(map.Date * 1000).toLocaleString()}</Typography>
<Button name="Submit A Mapfix For This Map" href={`/maps/${mapId}/fix`} />
</CardContent>
</Card>
</Box>
<Box flex={1}>
<Card>
<CardContent>
<Typography variant="h6" gutterBottom>
Map Preview
</Typography>
<MapImage id={map.ID} />
</CardContent>
</Card>
</Box>
</Box>
)}
</Webpage>
)
</ThemeProvider>
);
}

4
web/src/app/submissions/[submissionId]/_reviewButtons.tsx
View File

@@ -109,7 +109,7 @@ export default function ReviewButtons(props: ReviewId) {
visibleButtons.push({ name: "Accept", action: "trigger-validate", color: "info", submissionId });
visibleButtons.push({ name: "Reject", action: "reject", color: "error", submissionId });
}
if (submissionStatus === SubmissionStatus.Accepted) {
if (submissionStatus === SubmissionStatus.AcceptedUnvalidated) {
visibleButtons.push({ name: "Validate", action: "retry-validate", color: "info", submissionId });
}
if (submissionStatus === SubmissionStatus.Validating) {
@@ -118,7 +118,7 @@ export default function ReviewButtons(props: ReviewId) {
// this button serves the same purpose as Revoke if you are both
// the map submitter and have SubmissionReview when status is Submitted
if (
[SubmissionStatus.Validated, SubmissionStatus.Accepted].includes(submissionStatus!)
[SubmissionStatus.Validated, SubmissionStatus.AcceptedUnvalidated].includes(submissionStatus!)
|| !is_submitter && submissionStatus == SubmissionStatus.Submitted
) {
visibleButtons.push({ name: "Request Changes", action: "request-changes", color: "error", submissionId });

6
web/src/app/ts/Mapfix.ts
View File

@@ -2,7 +2,7 @@ const enum MapfixStatus {
UnderConstruction = 0,
Submitted = 1,
ChangesRequested = 2,
Accepted = 3,
AcceptedUnvalidated = 3,
Validating = 4,
Validated = 5,
Uploading = 6,
@@ -40,8 +40,8 @@ function MapfixStatusToString(mapfix_status: MapfixStatus): string {
return "VALIDATED"
case MapfixStatus.Validating:
return "VALIDATING"
case MapfixStatus.Accepted:
return "ACCEPTED"
case MapfixStatus.AcceptedUnvalidated:
return "ACCEPTED, NOT VALIDATED"
case MapfixStatus.ChangesRequested:
return "CHANGES REQUESTED"
case MapfixStatus.Submitted:

6
web/src/app/ts/Submission.ts
View File

@@ -2,7 +2,7 @@ const enum SubmissionStatus {
UnderConstruction = 0,
Submitted = 1,
ChangesRequested = 2,
Accepted = 3,
AcceptedUnvalidated = 3,
Validating = 4,
Validated = 5,
Uploading = 6,
@@ -42,8 +42,8 @@ function SubmissionStatusToString(submission_status: SubmissionStatus): string {
return "VALIDATED"
case SubmissionStatus.Validating:
return "VALIDATING"
case SubmissionStatus.Accepted:
return "ACCEPTED"
case SubmissionStatus.AcceptedUnvalidated:
return "ACCEPTED, NOT VALIDATED"
case SubmissionStatus.ChangesRequested:
return "CHANGES REQUESTED"
case SubmissionStatus.Submitted: