Implement filtering company interests by event

webkom · Mar 15, 2023 · 3780ce0 · 3780ce0
1 parent 62cf9c2
commit 3780ce0
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 117 deletions.
diff --git a/app/reducers/companyInterest.ts b/app/reducers/companyInterest.ts
@@ -41,17 +41,29 @@ export const selectCompanyInterestList = createSelector(
   (state) => state.companyInterest.byId,
   (state) => state.companyInterest.items,
   (state, props) => props,
-  (companyInterestById, companyInterestIds, semesterId) => {
+  (state, props, selectedEventOption) => selectedEventOption,
+  (companyInterestById, companyInterestIds, semesterId, eventValue) => {
     const companyInterests = companyInterestIds.map(
       (id) => companyInterestById[id]
     );
-
-    if (semesterId === 0) {
+    if (semesterId === 0 && eventValue === '') {
       return companyInterests;
     }
+    if (semesterId === 0 && eventValue !== '') {
+      return companyInterests.filter((companyInterest) =>
+        companyInterest.events.includes(eventValue)
+      );
+    }
+    if (semesterId !== 0 && eventValue === '') {
+      return companyInterests.filter((companyInterest) =>
+        companyInterest.semesters.includes(semesterId)
+      );
+    }
 
-    return companyInterests.filter((companyInterest) =>
-      companyInterest.semesters.includes(semesterId)
+    return companyInterests.filter(
+      (companyInterest) =>
+        companyInterest.semesters.includes(semesterId) &&
+        companyInterest.events.includes(eventValue)
     );
   }
 );

diff --git a/app/routes/companyInterest/CompanyInterestListRoute.ts b/app/routes/companyInterest/CompanyInterestListRoute.ts
@@ -6,7 +6,7 @@ import { fetchSemesters } from 'app/actions/CompanyActions';
 import {
   fetchAll,
   deleteCompanyInterest,
-  fetch as fetchCIA,
+  fetch,
 } from 'app/actions/CompanyInterestActions';
 import { LoginPage } from 'app/components/LoginForm';
 import { selectCompanyInterestList } from 'app/reducers/companyInterest';
@@ -15,7 +15,8 @@ import type { CompanySemesterEntity } from 'app/reducers/companySemesters';
 import replaceUnlessLoggedIn from 'app/utils/replaceUnlessLoggedIn';
 import withPreparedDispatch from 'app/utils/withPreparedDispatch';
 import CompanyInterestList from './components/CompanyInterestList';
-import { getCsvUrl, semesterToText } from './utils';
+import { semesterToText } from './utils';
+import { EVENT_TYPE_OPTIONS } from './components/CompanyInterestPage';
 
 const mapStateToProps = (state, props) => {
   const semesterId = Number(
@@ -27,6 +28,9 @@ const mapStateToProps = (state, props) => {
   const semesterObj: CompanySemesterEntity | null | undefined = semesters.find(
     (semester) => semester.id === semesterId
   );
+  const eventValue = qs.parse(props.location.search, {
+    ignoreQueryPrefix: true,
+  }).event;
   const selectedSemesterOption = {
     id: semesterId ? semesterId : 0,
     semester: semesterObj != null ? semesterObj.semester : '',
@@ -41,46 +45,35 @@ const mapStateToProps = (state, props) => {
         : 'Vis alle semestre',
   };
   const selectedEventOption = {
-    value: 'company_presentation',
-    label: 'Bedriftspresentasjon',
+    value: eventValue ? eventValue : '',
+    label: eventValue
+      ? EVENT_TYPE_OPTIONS.find((eventType) => eventType.value === eventValue)
+          .label
+      : 'Vis alle arrangementstyper',
   };
   const companyInterestList = selectCompanyInterestList(
     state,
-    selectedSemesterOption.id
+    selectedSemesterOption.id,
+    selectedEventOption.value
   );
   const hasMore = state.companyInterest.hasMore;
   const fetching = state.companyInterest.fetching;
+
   return {
     semesters,
     companyInterestList,
     hasMore,
     fetching,
     selectedSemesterOption,
-
-    exportSurvey: async (event?: string) => {
-      const blob = await fetch(
-        getCsvUrl(
-          selectedSemesterOption.year,
-          selectedSemesterOption.semester,
-          event
-        ),
-        {
-          headers: {
-            Authorization: `Bearer ${state.auth.token}`,
-          },
-        }
-      ).then((response) => response.blob());
-      return {
-        url: URL.createObjectURL(blob),
-      };
-    },
+    selectedEventOption,
+    authToken: state.auth.token,
   };
 };
 
 const mapDispatchToProps = {
   fetchAll,
   deleteCompanyInterest,
-  fetch: fetchCIA,
+  fetch,
   push,
 };
 export default compose(

diff --git a/app/routes/companyInterest/components/CompanyInterest.css b/app/routes/companyInterest/components/CompanyInterest.css
@@ -105,19 +105,6 @@
   }
 }
 
-.event_section {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 30px auto;
-  align-items: flex-end;
-
-  @media (--small-viewport) {
-    flex-flow: column wrap;
-    align-items: center;
-  }
-}
-
 .companyInterestList {
   @media (--small-viewport) {
     display: none;
@@ -179,3 +166,7 @@ ion-icon {
 .label {
   color: rgb(194, 69, 56);
 }
+
+.selector {
+  min-width: 500px;
+}