Added owner to project search parameters

Tampere · Mar 27, 2023 · 899093a · 899093a
1 parent 66b1abf
commit 899093a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/backend/src/components/project/search.ts b/backend/src/components/project/search.ts
@@ -55,11 +55,19 @@ function orderByFragment(input: ProjectSearch) {
   return sql.fragment`ORDER BY project.start_date DESC`;
 }
 
+function ownerFragment(input: ProjectSearch) {
+  if (input.owners.length === 0) {
+    return sql.fragment`true`;
+  }
+  return sql.fragment`owner = ANY(${sql.array(input.owners, 'text')})`;
+}
+
 export function getFilterFragment(input: ProjectSearch) {
   return sql.fragment`
       AND ${textSearchFragment(input.text)}
       AND ${mapExtentFragment(input)}
       AND ${timePeriodFragment(input)}
+      AND ${ownerFragment(input)}
       AND ${
         input.lifecycleStates && input.lifecycleStates?.length > 0
           ? sql.fragment`(project.lifecycle_state).id = ANY(${sql.array(

diff --git a/backend/src/components/user/index.ts b/backend/src/components/user/index.ts
@@ -9,6 +9,7 @@ const userSelectFragment = sql.fragment`
 export async function getAllUsers() {
   const users = await getPool().many(sql.type(userSchema)`
     ${userSelectFragment}
+    ORDER BY name ASC
   `);
   return users;
 }

diff --git a/frontend/src/stores/search/project.ts b/frontend/src/stores/search/project.ts
@@ -4,32 +4,7 @@ import { focusAtom } from 'jotai-optics';
 
 import { mapOptions } from '@frontend/components/Map/mapOptions';
 
-import { MapSearch, Period } from '@shared/schema/project';
-
-interface Filters {
-  investmentProject?: {
-    committees?: string[];
-  };
-  detailplanProject?: {
-    planningZones?: string[];
-  };
-}
-
-interface ProjectSearch {
-  text: string;
-  dateRange: Period;
-  lifecycleStates: string[];
-  map: MapSearch;
-  includeWithoutGeom: boolean;
-  filters: {
-    investmentProject?: {
-      committees?: string[];
-    };
-    detailplanProject?: {
-      planningZones?: string[];
-    };
-  };
-}
+import { ProjectSearch } from '@shared/schema/project';
 
 export const projectSearchParamAtom = atom<ProjectSearch>({
   text: '',
@@ -38,6 +13,7 @@ export const projectSearchParamAtom = atom<ProjectSearch>({
     endDate: dayjs().endOf('year').format('YYYY-MM-DD'),
   },
   lifecycleStates: [],
+  owners: [],
   map: {
     zoom: mapOptions.tre.defaultZoom,
     extent: mapOptions.tre.extent,
@@ -51,6 +27,7 @@ export const dateRangeAtom = focusAtom(projectSearchParamAtom, (o) => o.prop('da
 export const lifecycleStatesAtom = focusAtom(projectSearchParamAtom, (o) =>
   o.prop('lifecycleStates')
 );
+export const ownersAtom = focusAtom(projectSearchParamAtom, (o) => o.prop('owners'));
 export const includeWithoutGeomAtom = focusAtom(projectSearchParamAtom, (o) =>
   o.prop('includeWithoutGeom')
 );

diff --git a/frontend/src/views/Project/SearchControls.tsx b/frontend/src/views/Project/SearchControls.tsx
@@ -19,12 +19,14 @@ import { useState } from 'react';
 import { CodeSelect } from '@frontend/components/forms/CodeSelect';
 import { DateRange } from '@frontend/components/forms/DateRange';
 import { ProjectTypeSelect } from '@frontend/components/forms/ProjectTypeSelect';
+import { UserSelect } from '@frontend/components/forms/UserSelect';
 import { useTranslations } from '@frontend/stores/lang';
 import {
   dateRangeAtom,
   filtersAtom,
   includeWithoutGeomAtom,
   lifecycleStatesAtom,
+  ownersAtom,
   textAtom,
 } from '@frontend/stores/search/project';
 
@@ -79,6 +81,7 @@ export function SearchControls() {
   const [text, setText] = useAtom(textAtom);
   const [dateRange, setDateRange] = useAtom(dateRangeAtom);
   const [lifecycleStates, setLifecycleStates] = useAtom(lifecycleStatesAtom);
+  const [owners, setOwners] = useAtom(ownersAtom);
   const [filters, setFilters] = useAtom(filtersAtom);
   const [includeWithoutGeom, setIncludeWithoutGeom] = useAtom(includeWithoutGeomAtom);
 
@@ -163,6 +166,10 @@ export function SearchControls() {
             }}
           />
         </FormControl>
+        <FormControl>
+          <FormLabel htmlFor="owner">{tr('project.ownerLabel')}</FormLabel>
+          <UserSelect id="owner" multiple value={owners} onChange={setOwners} />
+        </FormControl>
       </div>
       {expanded && (
         <>

diff --git a/shared/src/schema/project/index.ts b/shared/src/schema/project/index.ts
@@ -24,6 +24,7 @@ export const projectSearchSchema = z.object({
   lifecycleStates: z.array(z.string()).optional(),
   projectTypes: z.array(z.string()).optional(),
   map: mapSearchSchema.optional(),
+  owners: z.array(z.string()),
   includeWithoutGeom: z.boolean().optional(),
   filters: z.object({
     investmentProject: z