Merge pull request #2286 from UniversityOfHelsinkiCS/trunk

Remove old filters and associated code

services/oodikone2-frontend/src/components/CoursePopulation/CoursePopulationGradeDist/index.jsx

@@ -2,25 +2,11 @@ import React, { useState, useEffect } from 'react'
 import { connect } from 'react-redux'
 import { Progress } from 'semantic-ui-react'
 import { intersection, orderBy } from 'lodash'
-import { shape, func, bool, arrayOf, string, number } from 'prop-types'
-
+import { shape, bool, arrayOf, string, number } from 'prop-types'
 import SearchResultTable from '../../SearchResultTable'
-import { gradeFilter } from '../../../populationFilters'
-import { setPopulationFilter, removePopulationFilter } from '../../../redux/populationFilters'
 import { getHighestGradeOfCourseBetweenRange } from '../../../common'
 
-const CoursePopulationCreditDist = ({
-  singleCourseStats,
-  pending,
-  selectedStudents,
-  setPopulationFilterDispatch,
-  removePopulationFilterDispatch,
-  samples,
-  filters,
-  codes,
-  from,
-  to
-}) => {
+const CoursePopulationCreditDist = ({ singleCourseStats, pending, selectedStudents, samples, codes, from, to }) => {
   const [courseGrades, setGrades] = useState([])
   useEffect(() => {
     if (samples && singleCourseStats.alternatives) {
@@ -44,19 +30,6 @@ const CoursePopulationCreditDist = ({
       setGrades(filteredGradeArray)
     }
   }, [pending, selectedStudents])
-  const setFilter = row => {
-    filters.map(filter => removePopulationFilterDispatch(filter.id))
-
-    setPopulationFilterDispatch(
-      gradeFilter({
-        grade: row[0],
-        coursecodes: codes,
-        coursename: singleCourseStats.name,
-        from,
-        to
-      })
-    )
-  }
 
   const totalAmount = courseGrades.reduce((acc, curr) => acc + curr.amount, 0)
 
@@ -77,40 +50,22 @@ const CoursePopulationCreditDist = ({
   ])
   const headers = ['Grades', `Students (all=${selectedStudents.length})`, 'Percentage of population']
 
-  return (
-    <SearchResultTable
-      headers={headers}
-      rows={rows}
-      selectable
-      rowClickFn={(e, row) => setFilter(row)}
-      noResultText="no data available"
-    />
-  )
+  return <SearchResultTable headers={headers} rows={rows} selectable noResultText="no data available" />
 }
 
 CoursePopulationCreditDist.propTypes = {
   singleCourseStats: shape({}).isRequired,
   pending: bool.isRequired,
   selectedStudents: arrayOf(string).isRequired,
-  setPopulationFilterDispatch: func.isRequired,
-  removePopulationFilterDispatch: func.isRequired,
   samples: arrayOf(shape({})).isRequired,
-  filters: arrayOf(shape({})).isRequired,
   codes: arrayOf(string).isRequired,
   from: number.isRequired,
   to: number.isRequired
 }
 
-const mapStateToProps = ({ singleCourseStats, populationFilters }) => ({
+const mapStateToProps = ({ singleCourseStats }) => ({
   singleCourseStats: singleCourseStats.stats,
-  pending: singleCourseStats.pending,
-  filters: populationFilters.filters.filter(f => f.type === 'GradeFilter')
+  pending: singleCourseStats.pending
 })
 
-export default connect(
-  mapStateToProps,
-  {
-    setPopulationFilterDispatch: setPopulationFilter,
-    removePopulationFilterDispatch: removePopulationFilter
-  }
-)(CoursePopulationCreditDist)
+export default connect(mapStateToProps)(CoursePopulationCreditDist)

services/oodikone2-frontend/src/components/CustomPopulation/CustomPopulationCourses/index.jsx

@@ -1,35 +1,12 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { connect } from 'react-redux'
 import { func, shape, arrayOf, string, bool } from 'prop-types'
 import { Segment, Header, Popup } from 'semantic-ui-react'
 import { getTranslate } from 'react-localize-redux'
-
 import SegmentDimmer from '../../SegmentDimmer'
 import PopulationCourseStats from '../../PopulationCourseStats'
-import { refreshFilters } from '../../../redux/populationFilters'
-import { getCustomPopulationCoursesByStudentnumbers } from '../../../redux/populationCourses'
-
-const CustomPopulationCourses = ({
-  refreshNeeded,
-  dispatchRefreshFilters,
-  translate,
-  courses,
-  pending,
-  selectedStudents,
-  getCustomPopulationCoursesByStudentnumbersDispatch,
-  query
-}) => {
-  const reloadCourses = () => {
-    dispatchRefreshFilters()
-    getCustomPopulationCoursesByStudentnumbersDispatch({ studentnumberlist: selectedStudents })
-  }
-
-  useEffect(() => {
-    if (refreshNeeded) {
-      reloadCourses()
-    }
-  }, [refreshNeeded])
 
+const CustomPopulationCourses = ({ translate, courses, pending, selectedStudents, query }) => {
   return (
     <Segment>
       <Header size="medium" dividing>
@@ -57,24 +34,14 @@ CustomPopulationCourses.propTypes = {
   courses: shape([]).isRequired,
   translate: func.isRequired,
   selectedStudents: arrayOf(string).isRequired,
-  refreshNeeded: bool.isRequired,
-  getCustomPopulationCoursesByStudentnumbersDispatch: func.isRequired,
-  dispatchRefreshFilters: func.isRequired,
   query: shape({}).isRequired
 }
 
-const mapStateToProps = ({ localize, populationFilters, populationCourses }) => ({
+const mapStateToProps = ({ localize, populationCourses }) => ({
   courses: populationCourses.data,
   pending: populationCourses.pending,
   translate: getTranslate(localize),
-  query: populationCourses.query,
-  refreshNeeded: populationFilters.refreshNeeded
+  query: populationCourses.query
 })
 
-export default connect(
-  mapStateToProps,
-  {
-    dispatchRefreshFilters: refreshFilters,
-    getCustomPopulationCoursesByStudentnumbersDispatch: getCustomPopulationCoursesByStudentnumbers
-  }
-)(CustomPopulationCourses)
+export default connect(mapStateToProps)(CustomPopulationCourses)