[CourseStatistics, StudyProgramme, Teachers] Added serviceProvider ch…

…ecks to hide some tables, tabs and routes when not running in toska enviroment (#4685) * [CourseStatistics, StudyProgramme, Teachers] Added serviceProvider checks to hide some tables and tabs when not running in toska enviroment * [StudentsTable] Use cloneDeep for toskaColumns to prevent mutation * [Frontend] Replace serviceProvider checks with isDefaultServiceProvider function for consistency --------- Co-authored-by: Valtteri Kantanen <[email protected]>
UniversityOfHelsinkiCS · Nov 25, 2024 · dad7ddc · dad7ddc
1 parent 3b0ccb5
commit dad7ddc
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 29 deletions.
diff --git a/services/frontend/src/components/CourseStatistics/ResultTabs/panes/tables/StudentsTable.jsx b/services/frontend/src/components/CourseStatistics/ResultTabs/panes/tables/StudentsTable.jsx
@@ -1,10 +1,11 @@
-import { uniq } from 'lodash'
+import { cloneDeep, uniq } from 'lodash'
 import qs from 'query-string'
 import { useMemo } from 'react'
 import { useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
 import { Header, Icon, Item } from 'semantic-ui-react'
 
+import { isDefaultServiceProvider } from '@/common'
 import { defineCellColor, getSortableColumn, resolveGrades } from '@/components/CourseStatistics/ResultTabs/panes/util'
 import { SortableTable, row } from '@/components/SortableTable'
 import { getCourseAlternatives } from '@/selectors/courseStats'
@@ -35,8 +36,7 @@ const getColumns = (stats, showGrades, userHasAccessToAllStats, alternatives, se
     const searchString = qs.stringify(queryObject)
     return `/coursepopulation?${searchString}`
   }
-
-  const columns = [
+  const toskaColumns = [
     {
       key: 'TIME_PARENT',
       merge: true,
@@ -155,6 +155,13 @@ const getColumns = (stats, showGrades, userHasAccessToAllStats, alternatives, se
     },
   ]
 
+  const fdColums = cloneDeep(toskaColumns)
+  const index = fdColums.findIndex(o => o.key === 'TIME_PARENT')
+  if (index !== -1) {
+    fdColums[index].children = fdColums[index].children.filter(o => o.key === 'TIME')
+  }
+
+  const columns = isDefaultServiceProvider() ? toskaColumns : fdColums
   return columns.filter(column => {
     if (showGrades && column.onlyInGradeView) return true
     if (showGrades && column.hideWhenGradesVisible) return false

diff --git a/services/frontend/src/components/Routes/index.jsx b/services/frontend/src/components/Routes/index.jsx
@@ -83,14 +83,16 @@ export const Routes = () => (
         requireUserHasRights
         requiredRoles={['fullSisuAccess', 'courseStatistics']}
       />
-      <ProtectedRoute component={Users} path={routes.users} requiredRoles={['admin']} />
-      <ProtectedRoute component={Teachers} path={routes.teachers} requiredRoles={['teachers']} />
-      <ProtectedRoute
-        component={CoursePopulation}
-        path={routes.coursepopulation}
-        requireUserHasRights
-        requiredRoles={['fullSisuAccess']}
-      />
+      <ProtectedRoute component={Users} exact path={routes.users} requiredRoles={['admin']} />
+      <ProtectedRoute component={Teachers} exact path={routes.teachers} requiredRoles={['teachers']} />
+      {isDefaultServiceProvider() && (
+        <ProtectedRoute
+          component={CoursePopulation}
+          path={routes.coursepopulation}
+          requireUserHasRights
+          requiredRoles={['fullSisuAccess']}
+        />
+      )}
       <ProtectedRoute
         component={CustomPopulation}
         path={routes.custompopulation}

diff --git a/services/frontend/src/components/StudyProgramme/BasicOverview/index.jsx b/services/frontend/src/components/StudyProgramme/BasicOverview/index.jsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { Divider, Loader, Message } from 'semantic-ui-react'
 
-import { getGraduationGraphTitle } from '@/common'
+import { getGraduationGraphTitle, isDefaultServiceProvider } from '@/common'
 import { studyProgrammeToolTips } from '@/common/InfoToolTips'
 import { CreditsProduced } from '@/components/common/CreditsProduced'
 import { InfoBox } from '@/components/InfoBox'
@@ -187,7 +187,7 @@ export const BasicOverview = ({
               </div>
             </>
           )}
-          {credits?.data?.stats?.[studyprogramme]?.stats && (
+          {credits?.data?.stats?.[studyprogramme]?.stats && isDefaultServiceProvider() && (
             <>
               {getDivider('Credits produced by the study programme', 'creditsProducedByTheStudyProgramme')}
               <CreditsProduced

diff --git a/services/frontend/src/components/StudyProgramme/index.jsx b/services/frontend/src/components/StudyProgramme/index.jsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 import { useHistory, useParams } from 'react-router-dom'
 import { Container, Header, Menu, Segment, Tab } from 'semantic-ui-react'
 
-import { getFullStudyProgrammeRights, getUnifiedProgrammeName } from '@/common'
+import { getFullStudyProgrammeRights, getUnifiedProgrammeName, isDefaultServiceProvider } from '@/common'
 import { useTabs, useTitle } from '@/common/hooks'
 import { useLanguage } from '@/components/LanguagePicker/useLanguage'
 import { useGetAuthorizedUserQuery } from '@/redux/auth'
@@ -87,17 +87,19 @@ export const StudyProgramme = () => {
       fullStudyProgrammeRights.includes(programmeId) ||
       fullStudyProgrammeRights.includes(secondProgrammeId)
     ) {
-      panes.push({
-        menuItem: <Menu.Item key="Programme courses">Programme courses</Menu.Item>,
-        render: () => (
-          <ProgrammeCourses
-            academicYear={academicYear}
-            combinedProgramme={secondProgrammeId}
-            setAcademicYear={setAcademicYear}
-            studyProgramme={programmeId}
-          />
-        ),
-      })
+      if (isDefaultServiceProvider()) {
+        panes.push({
+          menuItem: <Menu.Item key="Programme courses">Programme courses</Menu.Item>,
+          render: () => (
+            <ProgrammeCourses
+              academicYear={academicYear}
+              combinedProgramme={secondProgrammeId}
+              setAcademicYear={setAcademicYear}
+              studyProgramme={programmeId}
+            />
+          ),
+        })
+      }
       panes.push({
         menuItem: 'Degree courses',
         render: () => (

diff --git a/services/frontend/src/components/Teachers/TeacherStatisticsTable/index.jsx b/services/frontend/src/components/Teachers/TeacherStatisticsTable/index.jsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { Link } from 'react-router-dom'
 import { Segment, Icon, Item } from 'semantic-ui-react'
 
-import { calculatePercentage } from '@/common'
+import { calculatePercentage, isDefaultServiceProvider } from '@/common'
 import { SortableTable } from '@/components/SortableTable'
 
 const createColumnWithTitle = title => ({
@@ -39,9 +39,11 @@ export const TeacherStatisticsTable = ({ statistics, variant }) => {
         getRowContent: row => (
           <div style={{ display: 'flex', justifyContent: 'space-between', gap: '0.5em' }}>
             {row.name}
-            <Item as={Link} target="_blank" to={`/teachers/${row.id}`}>
-              <Icon name="level up alternate" />
-            </Item>
+            {isDefaultServiceProvider() && (
+              <Item as={Link} target="_blank" to={`/teachers/${row.id}`}>
+                <Icon name="level up alternate" />
+              </Item>
+            )}
           </div>
         ),
       })