fixing fetches, linted

src/common/hooks/University/University.hooks.tsx

@@ -1,7 +1,7 @@
 import log from 'loglevel'
-import { usePersistedStore } from '@store'
+import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useState, useEffect, useMemo } from 'react'
+import { usePersistedStore } from '@store'
 
 export type UniversityHookReturn = {
   readonly university: string

src/common/utils/index.ts

@@ -1,4 +1,5 @@
 import { HaskiTheme } from './Theme/HaskiTheme'
 import { Theme } from './Theme/Theme'
 import { reportWebVitals, sendToAnalytics } from './Webvitals/Webvitals'
+
 export { reportWebVitals, sendToAnalytics, Theme, HaskiTheme }

src/components/Newsbanner/Newsbanner.hooks.tsx

@@ -1,10 +1,10 @@
+import i18next from 'i18next'
 import log from 'loglevel'
-import { useMemo, useState, useContext, useEffect } from 'react'
-import { SnackbarContext } from '@services'
-import { useSessionStore } from '@store'
+import { useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useUniversity } from '@common/hooks'
-import i18next from 'i18next'
+import { SnackbarContext } from '@services'
+import { useSessionStore } from '@store'
 
 /**
  * @prop  sets the newsItem if there is atleast one news

src/components/Newsbanner/Newsbanner.test.tsx

@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom'
-import { fireEvent, render, act, renderHook } from '@testing-library/react'
+import { act, fireEvent, render, renderHook } from '@testing-library/react'
 import { mockServices } from 'jest.setup'
-import Newsbanner from './Newsbanner'
 import { MemoryRouter } from 'react-router-dom'
 import { useUniversity } from '@common/hooks'
+import Newsbanner from './Newsbanner'
 
 describe('Newsbanner tests', () => {
   beforeEach(() => {

src/components/Newsbanner/Newsbanner.tsx

@@ -1,9 +1,9 @@
+import { keyframes } from '@emotion/react'
+import { memo } from 'react'
 import { Alert, Box, Collapse, IconButton, Typography } from '@common/components'
 import { Close } from '@common/icons'
-import { memo } from 'react'
-import { keyframes } from '@emotion/react'
-import { NewsbannerHookReturn, useNewsbanner as _useNewsbanner } from './Newsbanner.hooks'
 import { useSessionStore } from '@store'
+import { NewsbannerHookReturn, useNewsbanner as _useNewsbanner } from './Newsbanner.hooks'
 
 export type NewsbannerProps = {
   useNewsbanner?: () => NewsbannerHookReturn

src/components/PrivacyModal/PrivacyModal.test.tsx

@@ -1,5 +1,5 @@
 import '@testing-library/jest-dom'
-import { fireEvent, render, act } from '@testing-library/react'
+import { act, fireEvent, render } from '@testing-library/react'
 import { mockServices } from 'jest.setup'
 import * as router from 'react-router'
 import { MemoryRouter } from 'react-router-dom'

src/components/PrivacyModal/PrivacyModal.tsx

@@ -12,8 +12,8 @@ import {
   Tooltip,
   Typography
 } from '@common/components'
-import { PrivacyModalHookReturn, usePrivacyModal as _usePrivacyModal } from './PrivacyModal.hooks'
 import { useUniversity } from '@common/hooks'
+import { PrivacyModalHookReturn, usePrivacyModal as _usePrivacyModal } from './PrivacyModal.hooks'
 
 const style = {
   position: 'absolute',

src/core/index.ts

@@ -28,12 +28,12 @@ import LearningPathElement from './LearningPathElement/LearningPathElement'
 import LearningPathElementStatus from './LearningPathElement/LearningPathElementStatus'
 import LearningPathLearningElement from './LearningPathLearningElement/LearningPathLearningElement'
 import LearningPathTopic from './LearningPathTopic/LearningPathTopic'
+import News, { NewsResponse } from './News/News'
 import ILS from './QuestionnaireResults/ILS'
 import ListK from './QuestionnaireResults/ListK'
 import RemoteCourse from './RemoteCourse/RemoteCourse'
 import RemoteLearningElement from './RemoteLearningElement/RemoteLearningElement'
 import RemoteTopic from './RemoteTopic/RemoteTopic'
-import News, { NewsResponse } from './News/News'
 import StudentLearningElement from './StudentLearningElement/StudentLearningElement'
 import Topic from './Topic/Topic'
 import User from './User/User'

src/pages/Contact/Contact.tsx

@@ -1,4 +1,4 @@
-import { useState, useContext } from 'react'
+import { useContext, useState } from 'react'
 import { ContactForm } from '@components'
 import { AuthContext } from '@services'
 import { ContactHookProps, ContactHookReturn, useContact as _useContact } from './Contact.hooks'

src/pages/MainFrame/MainFrame.tsx

@@ -6,9 +6,9 @@ import {
   Footer,
   LocalNavBar,
   MenuBar,
+  Newsbanner,
   OpenQuestionnaire,
-  PrivacyModal,
-  Newsbanner
+  PrivacyModal
 } from '@components'
 
 /**

src/services/News/fetchNews.tsx

@@ -1,6 +1,6 @@
+import { NewsResponse } from '@core'
 import { getConfig } from '@shared'
 import { fetchData } from '../RequestResponse'
-import { NewsResponse } from '@core'
 
 /**
  *

src/services/RemoteCourses/fetchRemoteCourses.test.tsx

@@ -13,7 +13,27 @@ global.fetch = jest.fn(() =>
 
 describe('fetchCourses has expected behaviour', () => {
   it('should return the course when the response is successful', async () => {
-    const expectedData = { course: 'dude where is my car' }
+    const expectedData = [
+      {
+        enddate: 1702166400,
+        fullname: 'Kurs-1',
+        id: 2,
+        shortname: 'kurs',
+        startdate: 1670630400,
+        timecreated: 1670578503,
+        timemodified: 1670578503
+      },
+      {
+        enddate: 1718406000,
+        fullname: 'Kurs-2',
+        id: 3,
+        shortname: 'ku2',
+        startdate: 1686870000,
+        timecreated: 1686830366,
+        timemodified: 1692021711
+      }
+    ]
+
     const mockResponse = {
       ok: true,
       json: jest.fn().mockResolvedValue(expectedData)
@@ -23,22 +43,15 @@ describe('fetchCourses has expected behaviour', () => {
     // @ts-ignore
     fetch.mockResolvedValue(mockResponse)
 
-    const userId = 1
-    const lmsUserId = 1
-    const studentId = 1
+    const result = await fetchRemoteCourses()
 
-    const result = await fetchRemoteCourses(userId, lmsUserId, studentId)
-
-    expect(fetch).toHaveBeenCalledWith(
-      `${getConfig().BACKEND}/user/${userId}/${lmsUserId}/student/${studentId}/course`,
-      {
-        method: 'GET',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json'
-        }
+    expect(fetch).toHaveBeenCalledWith(`${getConfig().BACKEND}/lms/remote/courses`, {
+      method: 'GET',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json'
       }
-    )
+    })
     expect(result).toEqual(expectedData)
   })
 
@@ -55,11 +68,7 @@ describe('fetchCourses has expected behaviour', () => {
     // @ts-ignore
     fetch.mockResolvedValue(mockResponse)
 
-    const userId = 1
-    const lmsUserId = 1
-    const studentId = 1
-
-    await expect(fetchRemoteCourses(userId, lmsUserId, studentId)).rejects.toThrow(`${expectedMessage}`)
+    await expect(fetchRemoteCourses()).rejects.toThrow(`${expectedMessage}`)
   })
 
   it('should throw an unknown error when the response does not have an error variable', async () => {
@@ -72,10 +81,6 @@ describe('fetchCourses has expected behaviour', () => {
     // @ts-ignore
     fetch.mockResolvedValue(mockResponse)
 
-    const userId = 1
-    const lmsUserId = 1
-    const studentId = 1
-
-    await expect(fetchRemoteCourses(userId, lmsUserId, studentId)).rejects.toThrow('')
+    await expect(fetchRemoteCourses()).rejects.toThrow('')
   })
 })

src/services/RemoteCourses/fetchRemoteCourses.ts

@@ -2,6 +2,13 @@ import { RemoteCourse } from '@core'
 import { getConfig } from '@shared'
 import { fetchData } from '../RequestResponse'
 
+/*
+ * fetchRemoteCourses function.
+ *
+ * @returns - The remote courses array from LMS
+ *
+ * @category Services
+ */
 export const fetchRemoteCourses = async () => {
   return fetchData<RemoteCourse[]>(getConfig().BACKEND + `/lms/remote/courses`, {
     method: 'GET',

src/services/RemoteTopics/fetchRemoteTopics.ts

@@ -2,7 +2,14 @@ import { getConfig } from '@shared'
 import RemoteTopic, { RemoteTopicReturn } from '../../core/RemoteTopic/RemoteTopic'
 import { fetchData } from '../RequestResponse'
 
-export const fetchRemoteTopics: RemoteTopicReturn = async (courseId: number) => {
+/*
+ * fetchRemoteTopics function.
+ *
+ * @returns - The remote topics and learning eleemnts array from LMS
+ *
+ * @category Services
+ */
+export const fetchRemoteTopics: RemoteTopicReturn = async (courseId?: string) => {
   return fetchData<RemoteTopic[]>(getConfig().BACKEND + `/lms/remote/course/${courseId}/content`, {
     method: 'GET',
     credentials: 'include',

src/store/Zustand/Store.ts

@@ -12,9 +12,9 @@ import LearningPathElementStatusSlice, {
   createLearningPathElementStatusSlice
 } from '../Slices/LearningPathElementStatusSlice'
 import LearningPathTopicSlice, { createLearningPathTopicSlice } from '../Slices/LearningPathTopicSlice'
+import NewsSlice, { createNewsSlice } from '../Slices/NewsSlice'
 import RemoteTopicSlice, { createRemoteTopicSlice } from '../Slices/RemoteTopicSlice'
 import UserSlice, { createUserSlice } from '../Slices/UserSlice'
-import NewsSlice, { createNewsSlice } from '../Slices/NewsSlice'
 import xAPISlice, { createXAPISlice } from '../Slices/xAPISlice'
 
 export type StoreState = LearningPathElementSlice &