Merge pull request #5269 from msupply-foundation/5242-add-delete-response-requisitions

5242 add delete response requisitions

Author: roxy-dao

client/packages/common/src/intl/locales/en/common.json

@@ -1472,6 +1472,10 @@
   "messages.zero-line-quantities_one": "The quantity of 1 line has been set to 0",
   "messages.zero-line-quantities_other": "The quantity of {{count}} lines has been set to 0",
   "messages.zero-return-quantity-will-delete-lines": "There are no return quantities specified. Click OK again to confirm and remove these lines from the return.",
+  "messages.cannot-delete-finalised-requisition": "Cannot delete finalised requisition",
+  "messages.record-not-found": "Record not found",
+  "messages.cannot-delete-requisition-with-shipment": "Cannot delete requisition linked to a shipment",
+  "messages.cannot-delete-transfer-requisition": "Cannot delete transfer requisition",
   "monitoring": "Monitoring",
   "multiple": "[multiple]",
   "outbound-shipment": "Outbound Shipments",

client/packages/common/src/types/schema.ts

@@ -767,11 +767,13 @@ export type BatchRequestRequisitionResponse = {
 export type BatchResponseRequisitionInput = {
   continueOnError?: InputMaybe<Scalars['Boolean']['input']>;
   deleteResponseRequisitionLines?: InputMaybe<Array<DeleteResponseRequisitionLineInput>>;
+  deleteResponseRequisitions?: InputMaybe<Array<DeleteResponseRequisitionInput>>;
 };
 
 export type BatchResponseRequisitionResponse = {
   __typename: 'BatchResponseRequisitionResponse';
   deleteResponseRequisitionLines?: Maybe<Array<DeleteResponseRequisitionLineResponseWithId>>;
+  deleteResponseRequisitions?: Maybe<Array<DeleteResponseRequisitionResponseWithId>>;
 };
 
 export type BatchStocktakeInput = {
@@ -1588,6 +1590,19 @@ export type DeleteResponse = {
   id: Scalars['String']['output'];
 };
 
+export type DeleteResponseRequisitionError = {
+  __typename: 'DeleteResponseRequisitionError';
+  error: DeleteResponseRequisitionErrorInterface;
+};
+
+export type DeleteResponseRequisitionErrorInterface = {
+  description: Scalars['String']['output'];
+};
+
+export type DeleteResponseRequisitionInput = {
+  id: Scalars['String']['input'];
+};
+
 export type DeleteResponseRequisitionLineError = {
   __typename: 'DeleteResponseRequisitionLineError';
   error: DeleteResponseRequisitionLineErrorInterface;
@@ -1609,6 +1624,14 @@ export type DeleteResponseRequisitionLineResponseWithId = {
   response: DeleteResponseRequisitionLineResponse;
 };
 
+export type DeleteResponseRequisitionResponse = DeleteResponse | DeleteResponseRequisitionError;
+
+export type DeleteResponseRequisitionResponseWithId = {
+  __typename: 'DeleteResponseRequisitionResponseWithId';
+  id: Scalars['String']['output'];
+  response: DeleteResponseRequisitionResponse;
+};
+
 export type DeleteStocktakeError = {
   __typename: 'DeleteStocktakeError';
   error: DeleteStocktakeErrorInterface;
@@ -2209,6 +2232,11 @@ export type FinaliseRnRFormInput = {
 
 export type FinaliseRnRFormResponse = RnRFormNode;
 
+export type FinalisedRequisition = DeleteResponseRequisitionErrorInterface & {
+  __typename: 'FinalisedRequisition';
+  description: Scalars['String']['output'];
+};
+
 export enum ForeignKey {
   InvoiceId = 'invoiceId',
   ItemId = 'itemId',
@@ -3704,6 +3732,11 @@ export type LedgerSortInput = {
   key: LedgerSortFieldInput;
 };
 
+export type LineDeleteError = DeleteResponseRequisitionErrorInterface & {
+  __typename: 'LineDeleteError';
+  description: Scalars['String']['output'];
+};
+
 export type LinkPatientPatientToStoreError = {
   __typename: 'LinkPatientPatientToStoreError';
   error: LinkPatientPatientToStoreErrorInterface;
@@ -3948,6 +3981,7 @@ export type Mutations = {
   deletePrescriptionLine: DeletePrescriptionLineResponse;
   deleteRequestRequisition: DeleteRequestRequisitionResponse;
   deleteRequestRequisitionLine: DeleteRequestRequisitionLineResponse;
+  deleteResponseRequisition: DeleteResponseRequisitionResponse;
   deleteResponseRequisitionLine: DeleteResponseRequisitionLineResponse;
   deleteStocktake: DeleteStocktakeResponse;
   deleteStocktakeLine: DeleteStocktakeLineResponse;
@@ -4216,6 +4250,12 @@ export type MutationsDeleteRequestRequisitionLineArgs = {
 };
 
 
+export type MutationsDeleteResponseRequisitionArgs = {
+  input: DeleteResponseRequisitionInput;
+  storeId: Scalars['String']['input'];
+};
+
+
 export type MutationsDeleteResponseRequisitionLineArgs = {
   input: DeleteResponseRequisitionLineInput;
   storeId: Scalars['String']['input'];
@@ -6286,7 +6326,7 @@ export type RecordBelongsToAnotherStore = DeleteAssetErrorInterface & DeleteAsse
   description: Scalars['String']['output'];
 };
 
-export type RecordNotFound = AddFromMasterListErrorInterface & AddToInboundShipmentFromMasterListErrorInterface & AddToOutboundShipmentFromMasterListErrorInterface & AllocateOutboundShipmentUnallocatedLineErrorInterface & CreateRequisitionShipmentErrorInterface & DeleteAssetCatalogueItemErrorInterface & DeleteAssetErrorInterface & DeleteAssetLogReasonErrorInterface & DeleteCustomerReturnErrorInterface & DeleteErrorInterface & DeleteInboundShipmentErrorInterface & DeleteInboundShipmentLineErrorInterface & DeleteInboundShipmentServiceLineErrorInterface & DeleteLocationErrorInterface & DeleteOutboundShipmentLineErrorInterface & DeleteOutboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentUnallocatedLineErrorInterface & DeletePrescriptionErrorInterface & DeletePrescriptionLineErrorInterface & DeleteRequestRequisitionErrorInterface & DeleteRequestRequisitionLineErrorInterface & DeleteResponseRequisitionLineErrorInterface & DeleteSupplierReturnErrorInterface & DeleteVaccineCourseErrorInterface & NodeErrorInterface & RequisitionLineChartErrorInterface & RequisitionLineStatsErrorInterface & SupplyRequestedQuantityErrorInterface & UpdateAssetErrorInterface & UpdateErrorInterface & UpdateInboundShipmentErrorInterface & UpdateInboundShipmentLineErrorInterface & UpdateInboundShipmentServiceLineErrorInterface & UpdateLocationErrorInterface & UpdateNameErrorInterface & UpdateNamePropertiesErrorInterface & UpdateOutboundShipmentLineErrorInterface & UpdateOutboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentUnallocatedLineErrorInterface & UpdatePrescriptionErrorInterface & UpdatePrescriptionLineErrorInterface & UpdateRequestRequisitionErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionErrorInterface & UpdateResponseRequisitionLineErrorInterface & UpdateReturnOtherPartyErrorInterface & UpdateSensorErrorInterface & UpdateStockLineErrorInterface & UseSuggestedQuantityErrorInterface & {
+export type RecordNotFound = AddFromMasterListErrorInterface & AddToInboundShipmentFromMasterListErrorInterface & AddToOutboundShipmentFromMasterListErrorInterface & AllocateOutboundShipmentUnallocatedLineErrorInterface & CreateRequisitionShipmentErrorInterface & DeleteAssetCatalogueItemErrorInterface & DeleteAssetErrorInterface & DeleteAssetLogReasonErrorInterface & DeleteCustomerReturnErrorInterface & DeleteErrorInterface & DeleteInboundShipmentErrorInterface & DeleteInboundShipmentLineErrorInterface & DeleteInboundShipmentServiceLineErrorInterface & DeleteLocationErrorInterface & DeleteOutboundShipmentLineErrorInterface & DeleteOutboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentUnallocatedLineErrorInterface & DeletePrescriptionErrorInterface & DeletePrescriptionLineErrorInterface & DeleteRequestRequisitionErrorInterface & DeleteRequestRequisitionLineErrorInterface & DeleteResponseRequisitionErrorInterface & DeleteResponseRequisitionLineErrorInterface & DeleteSupplierReturnErrorInterface & DeleteVaccineCourseErrorInterface & NodeErrorInterface & RequisitionLineChartErrorInterface & RequisitionLineStatsErrorInterface & SupplyRequestedQuantityErrorInterface & UpdateAssetErrorInterface & UpdateErrorInterface & UpdateInboundShipmentErrorInterface & UpdateInboundShipmentLineErrorInterface & UpdateInboundShipmentServiceLineErrorInterface & UpdateLocationErrorInterface & UpdateNameErrorInterface & UpdateNamePropertiesErrorInterface & UpdateOutboundShipmentLineErrorInterface & UpdateOutboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentUnallocatedLineErrorInterface & UpdatePrescriptionErrorInterface & UpdatePrescriptionLineErrorInterface & UpdateRequestRequisitionErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionErrorInterface & UpdateResponseRequisitionLineErrorInterface & UpdateReturnOtherPartyErrorInterface & UpdateSensorErrorInterface & UpdateStockLineErrorInterface & UseSuggestedQuantityErrorInterface & {
   __typename: 'RecordNotFound';
   description: Scalars['String']['output'];
 };
@@ -6649,6 +6689,11 @@ export type RequisitionSortInput = {
   key: RequisitionSortFieldInput;
 };
 
+export type RequisitionWithShipment = DeleteResponseRequisitionErrorInterface & {
+  __typename: 'RequisitionWithShipment';
+  description: Scalars['String']['output'];
+};
+
 export type RequisitionsResponse = RequisitionConnector;
 
 export type ResponseRequisitionCounts = {
@@ -7498,6 +7543,11 @@ export type TokenExpired = RefreshTokenErrorInterface & {
   description: Scalars['String']['output'];
 };
 
+export type TransferredRequisition = DeleteResponseRequisitionErrorInterface & {
+  __typename: 'TransferredRequisition';
+  description: Scalars['String']['output'];
+};
+
 export type UnallocatedLineForItemAlreadyExists = InsertOutboundShipmentUnallocatedLineErrorInterface & {
   __typename: 'UnallocatedLineForItemAlreadyExists';
   description: Scalars['String']['output'];

client/packages/requisitions/src/ResponseRequisition/ListView/ListView.tsx

@@ -131,7 +131,10 @@ export const ResponseRequisitionListView: FC = () => {
         t(getApprovalStatusKey(rowData.approvalStatus)),
     });
   }
-  columnDefinitions.push(['comment', { minWidth: 400, Cell: TooltipTextCell }]);
+  columnDefinitions.push(
+    ['comment', { minWidth: 350, Cell: TooltipTextCell }],
+    ['selection']
+  );
 
   const columns = useColumns<ResponseRowFragment>(
     columnDefinitions,

client/packages/requisitions/src/ResponseRequisition/ListView/Toolbar.tsx

@@ -6,11 +6,16 @@ import {
   Box,
   useTranslation,
   RequisitionNodeStatus,
+  DeleteIcon,
+  DropdownMenu,
+  DropdownMenuItem,
 } from '@openmsupply-client/common';
+import { useResponse } from '../api';
 
 export const Toolbar: FC<{
   filter: FilterController;
 }> = () => {
+  const onDelete = useResponse.document.deleteSelected();
   const t = useTranslation();
 
   return (
@@ -51,6 +56,11 @@ export const Toolbar: FC<{
           ]}
         />
       </Box>
+      <DropdownMenu label={t('label.actions')}>
+        <DropdownMenuItem IconComponent={DeleteIcon} onClick={onDelete}>
+          {t('button.delete-lines')}
+        </DropdownMenuItem>
+      </DropdownMenu>
     </AppBarContentPortal>
   );
 };

client/packages/requisitions/src/ResponseRequisition/api/api.ts

@@ -82,6 +82,9 @@ const responseParser = {
       status: responseParser.toStatus(requisition),
     };
   },
+  toDelete: (line: ResponseFragment) => {
+    return { id: line.id };
+  },
   toDeleteLine: (line: ResponseLineFragment) => ({ id: line.id }),
   toUpdateLine: (
     patch: DraftResponseLine
@@ -223,6 +226,23 @@ export const getResponseQueries = (sdk: Sdk, storeId: string) => ({
 
     throw new Error('Unable to update requisition');
   },
+  deleteResponses: async (requisitions: ResponseFragment[]) => {
+    const deleteResponseRequisitions = requisitions.map(
+      responseParser.toDelete
+    );
+    const result = await sdk.deleteRequest({
+      storeId,
+      input: { deleteResponseRequisitions },
+    });
+
+    const { batchResponseRequisition } = result || {};
+
+    if (batchResponseRequisition?.deleteResponseRequisitions) {
+      return batchResponseRequisition.deleteResponseRequisitions;
+    }
+
+    throw new Error('Could not delete requisitions');
+  },
   deleteLines: async (responseLines: ResponseLineFragment[]) => {
     const ids = responseLines.map(responseParser.toDeleteLine);
     const result = await sdk.deleteResponseLines({ ids, storeId });

client/packages/requisitions/src/ResponseRequisition/api/hooks/document/index.ts

@@ -5,13 +5,17 @@ import { useResponseFields } from './useResponseFields';
 import { useResponses } from './useResponses';
 import { useResponsesAll } from './useResponsesAll';
 import { useUpdateResponse } from './useUpdateResponse';
+import { useDeleteResponses } from './useDeleteResponses';
+import { useDeleteSelectedResponseRequisitions } from './useDeleteSelectedResponseRequisitions';
 
 export const Document = {
   useResponse,
   useResponseFields,
   useResponses,
   useResponsesAll,
   useUpdateResponse,
+  useDeleteResponses,
+  useDeleteSelectedResponseRequisitions,
   useInsertResponse,
   useInsertProgramResponse,
 };

client/packages/requisitions/src/ResponseRequisition/api/hooks/document/useDeleteResponses.ts

@@ -0,0 +1,12 @@
+import { useQueryClient, useMutation } from '@openmsupply-client/common';
+import { useResponseApi } from '../utils/useResponseApi';
+
+export const useDeleteResponses = () => {
+  const queryClient = useQueryClient();
+  const api = useResponseApi();
+  return useMutation(api.deleteResponses, {
+    onSuccess: () => {
+      queryClient.invalidateQueries(api.keys.base());
+    },
+  });
+};

client/packages/requisitions/src/ResponseRequisition/api/hooks/document/useDeleteSelectedResponseRequisitions.ts

@@ -0,0 +1,63 @@
+import {
+  useTranslation,
+  useTableStore,
+  RequisitionNodeStatus,
+  useDeleteConfirmation,
+  useUrlQueryParams,
+} from '@openmsupply-client/common';
+import { ResponseFragment } from '../../operations.generated';
+import { useDeleteResponses } from './useDeleteResponses';
+import { useResponses } from './useResponses';
+
+export const useDeleteSelectedResponseRequisitions = () => {
+  const { queryParams } = useUrlQueryParams({
+    initialSort: { key: 'createdDatetime', dir: 'desc' },
+  });
+  const { data: rows } = useResponses(queryParams);
+  const { mutateAsync } = useDeleteResponses();
+  const t = useTranslation();
+  const { selectedRows } = useTableStore(state => ({
+    selectedRows: Object.keys(state.rowState)
+      .filter(id => state.rowState[id]?.isSelected)
+      .map(selectedId => rows?.nodes?.find(({ id }) => selectedId === id))
+      .filter(Boolean) as ResponseFragment[],
+  }));
+  const deleteAction = async () => {
+    let result = await mutateAsync(selectedRows).catch(err => {
+      throw err;
+    });
+    // check for errors
+    result.forEach(line => {
+      if (line.response.__typename == 'DeleteResponseRequisitionError') {
+        switch (line.response.error.__typename) {
+          case 'FinalisedRequisition':
+            throw Error(t('messages.cannot-delete-finalised-requisition'));
+          case 'RecordNotFound':
+            throw Error(t('messages.record-not-found'));
+          case 'RequisitionWithShipment':
+            throw Error(t('messages.cannot-delete-requisition-with-shipment'));
+          case 'TransferredRequisition':
+            throw Error(t('messages.cannot-delete-transfer-requisition'));
+        }
+      }
+    });
+  };
+
+  const confirmAndDelete = useDeleteConfirmation({
+    selectedRows,
+    deleteAction,
+    canDelete: selectedRows.every(
+      ({ status }) => status !== RequisitionNodeStatus.Finalised
+    ),
+    messages: {
+      confirmMessage: t('messages.confirm-delete-requisitions', {
+        count: selectedRows.length,
+      }),
+      deleteSuccess: t('messages.deleted-orders', {
+        count: selectedRows.length,
+      }),
+      cantDelete: (err: Error) => err.message,
+    },
+  });
+  return confirmAndDelete;
+};

client/packages/requisitions/src/ResponseRequisition/api/hooks/index.ts

@@ -11,7 +11,8 @@ export const useResponse = {
     insert: Document.useInsertResponse,
     insertProgram: Document.useInsertProgramResponse,
     update: Document.useUpdateResponse,
-
+    delete: Document.useDeleteResponses,
+    deleteSelected: Document.useDeleteSelectedResponseRequisitions,
     fields: Document.useResponseFields,
   },
   line: {