Add category and stage icons to project object list

backend/src/components/projectObject/search.ts

@@ -7,7 +7,6 @@ import {
   timePeriodFragment,
 } from '@backend/components/projectObject/index.js';
 import { getPool } from '@backend/db.js';
-import { logger } from '@backend/logging.js';
 
 import {
   ObjectsByProjectSearch,
@@ -58,6 +57,7 @@ function getProjectObjectSearchFragment({
       po.end_date AS "endDate",
       po.object_name AS "objectName",
       (object_stage).id AS "objectStage",
+      (SELECT array_agg((object_category).id) FROM app.project_object_category WHERE po.id = project_object_category.project_object_id) AS "objectCategory",
       jsonb_build_object(
         'projectId', project.id,
         'projectName', project.project_name,
@@ -252,6 +252,7 @@ export async function projectObjectSearch(input: ProjectObjectSearch) {
       "endDate",
       "objectName",
       "objectStage",
+      "objectCategory",
       project
       ${withGeometries ? sql.fragment`, search_results.geom` : sql.fragment``}
     FROM search_results

frontend/src/Layout.tsx

@@ -327,7 +327,16 @@ function AboutDialog({ open, handleClose }: { open: boolean; handleClose: () =>
 
   return (
     <Dialog open={open} onClose={handleClose}>
-      <DialogTitle css={logoStyle}>Hanna</DialogTitle>
+      <DialogTitle
+        css={css`
+          ${logoStyle} color: #4c4c4c;
+          :hover {
+            color: inherit;
+          }
+        `}
+      >
+        Hanna
+      </DialogTitle>
       <DialogContent
         css={css`
           padding: 0 auto;

frontend/src/components/Map/styles.ts

@@ -9,19 +9,19 @@ import Style, { StyleFunction, StyleLike } from 'ol/style/Style';
 import Text from 'ol/style/Text';
 
 import { theme } from '@frontend/Layout';
-import detailplanClusterPointHover from '@frontend/assets/detailPlanClusterPointHover.png';
-import detailplanClusterPoint from '@frontend/assets/detailplanClusterPoint.png';
-import investmentClusterPoint from '@frontend/assets/investmentClusterPoint.png';
-import investmentClusterPointHover from '@frontend/assets/investmentClusterPointHover.png';
-import maintenanceClusterPoint from '@frontend/assets/maintenanceClusterPoint.png';
-import maintenanceClusterPointHover from '@frontend/assets/maintenanceClusterPointHover.png';
-import projectClusterPoint from '@frontend/assets/projectClusterPoint.png';
-import projectClusterPointHover from '@frontend/assets/projectClusterPointHover.png';
-import projectClusterPointSelected from '@frontend/assets/projectClusterPointSelected.png';
-import projectObjectClusterPoint from '@frontend/assets/projectObjectClusterPoint.png';
-import projectObjectClusterPointHover from '@frontend/assets/projectObjectClusterPointHover.png';
-import projectObjectClusterPointSelected from '@frontend/assets/projectObjectClusterPointSelected.png';
-import projectObjectPointSmall from '@frontend/assets/projectObjectPointSmall.png';
+import detailplanClusterPointHover from '@frontend/assets/map/detailPlanClusterPointHover.png';
+import detailplanClusterPoint from '@frontend/assets/map/detailplanClusterPoint.png';
+import investmentClusterPoint from '@frontend/assets/map/investmentClusterPoint.png';
+import investmentClusterPointHover from '@frontend/assets/map/investmentClusterPointHover.png';
+import maintenanceClusterPoint from '@frontend/assets/map/maintenanceClusterPoint.png';
+import maintenanceClusterPointHover from '@frontend/assets/map/maintenanceClusterPointHover.png';
+import projectClusterPoint from '@frontend/assets/map/projectClusterPoint.png';
+import projectClusterPointHover from '@frontend/assets/map/projectClusterPointHover.png';
+import projectClusterPointSelected from '@frontend/assets/map/projectClusterPointSelected.png';
+import projectObjectClusterPoint from '@frontend/assets/map/projectObjectClusterPoint.png';
+import projectObjectClusterPointHover from '@frontend/assets/map/projectObjectClusterPointHover.png';
+import projectObjectClusterPointSelected from '@frontend/assets/map/projectObjectClusterPointSelected.png';
+import projectObjectPointSmall from '@frontend/assets/map/projectObjectPointSmall.png';
 import { SelectedProjectColorCode } from '@frontend/stores/map';
 
 import { ProjectType } from '@shared/schema/project/type';