Fix various inter-linkings of public report paths

resource/publicreport_nuisance.go

@@ -138,7 +138,7 @@ func (res *nuisanceR) Create(ctx context.Context, r *http.Request, n nuisanceFor
 	if err != nil {
 		return nil, nhttp.NewError("create nuisance report: %w", err)
 	}
-	uri, err := res.router.IDStrToURI("publicreport.ByIDGet", report.PublicID)
+	uri, err := res.router.IDStrToURI("publicreport.ByIDGetPublic", report.PublicID)
 	if err != nil {
 		return nil, nhttp.NewError("generate uri: %w", err)
 	}

resource/publicreport_water.go

@@ -124,7 +124,7 @@ func (res *waterR) Create(ctx context.Context, r *http.Request, w waterForm) (*w
 	if err != nil {
 		return nil, nhttp.NewError("Failed to save new report: %w", err)
 	}
-	uri, err := res.router.IDStrToURI("publicreport.ByIDGet", report.PublicID)
+	uri, err := res.router.IDStrToURI("publicreport.ByIDGetPublic", report.PublicID)
 	if err != nil {
 		return nil, nhttp.NewError("generate uri: %w", err)
 	}

ts/rmo/route/config.ts

@@ -133,7 +133,7 @@ const routes: RouteRecordRaw[] = [
 	},
 	{
 		component: StatusByID,
-		name: "StatusbyID",
+		name: ROUTE_NAMES.STATUS_BY_ID,
 		path: "/status/:id",
 		props: true,
 	},

ts/rmo/route/name.ts

@@ -10,6 +10,7 @@ export const ROUTE_NAMES = {
 	COMPLIANCE_SUBMIT: "compliance-submit",
 	REGISTER_NOTIFICATIONS_COMPLETE: "register-notifications-complete",
 	REVIEW_SITE: "review-site",
+	STATUS_BY_ID: "status-by-id",
 } as const;
 
 export type RouteName = (typeof ROUTE_NAMES)[keyof typeof ROUTE_NAMES];

ts/rmo/route/use.ts

@@ -41,6 +41,14 @@ export function useRoutes() {
 			},
 		};
 	};
+	const StatusByID = (publicID: string): RouteLocationRaw => {
+		return {
+			name: ROUTE_NAMES.STATUS_BY_ID,
+			params: {
+				public_id: publicID,
+			},
+		};
+	};
 	return {
 		ComplianceAddress,
 		ComplianceComplete,
@@ -52,5 +60,6 @@ export function useRoutes() {
 		ComplianceProcess,
 		ComplianceSubmit,
 		RegisterNotificationsComplete,
+		StatusByID,
 	};
 }

ts/rmo/view/RegisterNotificationsComplete.vue

@@ -144,8 +144,8 @@
 
 						<!-- Navigation Buttons -->
 						<div class="mt-4">
-							<a
-								href="/status/{{ .ReportID }}"
+							<RouterLink
+								:to="routes.StatusByID(props.id)"
 								class="btn btn-outline-primary me-2"
 							>
 								<svg
@@ -161,7 +161,7 @@
 									/>
 								</svg>
 								Check Report Status
-							</a>
+							</RouterLink>
 						</div>
 					</div>
 				</div>
@@ -171,9 +171,11 @@
 </template>
 <script setup lang="ts">
 import { formatReportID } from "@/format";
+import { useRoutes } from "@/rmo/route/use";
 
 interface Props {
 	id: string;
 }
 const props = defineProps<Props>();
+const routes = useRoutes();
 </script>

ts/rmo/view/ReportSubmitted.vue

@@ -222,7 +222,10 @@
 								You can check the status of your report at any time using your
 								Report ID.
 							</p>
-							<RouterLink :to="`/status/${id}`" class="btn btn-outline-primary">
+							<RouterLink
+								:to="routes.StatusByID(props.id)"
+								class="btn btn-outline-primary"
+							>
 								Check Status
 							</RouterLink>
 						</div>