fix: test & orgainisation code on edit org in fbt

UniversityOfHelsinkiCS · Nov 27, 2024 · 6d9b5be · 6d9b5be
1 parent 91e954e
commit 6d9b5be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/cypress/integration/organisationSurvey.spec.js b/cypress/integration/organisationSurvey.spec.js
@@ -41,9 +41,9 @@ describe('Feedback Correspondents', () => {
     cy.get('[data-cy="formik-locales-field-sv-name"]').should('be.visible')
     cy.get('[data-cy="formik-locales-field-en-name"]').should('be.visible')
 
-    cy.get('[data-cy="formik-date-picker-field-startDate"]').should('be.visible')
+    cy.get('[data-cy="formik-date-picker-field-startDate-input"]').should('be.visible')
 
-    cy.get('[data-cy="formik-date-picker-field-endDate"]').should('be.visible')
+    cy.get('[data-cy="formik-date-picker-field-endDate-input"]').should('be.visible')
 
     cy.get('[data-cy="formik-responsible-teacher-input-field"]').should('be.visible')
 
@@ -77,10 +77,10 @@ describe('Feedback Correspondents', () => {
     cy.get('[data-cy="formik-locales-field-en-name"]').type('Test survey')
 
     // Assert that the startDate picker is there
-    cy.get('[data-cy="formik-date-picker-field-startDate"]').should('be.visible')
+    cy.get('[data-cy="formik-date-picker-field-startDate-input"]').should('be.visible')
 
     // Assert that the endDate picker is there
-    cy.get('[data-cy="formik-date-picker-field-endDate"]').should('be.visible')
+    cy.get('[data-cy="formik-date-picker-field-endDate-input"]').should('be.visible')
 
     // Assert responsible teacher input field is there
     cy.get('[data-cy="formik-responsible-teacher-input-field"]').should('be.visible')
@@ -194,7 +194,7 @@ describe('Feedback Correspondents', () => {
 
     cy.get('[data-cy="organisation-survey-editor-save"]').click()
 
-    cy.get('[data-cy="formik-date-picker-field-endDate"]').parent().as('endDateInputParent')
+    cy.get('[data-cy="formik-date-picker-field-endDate-input"]').parent().as('endDateInputParent')
     cy.get('@endDateInputParent').contains('p', 'Survey closing date is before opening date')
   })
 

diff --git a/src/client/pages/FeedbackTarget/Edit/EditOrganisationSurvey.jsx b/src/client/pages/FeedbackTarget/Edit/EditOrganisationSurvey.jsx
@@ -16,8 +16,7 @@ const EditOrganisationSurvey = () => {
   const [showForm, setShowForm] = useState(false)
   const queryClient = useQueryClient()
 
-  const { feedbackTarget, isAdmin, isResponsibleTeacher, isOrganisationAdmin, organisation } =
-    useFeedbackTargetContext()
+  const { feedbackTarget, isAdmin, isResponsibleTeacher, isOrganisationAdmin } = useFeedbackTargetContext()
   const { id, courseUnit: { organisations } = [] } = feedbackTarget
   const allowEdit = isAdmin || isResponsibleTeacher || isOrganisationAdmin
   const { survey: organisationSurvey, isLoading } = useOrganisationSurvey(organisations[0]?.code, id, allowEdit)
@@ -102,7 +101,7 @@ const EditOrganisationSurvey = () => {
         editing={showForm}
         onStopEditing={handleClose}
         editView
-        organisationCode={organisation.code}
+        organisationCode={organisations[0]?.code}
       />
     </>
   )

diff --git a/src/client/pages/Organisation/useOrganisationSurveyMutation.js b/src/client/pages/Organisation/useOrganisationSurveyMutation.js
@@ -57,8 +57,6 @@ export const useEditOrganisationSurveyMutation = organisationCode => {
     },
   })
 
-  console.log(mutation)
-
   return mutation
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         },
       })
-      console.log(mutation)
       return mutation
     }
@@ Expand Down @@