Upgrade prettier and eslint-plugin-prettier and fix issues

UniversityOfHelsinkiCS · Jul 26, 2024 · 15e2801 · 15e2801
1 parent 285cc76
commit 15e2801
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 26 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -6,5 +6,6 @@
   "tabWidth": 2,
   "useTabs": false,
   "jsxSingleQuote": false,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "parser": "typescript"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,14 +51,14 @@
     "eslint-plugin-cypress": "^3.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^9.0.0",
     "lint-staged": "^15.0.0",
     "node-actionlint": "^1.2.2",
     "nyc": "^17.0.0",
-    "prettier": "3.3.0",
+    "prettier": "3.3.3",
     "stylelint": "^16.2.1",
     "stylelint-config-standard": "^36.0.0"
   },

diff --git a/services/backend/src/services/studyProgramme/studyTrackStats.ts b/services/backend/src/services/studyProgramme/studyTrackStats.ts
@@ -245,7 +245,7 @@ const getMainStatsByTrackAndYear = async (
 
     const hasGraduated = studyRightElement.graduated
     const hasGraduatedFromCombinedProgramme = combinedProgramme
-      ? studyRight.studyRightElements.find(element => element.code === combinedProgramme)?.graduated ?? false
+      ? (studyRight.studyRightElements.find(element => element.code === combinedProgramme)?.graduated ?? false)
       : false
 
     if (hasGraduated) {

diff --git a/services/frontend/src/components/FacultyStatistics/InteractiveDataView/index.jsx b/services/frontend/src/components/FacultyStatistics/InteractiveDataView/index.jsx
@@ -133,9 +133,7 @@ export const InteractiveDataTable = ({
       <Table celled data-cy={`Table-${cypress}`}>
         <Table.Header>
           <Table.Row key={`random-header-row-${Math.random()}`} textAlign="center">
-            {titles?.map(title => (
-              <Table.HeaderCell key={title}>{title}</Table.HeaderCell>
-            ))}
+            {titles?.map(title => <Table.HeaderCell key={title}>{title}</Table.HeaderCell>)}
           </Table.Row>
         </Table.Header>
         <Table.Body>

diff --git a/services/frontend/src/components/PopulationDetails/PopulationCourses/index.jsx b/services/frontend/src/components/PopulationDetails/PopulationCourses/index.jsx
@@ -87,7 +87,7 @@ export const PopulationCourses = ({
         />
       ) : (
         <PopulationCourseStatsFlat
-          courses={pending ? null : populationSelectedStudentCourses.data ?? []}
+          courses={pending ? null : (populationSelectedStudentCourses.data ?? [])}
           filteredStudents={filteredStudents}
           studentAmountLimit={studentAmountLimit}
         />

diff --git a/services/frontend/src/components/PopulationStudents/StudentTable/GeneralTab/GeneralTab.jsx b/services/frontend/src/components/PopulationStudents/StudentTable/GeneralTab/GeneralTab.jsx
@@ -343,7 +343,7 @@ export const GeneralTab = ({
       getRowVal: student =>
         student.hopsCredits !== undefined
           ? student.hopsCredits
-          : student.studyplans?.find(plan => plan.programme_code === programmeCode)?.completed_credits ?? 0,
+          : (student.studyplans?.find(plan => plan.programme_code === programmeCode)?.completed_credits ?? 0),
     }),
     hopsCombinedProg: () => ({
       key: 'credits-hopsCombinedProg',

diff --git a/services/frontend/src/components/StudyProgramme/BasicOverview/DataTable.jsx b/services/frontend/src/components/StudyProgramme/BasicOverview/DataTable.jsx
@@ -12,11 +12,7 @@ export const DataTable = ({ cypress, data, titles, wideTable }) => {
     <div className={`table-container${wideTable ? '-wide' : ''}`}>
       <Table celled data-cy={`Table-${cypress}`}>
         <Table.Header>
-          <Table.Row>
-            {titles?.map(title => (
-              <Table.HeaderCell key={title}>{title}</Table.HeaderCell>
-            ))}
-          </Table.Row>
+          <Table.Row>{titles?.map(title => <Table.HeaderCell key={title}>{title}</Table.HeaderCell>)}</Table.Row>
         </Table.Header>
         <Table.Body>
           {data?.map(yearArray => (