Issue/KUI 1600 remove fields (#413)

* feat(KUI-1600): remove infoContactName field * feat(KUI-1600): update test cases
KTH · Nov 25, 2024 · b87bbdd · b87bbdd
1 parent aca041f
commit b87bbdd
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 48 deletions.
diff --git a/i18n/messages.en.js b/i18n/messages.en.js
@@ -147,7 +147,6 @@ module.exports = {
     teacherAssistantsTitle: 'Teacher Assistants',
     examinerTitle: 'Examiner',
     otherContactsTitle: 'Other Contacts',
-    infoContactName: 'Course Contact',
   },
   extraInfo: {
     season: {

diff --git a/i18n/messages.se.js b/i18n/messages.se.js
@@ -118,7 +118,6 @@ module.exports = {
     teacherAssistantsTitle: 'Lärarassistenter',
     examinerTitle: 'Examinator',
     otherContactsTitle: 'Övriga kontakter',
-    infoContactName: 'Kontaktperson',
   },
   extraInfo: {
     season: {

diff --git a/public/js/app/components/AboutCourseContacts.jsx b/public/js/app/components/AboutCourseContacts.jsx
@@ -3,22 +3,6 @@ import React from 'react'
 import { EMPTY } from '../util/constants'
 import HtmlWrapper from './HtmlWrapper'
 
-// Mandatory information
-const InfoContact = ({ languageIndex, infoContactName, labels }) =>
-  infoContactName ? (
-    <>
-      <h3 className="t4">{labels.infoContactName}</h3>
-      <HtmlWrapper id="links-info-contact-name" html={infoContactName} />
-    </>
-  ) : (
-    <>
-      <h3 className="t4">{labels.infoContactName}</h3>
-      <p>
-        <i>{EMPTY[languageIndex]}</i>
-      </p>
-    </>
-  )
-
 // Mandatory information
 const ExaminerContacts = ({ languageIndex, examiners, labels }) =>
   examiners ? (
@@ -35,10 +19,9 @@ const ExaminerContacts = ({ languageIndex, examiners, labels }) =>
     </>
   )
 
-const CourseContacts = ({ languageIndex, infoContactName = '', examiners = '', labels = {} }) => (
+const CourseContacts = ({ languageIndex, examiners = '', labels = {} }) => (
   <>
     <div className="info-box text-break">
-      <InfoContact languageIndex={languageIndex} infoContactName={infoContactName} labels={labels} />
       <ExaminerContacts languageIndex={languageIndex} examiners={examiners} labels={labels} />
     </div>
   </>

diff --git a/public/js/app/pages/AboutCourseMemo.jsx b/public/js/app/pages/AboutCourseMemo.jsx
@@ -367,7 +367,6 @@ function AboutCourseMemo({ mockKursPmDataApi = false, mockMixKoppsApi = false })
               <h2>{courseContactsLabels.courseContactsTitle}</h2>
               <AboutCourseContacts
                 languageIndex={userLanguageIndex}
-                infoContactName={webContext.infoContactName}
                 examiners={webContext.examiners}
                 labels={courseContactsLabels}
               />

diff --git a/public/js/app/pages/__tests__/AboutCourseMemoEN.test.js b/public/js/app/pages/__tests__/AboutCourseMemoEN.test.js
@@ -87,7 +87,7 @@ describe('User language: English. Component <AboutCourseMemo> show all memos: pd
     const mainContent = screen.getByRole('main')
 
     const allH3Headers = within(mainContent).getAllByRole('heading', { level: 3 })
-    expect(allH3Headers.length).toBe(5)
+    expect(allH3Headers.length).toBe(4)
     const expectedh3ds = [
       'Course offerings starting Autumn 2020',
       'Course offerings starting Autumn 2019',
@@ -109,7 +109,7 @@ describe('User language: English. Component <AboutCourseMemo> show all memos: pd
 
   test('renders text about empty fields (Course Contact, Examiner) ', () => {
     const noInfo = getAllByText('No information inserted')
-    expect(noInfo.length).toBe(2)
+    expect(noInfo.length).toBe(1)
   })
 
   test('renders menu link of web-based memo as expected', () => {

diff --git a/public/js/app/pages/__tests__/AboutCourseMemoSV.test.js b/public/js/app/pages/__tests__/AboutCourseMemoSV.test.js
@@ -88,7 +88,7 @@ describe('User language: Swedish. Component <AboutCourseMemo> show all memos: pd
   test('renders h3 ', () => {
     const mainContent = screen.getByRole('main')
     const allH3Headers = within(mainContent).getAllByRole('heading', { level: 3 })
-    expect(allH3Headers.length).toBe(5)
+    expect(allH3Headers.length).toBe(4)
     const expectedh3ds = [
       'Kursomgångar som startar HT 2020',
       'Kursomgångar som startar HT 2019',
@@ -108,11 +108,6 @@ describe('User language: Swedish. Component <AboutCourseMemo> show all memos: pd
     expectedh4ds.map((h4, index) => expect(allH4Headers[index]).toHaveTextContent(h4))
   })
 
-  test('renders text about empty fields (Kontaktperson) ', () => {
-    const noInfo = getAllByText('Ingen information tillagd')
-    expect(noInfo.length).toBe(1)
-  })
-
   test('renders menu link of web-based memo as expected', done => {
     const menuItems = getAllByText('Course memo Autumn 2019-1')
     expect(menuItems.length).toBe(2)

diff --git a/server/controllers/memoCtrl.js b/server/controllers/memoCtrl.js
@@ -200,23 +200,17 @@ async function getContent(req, res, next) {
 
     let fromTerm = semester ?? extractTerm(courseCode, finalMemoEndPoint)
 
-    const {
-      courseMainSubjects,
-      recruitmentText,
-      title,
-      credits,
-      creditUnitAbbr,
-      infoContactName,
-      examiners,
-      roundInfos,
-    } = await getDetailedInformation(courseCode, languagesContext.memoLanguage, fromTerm)
+    const { courseMainSubjects, title, credits, creditUnitAbbr, examiners, roundInfos } = await getDetailedInformation(
+      courseCode,
+      languagesContext.memoLanguage,
+      fromTerm
+    )
 
     const courseContext = {
       courseMainSubjects,
       title,
       credits,
       creditUnitAbbr,
-      infoContactName,
       examiners,
     }
 
@@ -330,15 +324,16 @@ async function getOldContent(req, res, next) {
       memoDatas: [],
     }
 
-    const { courseMainSubjects, recruitmentText, title, credits, creditUnitAbbr, infoContactName, examiners } =
-      await getDetailedInformation(courseCode, languagesContext.memoLanguage)
+    const { courseMainSubjects, title, credits, creditUnitAbbr, examiners } = await getDetailedInformation(
+      courseCode,
+      languagesContext.memoLanguage
+    )
 
     const courseContext = {
       courseMainSubjects,
       title,
       credits,
       creditUnitAbbr,
-      infoContactName,
       examiners,
     }
 
@@ -416,15 +411,14 @@ async function getAboutContent(req, res, next) {
 
     const fromTerm = getLastYearsTerm()
 
-    const { title, credits, creditUnitAbbr, infoContactName, examiners, roundInfos } = await getDetailedInformation(
+    const { title, credits, creditUnitAbbr, examiners, roundInfos } = await getDetailedInformation(
       courseCode,
       responseLanguage,
       fromTerm
     )
     webContext.title = title
     webContext.credits = credits
     webContext.creditUnitAbbr = creditUnitAbbr
-    webContext.infoContactName = infoContactName
     webContext.examiners = examiners
 
     webContext.memoDatas = enrichMemoDatasWithOutdatedFlag(rawMemos, roundInfos)

diff --git a/server/koppsApi.js b/server/koppsApi.js
@@ -67,7 +67,6 @@ async function getDetailedInformation(courseCode, language, fromTerm) {
         title: course && course.title ? course.title : '',
         credits: isCreditNotStandard ? course.credits + '.0' : course.credits || '',
         creditUnitAbbr: course && course.creditUnitAbbr ? course.creditUnitAbbr : '',
-        infoContactName: course && course.infoContactName ? course.infoContactName : '',
         examiners: createPersonHtml(examiners),
         roundInfos: roundInfos || [],
       }

diff --git a/server/ssr-context/createServerSideContext.js b/server/ssr-context/createServerSideContext.js
@@ -24,7 +24,6 @@ function createServerSideContext() {
     title: '',
     credits: '',
     creditUnitAbbr: '',
-    infoContactName: '',
     semester: '',
     examiners: '',
     userLanguageIndex: 1,

diff --git a/test/mock-api/responses.js b/test/mock-api/responses.js
@@ -41,7 +41,6 @@ module.exports = {
       extraHeaders4: '',
       extraHeaders5: '',
       equipment: '',
-      infoContactName: '',
       literature: '',
       possibilityToCompletion: '',
       possibilityToAddition: '',