adding loaders

UniversityOfHelsinkiCS · Oct 10, 2024 · 7b0b181 · 7b0b181
1 parent 5eceb19
commit 7b0b181
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js b/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js
@@ -245,6 +245,8 @@ const MonitoringOverview = ({ t, lang, faculties }) => {
     else setAccordion(sectionIndex)
   }
 
+  if (!answers) return <Loader active />
+
   return (
     <div className="monitoring-overview">
       <Menu size="large" className="filter-row" secondary>

diff --git a/client/components/FacultyMonitoringView/FacultyMonitoringOverview/index.js b/client/components/FacultyMonitoringView/FacultyMonitoringOverview/index.js
@@ -2,6 +2,7 @@ import React, { useEffect } from 'react'
 import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
 import { formKeys } from '@root/config/data'
+import { Loader } from 'semantic-ui-react'
 import { isAdmin } from '@root/config/common'
 import NoPermissions from 'Components/Generic/NoPermissions'
 import MonitoringOverview from './MonitoringOverview'
@@ -27,9 +28,9 @@ const FacultyMonitoringOverview = () => {
     return <NoPermissions t={t} requestedForm={t('facultymonitoring')} />
   }
 
-  return !faculties.pending ? (
-    <MonitoringOverview t={t} lang={lang} faculties={faculties} form={form} formType={formType} />
-  ) : null
+  if (faculties.pending) return <Loader active />
+
+  return <MonitoringOverview t={t} lang={lang} faculties={faculties} form={form} formType={formType} />
 }
 
 export default FacultyMonitoringOverview