[WIP] Regulation Page - Hardcoded data #365
Conversation
There was a problem hiding this comment.
I vote to rename this accessor to regulatoryAccessor.ts
There was a problem hiding this comment.
@Kameron-Heyen @zlannin we need to drop the word "regulatory", actually. The use of "regulatory" came from a bit of a misunderstanding. We're getting information on an overylay, which could be regulatory, administrative, etc.
| import axios from "axios"; | ||
|
|
||
| // TODO: Wire to API when route is created | ||
| export const getRegulationDetails = async (areaUuid: string) => { |
There was a problem hiding this comment.
| export const getRegulationDetails = async (areaUuid: string) => { | |
| export const getRegulatoryDetails = async (areaUuid: string) => { |
| .water-rights-card, .site-card { | ||
|
|
||
| .water-rights-card, .site-card, .regulation-card { |
There was a problem hiding this comment.
| .water-rights-card, .site-card, .regulation-card { | |
| .water-rights-card, .site-card, .regulatory-card { |
There was a problem hiding this comment.
any reason why we're not just using a .detail-card class, instead of giving the same class three (soon four) aliases?
There was a problem hiding this comment.
update parent folder from regulation to regulatory
|
|
||
| type ActiveTabType = "right" | "regulatory"; | ||
|
|
||
| interface RegulationDetailsPageContextState { |
There was a problem hiding this comment.
| interface RegulationDetailsPageContextState { | |
| interface RegulatoryDetailsPageContextState { |
| import { UseQueryOptionsParameter } from "../../HelperTypes"; | ||
| import { RegulatoryOverlayInfoListItem } from "@data-contracts"; | ||
|
|
||
| export function useRegulationDetails(areaUuid: string | undefined) { |
There was a problem hiding this comment.
| export function useRegulationDetails(areaUuid: string | undefined) { | |
| export function useRegulatoryDetails(areaUuid: string | undefined) { |
|
|
||
| export function useRegulationDetails(areaUuid: string | undefined) { | ||
| return useQuery( | ||
| ["regulation.Details", areaUuid], |
There was a problem hiding this comment.
| ["regulation.Details", areaUuid], | |
| ["regulatory.Details", areaUuid], |
| import { Layout } from '../components/details-page/regulation/Layout'; | ||
| import {RegulationDetailsProvider} from "../components/details-page/regulation/Provider"; | ||
|
|
||
| function RegulationDetailsPage() { |
There was a problem hiding this comment.
| function RegulationDetailsPage() { | |
| function RegulatoryDetailsPage() { |
| @@ -74,6 +75,7 @@ function App({ msalInstance }: AppProps) { | |||
| <Route path="details" element={<DetailLayout />}> | |||
| <Route path="site/:id" element={<SiteDetailsPage />} /> | |||
| <Route path="right/:id" element={<WaterRightDetailsPage />} /> | |||
| <Route path="regulation/:id" element={<RegulationDetailsPage />} /> | |||
There was a problem hiding this comment.
| <Route path="regulation/:id" element={<RegulationDetailsPage />} /> | |
| <Route path="overlay/:id" element={<OverlayDetailsPage />} /> |
| WaterRightInfoListItem, | ||
| } from "@data-contracts"; | ||
|
|
||
| type Query<T> = Pick< |
There was a problem hiding this comment.
opportunity for a shared type?
| useSiteDigestMapPopup(); | ||
| useMapLegend(); | ||
|
|
||
| if (locationsQuery.isLoading || !locationsQuery.data) return null; |
There was a problem hiding this comment.
IMO you should always avoid these types of one liners. It's tougher to see that this is a function exit/jump (a return, a throw, a break, a continue) at a glance, and it's harder to get a breakpoint in there if you ever want to step through.
There was a problem hiding this comment.
| if (locationsQuery.isLoading || !locationsQuery.data) return null; | |
| if (locationsQuery.isLoading || !locationsQuery.data) { | |
| return null; | |
| } |
| return beneficialUses.map((use) => | ||
| use !== beneficialUses[beneficialUses.length - 1] ? `${use}, ` : use, | ||
| ); | ||
| }; |
There was a problem hiding this comment.
Let's figure out a way to share functions like these if they're just gonna be copy/pasted all over.
Having said that, is this the same as:
beneficialUses.join(', ');?
| @@ -0,0 +1,32 @@ | |||
| /* | |||
| This file is largely duped from other existing maps in site and water rights pages. Potential opportunity to create a more reusable component for this. | |||
There was a problem hiding this comment.
It's super hard to look at this PR and give good feedback with so much stuff copy/pasted over at once. I can't tell what is something you put thought into (and should be scrutinized) and what is some stuff that you didn't write, but just copy/pasted. The backlog we started from wasn't the best, but we'll have a better one moving forward. Should be easier to task things out into reasonable chunks.
No description provided.