Fix xpress workflow (#1620)

Author: jekabs-karklins

apps/backend/src/queries/StatusActionQueries.ts

@@ -28,7 +28,7 @@ export default class StatusActionQueries {
     public emailTemplateDataSource: EmailTemplateDataSource
   ) {}
 
-  @Authorized([Roles.USER_OFFICER])
+  @Authorized([Roles.USER_OFFICER, Roles.INSTRUMENT_SCIENTIST])
   async getStatusAction(agent: UserWithRole | null, actionId: number) {
     const statusAction = await this.dataSource.getStatusAction(actionId);
 
@@ -42,15 +42,15 @@ export default class StatusActionQueries {
     return statusActions;
   }
 
-  @Authorized([Roles.USER_OFFICER])
+  @Authorized([Roles.USER_OFFICER, Roles.INSTRUMENT_SCIENTIST])
   async getConnectionStatusActions(
     agent: UserWithRole | null,
     { workflowConnectionId }: { workflowConnectionId: number }
   ) {
     return this.dataSource.getConnectionStatusActions(workflowConnectionId);
   }
 
-  @Authorized([Roles.USER_OFFICER])
+  @Authorized([Roles.USER_OFFICER, Roles.INSTRUMENT_SCIENTIST])
   async getStatusActionConfig(
     agent: UserWithRole | null,
     statusAction: StatusAction

apps/backend/src/queries/WorkflowQueries.ts

@@ -17,7 +17,7 @@ export default class WorkflowQueries {
     public emailService: MailService
   ) {}
 
-  @Authorized([Roles.USER_OFFICER])
+  @Authorized([Roles.USER_OFFICER, Roles.INSTRUMENT_SCIENTIST])
   async getWorkflow(
     agent: UserWithRole | null,
     id: number,

apps/frontend/src/components/techniqueProposal/TechniqueProposalTable.tsx

@@ -333,13 +333,15 @@ const TechniqueProposalTable = ({ confirm }: { confirm: WithConfirmType }) => {
 
   const updateProposalStatus = async (
     proposalPk: number,
-    workflowStatusId: number
+    workflowStatusId: number,
+    statusActionsWorkflowConnectionId?: number
   ): Promise<void> => {
     await api({
       toastSuccessMessage: 'Proposal status updated successfully!',
     }).changeTechniqueProposalsStatus({
       workflowStatusId: workflowStatusId,
       proposalPks: [proposalPk],
+      statusActionsWorkflowConnectionId,
     });
 
     refreshTableData();
@@ -619,10 +621,33 @@ const TechniqueProposalTable = ({ confirm }: { confirm: WithConfirmType }) => {
                                 'Selected workflow status not found'
                               );
                             }
-                            updateProposalStatus(
-                              rowData.primaryKey,
-                              selectedWorkflowStatus.workflowStatusId
-                            );
+
+                            return api()
+                              .getWorkflow({
+                                workflowId: rowData.workflowId,
+                                entityType: WorkflowType.PROPOSAL,
+                              })
+                              .then(({ workflow }) => {
+                                const connectionsWithActions =
+                                  workflow?.connections.filter(
+                                    (conn) =>
+                                      conn.nextWorkflowStatusId ===
+                                        selectedWorkflowStatus.workflowStatusId &&
+                                      conn.statusActions &&
+                                      conn.statusActions.length > 0
+                                  ) || [];
+
+                                const statusActionsWorkflowConnectionId =
+                                  connectionsWithActions.length === 1
+                                    ? connectionsWithActions[0].id
+                                    : undefined;
+
+                                updateProposalStatus(
+                                  rowData.primaryKey,
+                                  selectedWorkflowStatus.workflowStatusId,
+                                  statusActionsWorkflowConnectionId
+                                );
+                              });
                           });
                       },
                       {

apps/frontend/src/graphql/proposal/changeTechniqueProposalsStatus.graphql

@@ -1,11 +1,13 @@
 mutation changeTechniqueProposalsStatus(
   $proposalPks: [Int!]!
   $workflowStatusId: Int!
+  $statusActionsWorkflowConnectionId: Int
 ) {
   changeTechniqueProposalsStatus(
     changeProposalsStatusInput: {
       proposalPks: $proposalPks
       workflowStatusId: $workflowStatusId
+      statusActionsWorkflowConnectionId: $statusActionsWorkflowConnectionId
     }
   )
 }