90686

Amsterdam · Sep 21, 2023 · a5a1793 · a5a1793
1 parent 264103f
commit a5a1793
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 41 deletions.
diff --git a/src/app/components/cases/Cases/Cases.tsx b/src/app/components/cases/Cases/Cases.tsx
@@ -82,7 +82,6 @@ const Cases: React.FC = () => {
  ** housingCorporations to avoid a stale selection:
  */
  if (key === "theme") {
- casesContextItem.housingCorporations = []
  casesContextItem.reason = ""
  casesContextItem.projects = []
  casesContextItem.subjects = []

diff --git a/src/app/components/cases/CasesFilter/CasesFilter.tsx b/src/app/components/cases/CasesFilter/CasesFilter.tsx
@@ -7,7 +7,6 @@ import scaffoldDate from "./scaffoldDate"
 import scaffoldTheme from "./scaffoldTheme"
 import scaffoldPageSize from "./scaffoldPageSize"
 import scaffoldReason from "./scaffoldReason"
-import MultipleOptionsFilter from "app/components/filters/MultipleOptionsFilter/MultipleOptionsFilter"
 import MultipleOptionsFilterBox from "app/components/filters/MultipleOptionsFilterBox/MultipleOptionsFilterBox"
 
 type Props = {
@@ -45,20 +44,21 @@ const CasesFilter: React.FC<Props> = ({
  <ScaffoldForm>
  <ScaffoldFields { ...scaffoldTheme(theme, themes, setTheme) } />
  </ScaffoldForm>
- { theme === "Onderhuur" && (
- <MultipleOptionsFilter
- label="Corporaties"
- options={ corporations }
- selectedOptions={ selectedCorporations }
- setSelectedOptions={ setSelectedCorporations }
- byId
- />
- )}
+ <ScaffoldForm>
+ <ScaffoldFields { ...scaffoldDate(date, setDate) } />
+ </ScaffoldForm>
  { reasons === undefined ? <Spinner /> : (
  <ScaffoldForm>
  <ScaffoldFields { ...scaffoldReason(reason, setReason, reasons) } />
  </ScaffoldForm>
  )}
+ <MultipleOptionsFilterBox
+ label="Corporaties"
+ options={ corporations }
+ selectedOptions={ selectedCorporations }
+ setSelectedOptions={ setSelectedCorporations }
+ byId
+ />
  { projects !== undefined && (
  <MultipleOptionsFilterBox
  label="Projecten"
@@ -77,10 +77,7 @@ const CasesFilter: React.FC<Props> = ({
  byId
  />
  )}
- <ScaffoldForm>
- <ScaffoldFields { ...scaffoldDate(date, setDate) } />
- </ScaffoldForm>
- <MultipleOptionsFilter
+ <MultipleOptionsFilterBox
  label="Stadsdelen"
  options={ districts }
  selectedOptions={ districtNames }

diff --git a/src/app/components/tasks/Tasks/Tasks.tsx b/src/app/components/tasks/Tasks/Tasks.tsx
@@ -135,7 +135,6 @@ const Tasks: React.FC = () => {
  ** housingCorporations to avoid a stale selection:
  */
  if (key === "theme") {
- tasksContextItem.housingCorporations = []
  tasksContextItem.projects = []
  tasksContextItem.reason = ""
  tasksContextItem.subjects = []

diff --git a/src/app/components/tasks/TasksFilter/TasksFilter.tsx b/src/app/components/tasks/TasksFilter/TasksFilter.tsx
@@ -8,7 +8,6 @@ import scaffoldRole from "./scaffoldRole"
 import scaffoldPageSize from "./scaffoldPageSize"
 import scaffoldMyTasks from "./scaffoldMyTasks"
 import scaffoldReasons from "./scaffoldReasons"
-import MultipleOptionsFilter from "app/components/filters/MultipleOptionsFilter/MultipleOptionsFilter"
 import MultipleOptionsFilterBox from "app/components/filters/MultipleOptionsFilterBox/MultipleOptionsFilterBox"
 
 type Props = {
@@ -62,21 +61,6 @@ const TasksFilter: React.FC<Props> = ({
  </ScaffoldForm>
  )
  }
- { theme === "Onderhuur" && (
- <MultipleOptionsFilter
- label="Corporaties"
- options={ corporations }
- selectedOptions={ selectedCorporations }
- setSelectedOptions={ setSelectedCorporations }
- byId
- />
- )}
- { reasons === undefined ? <Spinner /> : (
- <ScaffoldForm>
- <ScaffoldFields { ...scaffoldReasons(reason, setReason, reasons) } />
- </ScaffoldForm>
- )
- }
  { roles === undefined
  ? <Spinner />
  : (
@@ -85,14 +69,10 @@ const TasksFilter: React.FC<Props> = ({
  </ScaffoldForm>
  )
  }
- { projects !== undefined && (
- <MultipleOptionsFilterBox
- label="Projecten"
- options={ projects }
- selectedOptions={ selectedProjects }
- setSelectedOptions={ setSelectedProjects }
- byId
- />
+ { reasons === undefined ? <Spinner /> : (
+ <ScaffoldForm>
+ <ScaffoldFields { ...scaffoldReasons(reason, setReason, reasons) } />
+ </ScaffoldForm>
  )}
  { taskNames === undefined ? <Spinner /> : (
  <MultipleOptionsFilterBox
@@ -102,6 +82,24 @@ const TasksFilter: React.FC<Props> = ({
  setSelectedOptions={ setSelectedTaskNames }
  />
  )}
+ <MultipleOptionsFilterBox
+ label="Corporaties"
+ options={ corporations }
+ selectedOptions={ selectedCorporations }
+ setSelectedOptions={ setSelectedCorporations }
+ byId
+ />
+
+ { projects !== undefined && (
+ <MultipleOptionsFilterBox
+ label="Projecten"
+ options={ projects }
+ selectedOptions={ selectedProjects }
+ setSelectedOptions={ setSelectedProjects }
+ byId
+ />
+ )}
+
  { subjects !== undefined && (
  <MultipleOptionsFilterBox
  label="Onderwerpen"
@@ -111,7 +109,7 @@ const TasksFilter: React.FC<Props> = ({
  byId
  />
  )}
- <MultipleOptionsFilter
+ <MultipleOptionsFilterBox
  label="Stadsdelen"
  options={ districts }
  selectedOptions={ districtNames }