added rtk for lomake

Author: tfhuhtal

client/components/MetaEvaluationView/ProgrammeLevelOverview/FacultyDropdown.jsx

@@ -1,18 +1,18 @@
-import React, { useEffect, useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Dropdown, MenuItem } from 'semantic-ui-react'
+import { useTranslation } from 'react-i18next'
 
-const FacultyDropdown = ({ t, handleFilterChange, faculties, lang, debouncedFilter }) => {
+const FacultyDropdown = ({ faculties, debouncedFilter, lang, handleFilterChange }) => {
+  const { t } = useTranslation()
   const [dropdownText, setDropdownText] = useState(t('chooseFaculty'))
 
   useEffect(() => {
-    if (debouncedFilter === '') setDropdownText(t('chooseFaculty'))
-    else
-      setDropdownText(
-        faculties?.data.find(f => f.code === debouncedFilter)?.name[lang]
-          ? faculties?.data.find(f => f.code === debouncedFilter)?.name[lang]
-          : t('chooseFaculty'),
-      )
-  }, [debouncedFilter, lang])
+    setDropdownText(
+      faculties?.data.find(f => f.code === debouncedFilter)?.name[lang]
+        ? faculties?.data.find(f => f.code === debouncedFilter)?.name[lang]
+        : t('chooseFaculty'),
+    )
+  }, [debouncedFilter, lang, faculties, t])
 
   const handleDropdownFilter = faculty => {
     if (!faculty) {
@@ -39,7 +39,7 @@ const FacultyDropdown = ({ t, handleFilterChange, faculties, lang, debouncedFilt
             {t('report:all')}
           </Dropdown.Item>
           {!faculties.pending
-            ? faculties.data
+            ? [...faculties.data]
                 .sort((a, b) => a.name[lang].localeCompare(b.name[lang]))
                 .map(faculty => (
                   <Dropdown.Item
@@ -57,4 +57,4 @@ const FacultyDropdown = ({ t, handleFilterChange, faculties, lang, debouncedFilt
   )
 }
 
-export default FacultyDropdown
+export default FacultyDropdown

client/components/Router.jsx

@@ -30,6 +30,7 @@ import ReformAnswers from './ReformAnswers/index'
 import ErrorBoundary from './ErrorBoundary'
 import Homepage from './Homepage'
 import FacultyTrackingView from './FacultyMonitoringView/FacultyTrackingView/index'
+import Page from './V1'
 
 export default () => (
   <div className="content">
@@ -102,6 +103,7 @@ export default () => (
           render={props => <ViewEvaluationAnswersForFaculty programmeKey={props.match.params.faculty} />}
         />
         <Route exact path="/reform-answers" component={ReformAnswers} />
+        <Route exact path="/v1" component={Page} />
       </Switch>
     </ErrorBoundary>
   </div>

client/components/V1/index.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+
+const Page = () => {
+  return (
+    <div>
+      <h1>Page</h1>
+    </div>
+  )
+}
+
+export default Page

client/util/store.js

@@ -1,17 +1,13 @@
-/* eslint-disable import/no-cycle */
-import { createStore, applyMiddleware, compose } from 'redux'
-import thunk from 'redux-thunk'
-
-import { handleRequest } from './apiConnection'
-import webSocketMiddleware from './webSocket'
-import combinedReducers from './redux'
-
-// eslint-disable-next-line
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
-
-const store = createStore(
-  combinedReducers,
-  composeEnhancers(applyMiddleware(thunk, webSocketMiddleware, handleRequest)),
-)
-
-export default store
+import { configureStore } from '@reduxjs/toolkit';
+import { handleRequest } from './apiConnection';
+import webSocketMiddleware from './webSocket';
+import combinedReducers from './redux';
+
+const store = configureStore({
+  reducer: combinedReducers,
+  middleware: getDefaultMiddleware =>
+    getDefaultMiddleware().concat(webSocketMiddleware, handleRequest),
+  devTools: process.env.NODE_ENV !== 'production',
+})
+
+export default store

package-lock.json

@@ -21,6 +21,7 @@
   "author": "Jami Kousa, Tuomas Huhtala, Venla Rantanen",
   "license": "ISC",
   "dependencies": {
+    "@reduxjs/toolkit": "^2.5.0",
     "@sentry/browser": "^7.102.1",
     "@sentry/node": "^7.102.1",
     "@sentry/tracing": "^7.102.1",