Merge branch 'master' of github.com:UniversityOfHelsinkiCS/oodikone

UniversityOfHelsinkiCS · Jan 11, 2024 · 7180da8 · 7180da8
2 parents aa7204f + df8e079
commit 7180da8
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 4,576 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,8 @@ updates:
     labels:
       - 'dependencies'
       - 'infra'
+    allow:
+      - dependency-type: 'production'
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-major']
@@ -20,6 +22,8 @@ updates:
     labels:
       - 'dependencies'
       - 'updater'
+    allow:
+      - dependency-type: 'production'
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-major']
@@ -32,6 +36,8 @@ updates:
     labels:
       - 'dependencies'
       - 'updater'
+    allow:
+      - dependency-type: 'production'
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-major']
@@ -44,6 +50,8 @@ updates:
     labels:
       - 'dependencies'
       - 'back'
+    allow:
+      - dependency-type: 'production'
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-major']
@@ -56,6 +64,8 @@ updates:
     labels:
       - 'dependencies'
       - 'front'
+    allow:
+      - dependency-type: 'production'
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-major']

diff --git a/cypress/e2e/Completed_courses.js b/cypress/e2e/Completed_courses.js
@@ -48,7 +48,7 @@ describe('When search modal is opened', () => {
     hasLanded()
     openCompletedCoursesModal()
     cy.contains('Search completed courses of students')
-    cy.contains('Insert one or more student numbers, separated by a space, a newline, or a comma.')
+    cy.contains('Insert one or more student numbers, separated by a space, a newline, a comma, or a semicolon.')
     cy.contains('Insert one or more courses, separated by a space, a newline, or a comma.')
     cy.contains('Insert name for this course list if you wish to save it')
   })

diff --git a/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearch.jsx b/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearch.jsx
@@ -62,12 +62,10 @@ export const CompletedCoursesSearch = ({ setValues }) => {
   }, [deletedData])
 
   useEffect(() => {
-    setImmediate(() => {
-      if (location.search) {
-        const query = parseQueryFromUrl()
-        setValues(query)
-      }
-    })
+    if (location.search) {
+      const query = parseQueryFromUrl()
+      setValues(query)
+    }
   }, [location.search])
 
   const clearForm = () => {
@@ -77,10 +75,8 @@ export const CompletedCoursesSearch = ({ setValues }) => {
   }
 
   const pushQueryToUrl = query => {
-    setImmediate(() => {
-      const searchString = qs.stringify(query)
-      history.push({ search: searchString })
-    })
+    const searchString = qs.stringify(query)
+    history.push({ search: searchString })
   }
 
   const handleClose = () => {
@@ -163,7 +159,7 @@ export const CompletedCoursesSearch = ({ setValues }) => {
         <Form>
           <h2>Search completed courses of students</h2>
           <Form.Field>
-            <em>Insert one or more student numbers, separated by a space, a newline, or a comma.</em>
+            <em>Insert one or more student numbers, separated by a space, a newline, a comma, or a semicolon.</em>
             <TextArea
               value={studentInput}
               placeholder="012345678, 12345678"