Remove the unassigning part

UserOfficeProject · Oct 21, 2024 · 62ad9be · 62ad9be
1 parent ef1c09f
commit 62ad9be
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 72 deletions.
diff --git a/apps/backend/src/mutations/InstrumentMutations.ts b/apps/backend/src/mutations/InstrumentMutations.ts
@@ -452,20 +452,4 @@ export default class InstrumentMutations {
   ): Promise<InstrumentsHasProposals | Rejection> {
     return this.assignProposalsToInstrumentsInternal(agent, args);
   }
-
-  @Authorized([Roles.USER_OFFICER, Roles.INSTRUMENT_SCIENTIST])
-  async removeXpressProposalsFromInstrument(
-    agent: UserWithRole | null,
-    args: RemoveProposalsFromInstrumentArgs
-  ): Promise<boolean | Rejection> {
-    return this.dataSource
-      .removeProposalsFromInstrument(args.proposalPks)
-      .catch((error) => {
-        return rejection(
-          'Could not remove assigned proposal/s from instrument',
-          { agent, args },
-          error
-        );
-      });
-  }
 }
diff --git a/apps/backend/src/resolvers/mutations/AssignProposalsToInstrumentsMutation.ts b/apps/backend/src/resolvers/mutations/AssignProposalsToInstrumentsMutation.ts
@@ -90,24 +90,4 @@ export class AssignProposalsToInstrumentsMutation {
 
     return isRejection(res) ? res : true;
   }
-
-  @Mutation(() => Boolean)
-  async removeXpressProposalsFromInstrument(
-    @Args() args: RemoveProposalsFromInstrumentArgs,
-    @Ctx() context: ResolverContext
-  ) {
-    const isXpressProposals =
-      await context.mutations.technique.checkProposalsHasTechniques(
-        args.proposalPks
-      );
-
-    if (!isXpressProposals) {
-      return false;
-    }
-
-    return context.mutations.instrument.removeXpressProposalsFromInstrument(
-      context.user,
-      args
-    );
-  }
 }
diff --git a/apps/e2e/cypress/e2e/xpress.cy.ts b/apps/e2e/cypress/e2e/xpress.cy.ts
@@ -867,18 +867,6 @@ context('Xpress tests', () => {
       cy.get('[role="listbox"]').contains(instrument1.name).click();
       cy.finishedLoading();
       cy.contains(instrument1.name);
-
-      // Unassign instrument 1 from proposal 1
-      cy.contains(proposal1.title)
-        .parent()
-        .find('[data-cy="instrument-dropdown"]')
-        .click();
-      cy.get('[role="listbox"]').contains('NONE').click();
-      cy.finishedLoading();
-      cy.get('table.MuiTable-root tbody tr').should(
-        'not.contain',
-        instrument1.name
-      );
     });
 
     it('Instrument scientist able to select, assign and unassign an instrument for a proposal', function () {
@@ -911,18 +899,6 @@ context('Xpress tests', () => {
       cy.get('[role="listbox"]').contains(instrument1.name).click();
       cy.finishedLoading();
       cy.contains(instrument1.name);
-
-      // Unassign instrument 1 from proposal 1
-      cy.contains(proposal1.title)
-        .parent()
-        .find('[data-cy="instrument-dropdown"]')
-        .click();
-      cy.get('[role="listbox"]').contains('NONE').click();
-      cy.finishedLoading();
-      cy.get('table.MuiTable-root tbody tr').should(
-        'not.contain',
-        instrument1.name
-      );
     });
   });
 });
diff --git a/apps/frontend/src/components/xpress/XpressProposalTable.tsx b/apps/frontend/src/components/xpress/XpressProposalTable.tsx
@@ -149,15 +149,6 @@ const XpressProposalTable = () => {
         proposalPks: [proposalPk],
         instrumentIds: [instrument],
       });
-    } else {
-      await api({
-        toastSuccessMessage: `Proposal/s removed from the ${i18n.format(
-          t('instrument'),
-          'lowercase'
-        )} successfully!`,
-      }).removeXpressProposalsFromInstrument({
-        proposalPks: [proposalPk],
-      });
     }
 
     refreshTableData();

diff --git a/apps/frontend/src/graphql/instrument/removeXpressProposalsFromInstrument.graphql b/apps/frontend/src/graphql/instrument/removeXpressProposalsFromInstrument.graphql