diff --git a/frontend/e2e/pages/dashboard.ts b/frontend/e2e/pages/dashboard.ts
index f463e272..f66f6875 100644
--- a/frontend/e2e/pages/dashboard.ts
+++ b/frontend/e2e/pages/dashboard.ts
@@ -38,11 +38,13 @@ export const dashboard_page = async (page: Page) => {
await expect(page.getByAltText('Information image')).toBeVisible()
await expect(page.getByText('Learn more')).toBeVisible()
- await expect(page.getByRole('link', { name: 'Legislation' })).toBeVisible()
await expect(
- page.getByRole('link', { name: 'Process and procedures' }),
+ page.getByRole('link', { name: 'Legislation', exact: true }),
).toBeVisible()
await expect(
- page.getByRole('link', { name: 'Compliance and enforcement' }),
+ page.getByRole('link', { name: 'Process and procedures', exact: true }),
+ ).toBeVisible()
+ await expect(
+ page.getByRole('link', { name: 'Compliance and enforcement', exact: true }),
).toBeVisible()
}
diff --git a/frontend/e2e/pages/map.ts b/frontend/e2e/pages/map.ts
index d11ef025..3f5dd630 100644
--- a/frontend/e2e/pages/map.ts
+++ b/frontend/e2e/pages/map.ts
@@ -92,7 +92,7 @@ export const map_page = async (page: Page) => {
await autocompleteOption.click()
// Search input
- await expect(searchInput).toHaveValue('CITY OF VICTORIA')
+ await expect(searchInput).toHaveValue('City Of Victoria')
// Search results should be expanded
await expect(page.getByText('Search Results')).toBeVisible()
diff --git a/frontend/src/assets/homepage-info.jpg b/frontend/src/assets/homepage-info.jpg
index 67d0978e..53dd769b 100644
Binary files a/frontend/src/assets/homepage-info.jpg and b/frontend/src/assets/homepage-info.jpg differ
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index c645c2e3..87d6ae71 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -100,9 +100,19 @@ export default function Header() {
alt="Logo"
/>
-
- Organics Info
-
+ buttonClicked('/')}
+ >
+
+ Organics Info
+
+
{mdMatches && (
diff --git a/frontend/src/constants/data-layers.ts b/frontend/src/constants/data-layers.ts
index 304eb640..2baf4796 100644
--- a/frontend/src/constants/data-layers.ts
+++ b/frontend/src/constants/data-layers.ts
@@ -11,6 +11,43 @@ const BASE_URL = 'https://openmaps.gov.bc.ca/geo/pub'
* @see https://github.com/bcgov/nr-epd-organics-info/issues/204
*/
export const DATA_LAYER_GROUPS: DataLayerGroup[] = [
+ {
+ name: 'Agricultural Land Reserve',
+ layers: [
+ {
+ name: 'ALC Agricultural Land Reserve Lines',
+ url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_BOUNDARY_LINES_SVW/ows`,
+ layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_BOUNDARY_LINES_SVW',
+ styles: '1',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/b23a6be5-c7b0-4a12-a598-bb369a159be1',
+ },
+ {
+ name: 'ALC Agricultural Land Reserve Polygons',
+ url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_POLYS/ows`,
+ layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_POLYS',
+ styles: '2',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/92e17599-ac8a-47c8-877c-107768cb373c',
+ },
+ {
+ name: 'ALR Applications (Spatial View)',
+ url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_APPLICATIONS_SVW/ows`,
+ layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_APPLICATIONS_SVW',
+ styles: '4758',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/48165eb9-cd44-4c3a-a178-ab5c0b9d9ebc',
+ },
+ {
+ name: 'ALR Notices of Intent (Spatial View)',
+ url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_NOI_SV/ows`,
+ layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_NOI_SV',
+ styles: '4764',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/43e45e82-b5d8-46a3-bb28-f2b7223423fc',
+ },
+ ],
+ },
{
name: 'Aquifers and Water Wells',
layers: [
@@ -23,115 +60,86 @@ export const DATA_LAYER_GROUPS: DataLayerGroup[] = [
'https://catalogue.data.gov.bc.ca/dataset/099d69c5-1401-484d-9e19-c121ccb7977c',
},
{
- name: 'Aquifers - Vulnerability',
+ name: 'Aquifers - Subtype',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_AQUIFERS_CLASSIFICATION_SVW/ows`,
layers: 'pub:WHSE_WATER_MANAGEMENT.GW_AQUIFERS_CLASSIFICATION_SVW',
- styles: '1778',
+ styles: '5653',
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/099d69c5-1401-484d-9e19-c121ccb7977c',
},
{
- name: 'Aquifers - Subtype',
+ name: 'Aquifers - Vulnerability',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_AQUIFERS_CLASSIFICATION_SVW/ows`,
layers: 'pub:WHSE_WATER_MANAGEMENT.GW_AQUIFERS_CLASSIFICATION_SVW',
- styles: '5653',
+ styles: '1778',
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/099d69c5-1401-484d-9e19-c121ccb7977c',
},
{
- name: 'Sea Water Intrusion Vulnerability - Outlined',
+ name: 'Groundwater Wells – All',
+ url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_WATER_WELLS_WRBC_SVW/ows`,
+ layers: 'pub:WHSE_WATER_MANAGEMENT.GW_WATER_WELLS_WRBC_SVW',
+ styles: '1833',
+ webUrl: 'https://catalogue.data.gov.bc.ca/dataset/groundwater-wells',
+ },
+ {
+ name: 'Sea Water Intrusion Vulnerability - Bedrock Aquifers',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP/ows`,
layers: 'pub:WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP',
- styles: '9499',
+ styles: '9501',
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/cc4b73c7-c16c-48eb-a069-642cafb5dec5',
},
{
- name: 'Sea Water Intrusion Vulnerability - Unconsolidated Aquifers',
+ name: 'Sea Water Intrusion Vulnerability - Outlined',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP/ows`,
layers: 'pub:WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP',
- styles: '9500',
+ styles: '9499',
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/cc4b73c7-c16c-48eb-a069-642cafb5dec5',
},
{
- name: 'Sea Water Intrusion Vulnerability - Bedrock Aquifers',
+ name: 'Sea Water Intrusion Vulnerability - Unconsolidated Aquifers',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP/ows`,
layers: 'pub:WHSE_WATER_MANAGEMENT.GW_AQUIFER_VULN_SW_INTRUSN_SP',
- styles: '9501',
+ styles: '9500',
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/cc4b73c7-c16c-48eb-a069-642cafb5dec5',
},
- {
- name: 'Groundwater Wells – All',
- url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.GW_WATER_WELLS_WRBC_SVW/ows`,
- layers: 'pub:WHSE_WATER_MANAGEMENT.GW_WATER_WELLS_WRBC_SVW',
- styles: '1833',
- webUrl: 'https://catalogue.data.gov.bc.ca/dataset/groundwater-wells',
- },
],
},
{
- name: 'Water Licensing',
+ name: 'Crown Lands',
layers: [
{
- name: 'Water Rights - Applications',
- url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_APPLICTNS_SV/ows`,
- layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_APPLICTNS_SV',
- styles: '7261',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/f3a53d7f-da09-4726-ac83-f0032e4bd490',
- },
- {
- name: 'Water Rights - Licences',
- url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_LICENCES_SV/ows`,
- layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_LICENCES_SV',
- styles: '1830',
+ name: 'PMBC Parcel Cadastre – Crown Provincial',
+ url: `${BASE_URL}/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW/ows`,
+ layers: 'pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW',
+ styles: '5899', // Provincial Crown Lands
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/5549cae0-c2b1-4b96-9777-529d9720803c',
+ 'https://catalogue.data.gov.bc.ca/dataset/4cf233c2-f020-4f7a-9b87-1923252fbc24',
},
],
},
{
- name: 'Watersheds',
+ name: 'Freshwater Atlas',
layers: [
{
- name: 'Community Watersheds',
- url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_COMMUNITY_WS_PUB_SVW/ows`,
- layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_COMMUNITY_WS_PUB_SVW',
- styles: '15',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/bc57faf7-23e4-43fe-918a-e999936dbafa',
- },
- {
- name: 'Major Watersheds - Outlined',
- url: `${BASE_URL}/WHSE_BASEMAPPING.BC_MAJOR_WATERSHEDS/ows`,
- layers: 'pub:WHSE_BASEMAPPING.BC_MAJOR_WATERSHEDS',
- styles: '727',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/8ded3f62-e647-4f00-a115-10753419f466',
- },
- {
- name: 'FWA - Watershed Groups - Outlined',
- url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_WATERSHED_GROUPS_POLY/ows`,
- layers: 'pub:WHSE_BASEMAPPING.FWA_WATERSHED_GROUPS_POLY',
- styles: '722',
+ name: 'FWA Lakes',
+ url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_LAKES_POLY/ows`,
+ layers: 'pub:WHSE_BASEMAPPING.FWA_LAKES_POLY',
+ styles: '705_706_707',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/51f20b1a-ab75-42de-809d-bf415a0f9c62',
+ 'https://catalogue.data.gov.bc.ca/dataset/freshwater-atlas-lakes',
},
{
- name: 'FWA - Named Watersheds - Outlined',
- url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_NAMED_WATERSHEDS_POLY/ows`,
- layers: 'pub:WHSE_BASEMAPPING.FWA_NAMED_WATERSHEDS_POLY',
- styles: '717',
+ name: 'FWA Linear Boundaries',
+ url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_LINEAR_BOUNDARIES_SP/ows`,
+ layers: 'pub:WHSE_BASEMAPPING.FWA_LINEAR_BOUNDARIES_SP',
+ styles: '690',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/ea63ea04-eab0-4b83-8729-f8a93ac688a1',
+ 'https://catalogue.data.gov.bc.ca/dataset/freshwater-atlas-linear-boundaries',
},
- ],
- },
- {
- name: 'Freshwater Atlas',
- layers: [
{
name: 'FWA Stream Network',
url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_STREAM_NETWORKS_SP/ows`,
@@ -148,75 +156,24 @@ export const DATA_LAYER_GROUPS: DataLayerGroup[] = [
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/freshwater-atlas-wetlands',
},
- {
- name: 'FWA Linear Boundaries',
- url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_LINEAR_BOUNDARIES_SP/ows`,
- layers: 'pub:WHSE_BASEMAPPING.FWA_LINEAR_BOUNDARIES_SP',
- styles: '690',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/freshwater-atlas-linear-boundaries',
- },
- {
- name: 'FWA Lakes',
- url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_LAKES_POLY/ows`,
- layers: 'pub:WHSE_BASEMAPPING.FWA_LAKES_POLY',
- styles: '705_706_707',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/freshwater-atlas-lakes',
- },
],
},
{
- name: 'Agricultural Land Reserve',
+ name: 'Indian Reserves',
layers: [
{
- name: 'ALC Agricultural Land Reserve Polygons',
- url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_POLYS/ows`,
- layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_POLYS',
- styles: '2',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/92e17599-ac8a-47c8-877c-107768cb373c',
- },
- {
- name: 'ALC Agricultural Land Reserve Lines',
- url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_BOUNDARY_LINES_SVW/ows`,
- layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_BOUNDARY_LINES_SVW',
- styles: '1',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/b23a6be5-c7b0-4a12-a598-bb369a159be1',
- },
- {
- name: 'ALR Notices of Intent (Spatial View)',
- // No public WMS URL for this layer
- url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_NOI_SV/ows`,
- layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_NOI_SV',
- styles: '4764',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/43e45e82-b5d8-46a3-bb28-f2b7223423fc',
- },
- {
- name: 'ALR Applications (Spatial View)',
- // No public WMS URL for this layer
- url: `${BASE_URL}/WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_APPLICATIONS_SVW/ows`,
- layers: 'pub:WHSE_LEGAL_ADMIN_BOUNDARIES.OATS_ALR_APPLICATIONS_SVW',
- styles: '4758',
+ name: 'Indian Reserves Including Band Names',
+ url: 'https://openmaps.gov.bc.ca/geo/pub/WHSE_ADMIN_BOUNDARIES.ADM_INDIAN_RESERVES_BANDS_SP/ows',
+ layers: 'pub:WHSE_ADMIN_BOUNDARIES.ADM_INDIAN_RESERVES_BANDS_SP',
+ styles: '381_382',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/48165eb9-cd44-4c3a-a178-ab5c0b9d9ebc',
+ 'https://catalogue.data.gov.bc.ca/dataset/indian-reserves-and-band-names-administrative-boundaries',
},
],
},
{
name: 'Water License Points of Diversion',
layers: [
- {
- name: 'Water Licence Points of Diversion – Springs',
- url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_POD_LICENCE_SOURCES_SP/ows`,
- layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_POD_LICENCE_SOURCES_SP',
- styles: '1836',
- className: 'wl-pod-springs',
- webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/4bc1cf40-3507-4591-bd89-82e8809440b5',
- },
{
name: 'Water Licence Points of Diversion – Drinking Water Sources',
url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_BC_POD_DRINKNG_SOURCES_SP/ows`,
@@ -226,44 +183,85 @@ export const DATA_LAYER_GROUPS: DataLayerGroup[] = [
webUrl:
'https://catalogue.data.gov.bc.ca/dataset/bd3566ed-1101-473b-a3ec-5daefa1fe2c1',
},
+ {
+ name: 'Water Licence Points of Diversion – Springs',
+ url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_POD_LICENCE_SOURCES_SP/ows`,
+ layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_POD_LICENCE_SOURCES_SP',
+ styles: '1836',
+ className: 'wl-pod-springs',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/4bc1cf40-3507-4591-bd89-82e8809440b5',
+ },
],
},
{
- name: 'Wildlife Species at Risk',
+ name: 'Water Licensing',
layers: [
{
- name: 'Critical Habitat for Federally-Listed Species at Risk',
- url: `${BASE_URL}/WHSE_WILDLIFE_MANAGEMENT.WCP_CRITICAL_HABITAT_SP/ows`,
- layers: 'pub:WHSE_WILDLIFE_MANAGEMENT.WCP_CRITICAL_HABITAT_SP',
- styles: '4883',
+ name: 'Water Rights - Applications',
+ url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_APPLICTNS_SV/ows`,
+ layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_APPLICTNS_SV',
+ styles: '7261',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/076b8c98-a3f1-429b-9dae-03faed0c6aef',
+ 'https://catalogue.data.gov.bc.ca/dataset/f3a53d7f-da09-4726-ac83-f0032e4bd490',
+ },
+ {
+ name: 'Water Rights - Licences',
+ url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_LICENCES_SV/ows`,
+ layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_WATER_RIGHTS_LICENCES_SV',
+ styles: '1830',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/5549cae0-c2b1-4b96-9777-529d9720803c',
},
],
},
{
- name: 'Crown Lands',
+ name: 'Watersheds',
layers: [
{
- name: 'PMBC Parcel Cadastre – Crown Provincial',
- url: `${BASE_URL}/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW/ows`,
- layers: 'pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW',
- styles: '5899', // Provincial Crown Lands
+ name: 'Community Watersheds',
+ url: `${BASE_URL}/WHSE_WATER_MANAGEMENT.WLS_COMMUNITY_WS_PUB_SVW/ows`,
+ layers: 'pub:WHSE_WATER_MANAGEMENT.WLS_COMMUNITY_WS_PUB_SVW',
+ styles: '15',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/4cf233c2-f020-4f7a-9b87-1923252fbc24',
+ 'https://catalogue.data.gov.bc.ca/dataset/bc57faf7-23e4-43fe-918a-e999936dbafa',
+ },
+ {
+ name: 'FWA - Named Watersheds - Outlined',
+ url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_NAMED_WATERSHEDS_POLY/ows`,
+ layers: 'pub:WHSE_BASEMAPPING.FWA_NAMED_WATERSHEDS_POLY',
+ styles: '717',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/ea63ea04-eab0-4b83-8729-f8a93ac688a1',
+ },
+ {
+ name: 'FWA - Watershed Groups - Outlined',
+ url: `${BASE_URL}/WHSE_BASEMAPPING.FWA_WATERSHED_GROUPS_POLY/ows`,
+ layers: 'pub:WHSE_BASEMAPPING.FWA_WATERSHED_GROUPS_POLY',
+ styles: '722',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/51f20b1a-ab75-42de-809d-bf415a0f9c62',
+ },
+ {
+ name: 'Major Watersheds - Outlined',
+ url: `${BASE_URL}/WHSE_BASEMAPPING.BC_MAJOR_WATERSHEDS/ows`,
+ layers: 'pub:WHSE_BASEMAPPING.BC_MAJOR_WATERSHEDS',
+ styles: '727',
+ webUrl:
+ 'https://catalogue.data.gov.bc.ca/dataset/8ded3f62-e647-4f00-a115-10753419f466',
},
],
},
{
- name: 'Indian Reserves',
+ name: 'Wildlife Species at Risk',
layers: [
{
- name: 'Indian Reserves Including Band Names',
- url: 'https://openmaps.gov.bc.ca/geo/pub/WHSE_ADMIN_BOUNDARIES.ADM_INDIAN_RESERVES_BANDS_SP/ows',
- layers: 'pub:WHSE_ADMIN_BOUNDARIES.ADM_INDIAN_RESERVES_BANDS_SP',
- styles: '381_382',
+ name: 'Critical Habitat for Federally-Listed Species at Risk',
+ url: `${BASE_URL}/WHSE_WILDLIFE_MANAGEMENT.WCP_CRITICAL_HABITAT_SP/ows`,
+ layers: 'pub:WHSE_WILDLIFE_MANAGEMENT.WCP_CRITICAL_HABITAT_SP',
+ styles: '4883',
webUrl:
- 'https://catalogue.data.gov.bc.ca/dataset/indian-reserves-and-band-names-administrative-boundaries',
+ 'https://catalogue.data.gov.bc.ca/dataset/076b8c98-a3f1-429b-9dae-03faed0c6aef',
},
],
},
diff --git a/frontend/src/features/omrr/omrr-utils.ts b/frontend/src/features/omrr/omrr-utils.ts
index 1ffa85e4..7b9ae80a 100644
--- a/frontend/src/features/omrr/omrr-utils.ts
+++ b/frontend/src/features/omrr/omrr-utils.ts
@@ -25,7 +25,11 @@ const authorizationStatusFilter = (item: OmrrData, status: string): boolean => {
export function filterByAuthorizationStatus(state: OmrrSliceState): OmrrData[] {
const { allResults, searchBy } = state
- return allResults.filter((item) => authorizationStatusFilter(item, searchBy))
+ return allResults
+ .filter((item) => authorizationStatusFilter(item, searchBy))
+ .sort((a, b) => {
+ return a['Regulated Party'].localeCompare(b['Regulated Party'])
+ })
}
type OmrrSortOptions = MatchSorterOptions & {
@@ -265,6 +269,13 @@ export function convertData(data: OmrrData[]): OmrrData[] {
: undefined,
// Extract postal code from the address if possible
'Postal Code': extractPostalCode(address),
+ // make it from all caps to title case
+ 'Regulated Party': original['Regulated Party']
+ ?.trim()
+ .toLowerCase()
+ .split(' ')
+ .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(' '),
}
// Remove null/undefined values, and convert booleans
diff --git a/frontend/src/pages/dashboard/InfoSection.tsx b/frontend/src/pages/dashboard/InfoSection.tsx
index 9f479970..0b12e1f5 100644
--- a/frontend/src/pages/dashboard/InfoSection.tsx
+++ b/frontend/src/pages/dashboard/InfoSection.tsx
@@ -69,7 +69,7 @@ const styles = {
},
image: {
borderRadius: '8px',
- maxWidth: 'calc(100vw - 64px)',
+ maxHeight: '40vh',
},
button: {
fontWeight: 700,
@@ -89,7 +89,7 @@ export function InfoSection() {
The Organic Matter Recycling Regulation of B.C.
@@ -120,7 +120,7 @@ export function InfoSection() {
- Better protect of human and environment health
+ Better protection of human and environmental health
Increase engagement with Indigenous communities
diff --git a/frontend/src/pages/dashboard/LearnMoreCard.tsx b/frontend/src/pages/dashboard/LearnMoreCard.tsx
index 6de04c1d..b0246951 100644
--- a/frontend/src/pages/dashboard/LearnMoreCard.tsx
+++ b/frontend/src/pages/dashboard/LearnMoreCard.tsx
@@ -1,6 +1,7 @@
import {
Box,
Card,
+ CardActionArea,
CardActions,
CardContent,
CardHeader,
@@ -82,31 +83,38 @@ export function LearnMoreCard({
return (
-
-
-
-
-
- {actions}
- {divider && }
+
+
+
+
+
+
+ {actions}
+ {divider && }
+
)
diff --git a/frontend/src/pages/dashboard/LearnMoreSection.tsx b/frontend/src/pages/dashboard/LearnMoreSection.tsx
index 6a0400dd..3874b932 100644
--- a/frontend/src/pages/dashboard/LearnMoreSection.tsx
+++ b/frontend/src/pages/dashboard/LearnMoreSection.tsx
@@ -43,20 +43,20 @@ export function LearnMoreSection() {