Merge branch 'develop' into SWAP-5056-user-office-one-identity-synchronisation

Author: yoganandaness

apps/backend/src/datasources/postgres/UserDataSource.ts

@@ -190,7 +190,6 @@ export default class PostgresUserDataSource implements UserDataSource {
         lastname,
         username: email,
         preferredname: firstname,
-        oidc_sub: '',
         oauth_refresh_token: '',
         oauth_issuer: '',
         gender: '',
@@ -480,7 +479,6 @@ export default class PostgresUserDataSource implements UserDataSource {
       lastname: '',
       username: userId.toString(),
       preferredname: '',
-      oidc_sub: '',
       oauth_refresh_token: '',
       gender: '',
       birthdate: '2000-01-01',

apps/e2e/cypress/e2e/proposals.cy.ts

@@ -317,6 +317,11 @@ context('Proposal tests', () => {
 
       cy.contains('OK').click();
 
+      cy.get('[data-cy="questionary-stepper"').contains('New proposal').click();
+
+      cy.get('#title-input').should('have.value', title);
+      cy.get('#abstract-input').should('have.value', modifiedAbstract);
+
       cy.contains('Dashboard').click();
       cy.contains(title);
       cy.contains('submitted');

apps/frontend/src/components/proposal/ProposalContainer.tsx

@@ -129,6 +129,14 @@ export default function ProposalContainer(props: ProposalContainerProps) {
         }
         draftState.isDirty = true;
         break;
+
+      case 'ITEM_WITH_QUESTIONARY_SUBMITTED':
+        draftState.proposal = {
+          ...draftState.proposal,
+          ...action.itemWithQuestionary,
+        };
+
+        break;
     }
 
     return draftState;

apps/frontend/src/components/proposal/ProposalSummary.tsx

@@ -164,13 +164,13 @@ function ProposalReview({ confirm }: ProposalSummaryProps) {
                     proposalPk: state.proposal.primaryKey,
                   });
 
-                  dispatch({
-                    type: 'ITEM_WITH_QUESTIONARY_MODIFIED',
-                    itemWithQuestionary: submitProposal,
-                  });
+                  const { proposal } = await api().getProposal({
+                    primaryKey: submitProposal.primaryKey,
+                  }); // refetching proposal after event handling is done in backend
+
                   dispatch({
                     type: 'ITEM_WITH_QUESTIONARY_SUBMITTED',
-                    itemWithQuestionary: submitProposal,
+                    itemWithQuestionary: proposal!,
                   });
                 } finally {
                   setSubmitDisabled(true);

apps/frontend/src/components/questionary/NavigationFragment.tsx

@@ -19,6 +19,7 @@ const NavigationFragment = (props: {
       marginTop={3}
       spacing={1}
       alignItems="center"
+      data-cy="navigation-fragment"
     >
       {props.isLoading && <UOLoader size="2em" />}
       <>{props.children}</>

apps/frontend/src/hooks/visit/useBlankVisitRegistration.ts

@@ -34,6 +34,7 @@ function createRegistrationStub(
       position: '',
       email: '',
       country: '',
+      oidc_sub: '',
     },
     questionary: {
       isCompleted: false,