5139 delete response requisition lines

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

@@ -760,6 +760,16 @@ export type BatchRequestRequisitionResponse = {
   updateRequestRequisitions?: Maybe<Array<UpdateRequestRequisitionResponseWithId>>;
 };
 
+export type BatchResponseRequisitionInput = {
+  continueOnError?: InputMaybe<Scalars['Boolean']['input']>;
+  deleteResponseRequisitionLines?: InputMaybe<Array<DeleteResponseRequisitionLineInput>>;
+};
+
+export type BatchResponseRequisitionResponse = {
+  __typename: 'BatchResponseRequisitionResponse';
+  deleteResponseRequisitionLines?: Maybe<Array<DeleteResponseRequisitionLineResponseWithId>>;
+};
+
 export type BatchStocktakeInput = {
   continueOnError?: InputMaybe<Scalars['Boolean']['input']>;
   deleteStocktakeLines?: InputMaybe<Array<DeleteStocktakeLineInput>>;
@@ -823,7 +833,7 @@ export type CannotEditInvoice = AddToInboundShipmentFromMasterListErrorInterface
   description: Scalars['String']['output'];
 };
 
-export type CannotEditRequisition = AddFromMasterListErrorInterface & CreateRequisitionShipmentErrorInterface & DeleteRequestRequisitionErrorInterface & DeleteRequestRequisitionLineErrorInterface & InsertRequestRequisitionLineErrorInterface & InsertResponseRequisitionLineErrorInterface & SupplyRequestedQuantityErrorInterface & UpdateRequestRequisitionErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionErrorInterface & UpdateResponseRequisitionLineErrorInterface & UseSuggestedQuantityErrorInterface & {
+export type CannotEditRequisition = AddFromMasterListErrorInterface & CreateRequisitionShipmentErrorInterface & DeleteRequestRequisitionErrorInterface & DeleteRequestRequisitionLineErrorInterface & DeleteResponseRequisitionLineErrorInterface & InsertRequestRequisitionLineErrorInterface & InsertResponseRequisitionLineErrorInterface & SupplyRequestedQuantityErrorInterface & UpdateRequestRequisitionErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionErrorInterface & UpdateResponseRequisitionLineErrorInterface & UseSuggestedQuantityErrorInterface & {
   __typename: 'CannotEditRequisition';
   description: Scalars['String']['output'];
 };
@@ -1511,6 +1521,27 @@ export type DeleteResponse = {
   id: Scalars['String']['output'];
 };
 
+export type DeleteResponseRequisitionLineError = {
+  __typename: 'DeleteResponseRequisitionLineError';
+  error: DeleteResponseRequisitionLineErrorInterface;
+};
+
+export type DeleteResponseRequisitionLineErrorInterface = {
+  description: Scalars['String']['output'];
+};
+
+export type DeleteResponseRequisitionLineInput = {
+  id: Scalars['String']['input'];
+};
+
+export type DeleteResponseRequisitionLineResponse = DeleteResponse | DeleteResponseRequisitionLineError;
+
+export type DeleteResponseRequisitionLineResponseWithId = {
+  __typename: 'DeleteResponseRequisitionLineResponseWithId';
+  id: Scalars['String']['output'];
+  response: DeleteResponseRequisitionLineResponse;
+};
+
 export type DeleteStocktakeError = {
   __typename: 'DeleteStocktakeError';
   error: DeleteStocktakeErrorInterface;
@@ -2120,7 +2151,7 @@ export enum ForeignKey {
   StockLineId = 'stockLineId'
 }
 
-export type ForeignKeyError = DeleteInboundShipmentLineErrorInterface & DeleteInboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentLineErrorInterface & DeleteOutboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentUnallocatedLineErrorInterface & DeletePrescriptionLineErrorInterface & InsertInboundShipmentLineErrorInterface & InsertInboundShipmentServiceLineErrorInterface & InsertOutboundShipmentLineErrorInterface & InsertOutboundShipmentServiceLineErrorInterface & InsertOutboundShipmentUnallocatedLineErrorInterface & InsertPrescriptionLineErrorInterface & InsertRequestRequisitionLineErrorInterface & InsertResponseRequisitionLineErrorInterface & UpdateInboundShipmentLineErrorInterface & UpdateInboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentLineErrorInterface & UpdateOutboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentUnallocatedLineErrorInterface & UpdatePrescriptionLineErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionLineErrorInterface & {
+export type ForeignKeyError = DeleteInboundShipmentLineErrorInterface & DeleteInboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentLineErrorInterface & DeleteOutboundShipmentServiceLineErrorInterface & DeleteOutboundShipmentUnallocatedLineErrorInterface & DeletePrescriptionLineErrorInterface & DeleteResponseRequisitionLineErrorInterface & InsertInboundShipmentLineErrorInterface & InsertInboundShipmentServiceLineErrorInterface & InsertOutboundShipmentLineErrorInterface & InsertOutboundShipmentServiceLineErrorInterface & InsertOutboundShipmentUnallocatedLineErrorInterface & InsertPrescriptionLineErrorInterface & InsertRequestRequisitionLineErrorInterface & InsertResponseRequisitionLineErrorInterface & UpdateInboundShipmentLineErrorInterface & UpdateInboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentLineErrorInterface & UpdateOutboundShipmentServiceLineErrorInterface & UpdateOutboundShipmentUnallocatedLineErrorInterface & UpdatePrescriptionLineErrorInterface & UpdateRequestRequisitionLineErrorInterface & UpdateResponseRequisitionLineErrorInterface & {
   __typename: 'ForeignKeyError';
   description: Scalars['String']['output'];
   key: ForeignKey;
@@ -3826,6 +3857,7 @@ export type Mutations = {
   batchOutboundShipment: BatchOutboundShipmentResponse;
   batchPrescription: BatchPrescriptionResponse;
   batchRequestRequisition: BatchRequestRequisitionResponse;
+  batchResponseRequisition: BatchResponseRequisitionResponse;
   batchStocktake: BatchStocktakeResponse;
   centralServer: CentralServerMutationNode;
   createInventoryAdjustment: CreateInventoryAdjustmentResponse;
@@ -3850,6 +3882,7 @@ export type Mutations = {
   deletePrescriptionLine: DeletePrescriptionLineResponse;
   deleteRequestRequisition: DeleteRequestRequisitionResponse;
   deleteRequestRequisitionLine: DeleteRequestRequisitionLineResponse;
+  deleteResponseRequisitionLine: DeleteResponseRequisitionLineResponse;
   deleteStocktake: DeleteStocktakeResponse;
   deleteStocktakeLine: DeleteStocktakeLineResponse;
   deleteSupplierReturn: DeleteSupplierReturnResponse;
@@ -4009,6 +4042,12 @@ export type MutationsBatchRequestRequisitionArgs = {
 };
 
 
+export type MutationsBatchResponseRequisitionArgs = {
+  input: BatchResponseRequisitionInput;
+  storeId: Scalars['String']['input'];
+};
+
+
 export type MutationsBatchStocktakeArgs = {
   input: BatchStocktakeInput;
   storeId: Scalars['String']['input'];
@@ -4111,6 +4150,12 @@ export type MutationsDeleteRequestRequisitionLineArgs = {
 };
 
 
+export type MutationsDeleteResponseRequisitionLineArgs = {
+  input: DeleteResponseRequisitionLineInput;
+  storeId: Scalars['String']['input'];
+};
+
+
 export type MutationsDeleteStocktakeArgs = {
   input: DeleteStocktakeInput;
   storeId: Scalars['String']['input'];
@@ -6186,7 +6231,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 & 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 & 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'];
 };
@@ -8042,7 +8087,9 @@ export type UpdateResponseRequisitionLineErrorInterface = {
 export type UpdateResponseRequisitionLineInput = {
   comment?: InputMaybe<Scalars['String']['input']>;
   id: Scalars['String']['input'];
+  requestedQuantity?: InputMaybe<Scalars['Float']['input']>;
   supplyQuantity?: InputMaybe<Scalars['Float']['input']>;
+  theirStockOnHand?: InputMaybe<Scalars['Float']['input']>;
 };
 
 export type UpdateResponseRequisitionLineResponse = RequisitionLineNode | UpdateResponseRequisitionLineError;

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

@@ -13,7 +13,7 @@ import {
 } from '@openmsupply-client/common';
 import { AppRoute } from '@openmsupply-client/config';
 import { ActivityLogList } from '@openmsupply-client/system';
-import { Toolbar } from './Toolbar';
+import { Toolbar } from './Toolbar/Toolbar';
 import { Footer } from './Footer';
 import { AppBarButtons } from './AppBarButtons';
 import { SidePanel } from './SidePanel';

client/packages/requisitions/src/ResponseRequisition/DetailView/Toolbar.tsx → client/packages/requisitions/src/ResponseRequisition/DetailView/Toolbar/Toolbar.tsx

@@ -4,9 +4,6 @@ import {
   Box,
   InputWithLabelRow,
   Grid,
-  DropdownMenu,
-  DropdownMenuItem,
-  DeleteIcon,
   useTranslation,
   SearchBar,
   Typography,
@@ -16,8 +13,9 @@ import {
 } from '@openmsupply-client/common';
 import { CustomerSearchInput } from '@openmsupply-client/system';
 
-import { useResponse } from '../api';
-import { getApprovalStatusKey } from '../../utils';
+import { useResponse } from '../../api';
+import { getApprovalStatusKey } from '../../../utils';
+import { ToolbarDropDown } from './ToolbarDropDown';
 
 export const Toolbar: FC = () => {
   const t = useTranslation();
@@ -42,7 +40,6 @@ export const Toolbar: FC = () => {
     'period',
     'orderType',
   ]);
-  const { onDelete } = useResponse.line.delete();
   const noLinkedShipments = (shipments?.totalCount ?? 0) === 0;
   const showInfo = noLinkedShipments && !isDisabled;
   const { isRemoteAuthorisation } = useResponse.utils.isRemoteAuthorisation();
@@ -132,16 +129,7 @@ export const Toolbar: FC = () => {
           }}
           debounceTime={0}
         />
-
-        <DropdownMenu label={t('label.actions')}>
-          <DropdownMenuItem
-            IconComponent={DeleteIcon}
-            onClick={onDelete}
-            disabled={isDisabled}
-          >
-            {t('button.delete-lines', { ns: 'distribution' })}
-          </DropdownMenuItem>
-        </DropdownMenu>
+        <ToolbarDropDown isDisabled={isDisabled} />
       </Grid>
     </AppBarContentPortal>
   );

client/packages/requisitions/src/ResponseRequisition/DetailView/Toolbar/ToolbarDropDown.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import {
+  DropdownMenu,
+  DropdownMenuItem,
+  DeleteIcon,
+  useTranslation,
+} from '@openmsupply-client/common';
+import { useResponse } from '../../api';
+
+interface ToolbarDropDownProps {
+  isDisabled: boolean;
+}
+
+export const ToolbarDropDown = ({ isDisabled }: ToolbarDropDownProps) => {
+  const t = useTranslation();
+  const onDelete = useResponse.line.delete();
+
+  return (
+    <DropdownMenu label={t('label.actions')}>
+      <DropdownMenuItem
+        IconComponent={DeleteIcon}
+        onClick={onDelete}
+        disabled={isDisabled}
+      >
+        {t('button.delete-lines', { ns: 'distribution' })}
+      </DropdownMenuItem>
+    </DropdownMenu>
+  );
+};

client/packages/requisitions/src/ResponseRequisition/DetailView/Toolbar/index.ts

@@ -0,0 +1 @@
+export * from './Toolbar';

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

@@ -191,22 +191,37 @@ export const getResponseQueries = (sdk: Sdk, storeId: string) => ({
 
     throw new Error('Unable to update requisition');
   },
-  deleteLines: async (_: ResponseLineFragment[]) => {
-    // NOT YET IMPLEMENTED IN SERVER API
-
-    // const ids = responseLines.map(responseParser.toDeleteLine);
-    // const result = await sdk.deleteRequestLines({ ids, storeId });
-
-    // if (result.batchRequestRequisition.deleteRequestRequisitionLines) {
-    //   const failedLines =
-    //     result.batchRequestRequisition.deleteRequestRequisitionLines.filter(
-    //       line =>
-    //         line.response.__typename === 'DeleteRequestRequisitionLineError'
-    //     );
-    //   if (failedLines.length === 0) {
-    //     return result.batchRequestRequisition.deleteRequestRequisitionLines;
-    //   }
-    // }
+  deleteLine: async (responseLineId: string) => {
+    const ids = [{ id: responseLineId }];
+    const result = await sdk.deleteResponseLines({ ids, storeId });
+
+    if (result.batchResponseRequisition.deleteResponseRequisitionLines) {
+      const failedLines =
+        result.batchResponseRequisition.deleteResponseRequisitionLines.filter(
+          line =>
+            line.response.__typename === 'DeleteResponseRequisitionLineError'
+        );
+      if (failedLines.length === 0) {
+        return result.batchResponseRequisition.deleteResponseRequisitionLines;
+      }
+    }
+
+    throw new Error('Could not delete requisition lines!');
+  },
+  deleteLines: async (responseLines: ResponseLineFragment[]) => {
+    const ids = responseLines.map(responseParser.toDeleteLine);
+    const result = await sdk.deleteResponseLines({ ids, storeId });
+
+    if (result.batchResponseRequisition.deleteResponseRequisitionLines) {
+      const failedLines =
+        result.batchResponseRequisition.deleteResponseRequisitionLines.filter(
+          line =>
+            line.response.__typename === 'DeleteResponseRequisitionLineError'
+        );
+      if (failedLines.length === 0) {
+        return result.batchResponseRequisition.deleteResponseRequisitionLines;
+      }
+    }
 
     throw new Error('Could not delete requisition lines!');
   },

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

@@ -16,7 +16,7 @@ export const useResponse = {
   line: {
     list: Lines.useResponseLines,
     stats: Lines.useResponseLineStatsData,
-
+    deleteLine: Lines.useDeleteResponseLine,
     delete: Lines.useDeleteResponseLines,
     save: Lines.useSaveResponseLines,
   },

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

@@ -2,10 +2,12 @@ import { useDeleteResponseLines } from './useDeleteResponseLines';
 import { useResponseLines } from './useResponseLines';
 import { useResponseLineStatsData } from './useResponseLineStatsData';
 import { useSaveResponseLines } from './useSaveResponseLines';
+import { useDeleteResponseLine } from './useDeleteResponseLine';
 
 export const Lines = {
+  useDeleteResponseLine,
   useDeleteResponseLines,
   useResponseLines,
   useSaveResponseLines,
-  useResponseLineStatsData
+  useResponseLineStatsData,
 };

client/packages/requisitions/src/ResponseRequisition/api/hooks/line/useDeleteResponseLine.ts

@@ -0,0 +1,15 @@
+import { useQueryClient, useMutation } from '@openmsupply-client/common';
+import { useResponseApi } from '../utils/useResponseApi';
+import { useResponseNumber } from '../document/useResponse';
+
+export const useDeleteResponseLine = () => {
+  const api = useResponseApi();
+  const responseNumber = useResponseNumber();
+
+  const queryClient = useQueryClient();
+  const { mutate } = useMutation(api.deleteLine, {
+    onSettled: () =>
+      queryClient.invalidateQueries(api.keys.detail(responseNumber)),
+  });
+  return mutate;
+};

client/packages/requisitions/src/ResponseRequisition/api/hooks/line/useDeleteResponseLines.ts

@@ -1,23 +1,22 @@
 import {
   useQueryClient,
   useMutation,
-  useNotification,
   useTranslation,
   useTableStore,
+  useDeleteConfirmation,
 } from '@openmsupply-client/common';
 import { useResponse } from '..';
 import { useResponseNumber } from '../document/useResponse';
 import { useResponseApi } from '../utils/useResponseApi';
 import { useResponseLines } from './useResponseLines';
 
 export const useDeleteResponseLines = () => {
-  const { success, info } = useNotification();
   const { lines } = useResponseLines();
   const api = useResponseApi();
   const requestNumber = useResponseNumber();
   const isDisabled = useResponse.utils.isDisabled();
   const queryClient = useQueryClient();
-  const { mutate } = useMutation(api.deleteLines, {
+  const { mutateAsync } = useMutation(api.deleteLines, {
     onSettled: () =>
       queryClient.invalidateQueries(api.keys.detail(requestNumber)),
   });
@@ -28,21 +27,25 @@ export const useDeleteResponseLines = () => {
   );
 
   const onDelete = async () => {
-    if (isDisabled) {
-      info(t('label.cant-delete-disabled-requisition'))();
-      return;
-    }
-    info('Deleting response lines not yet implemented in API')();
-    return;
-    const number = selectedRows?.length;
-    if (selectedRows && number) {
-      mutate(selectedRows, {
-        onSuccess: success(t('messages.deleted-lines', { count: number })),
-      });
-    } else {
-      info(t('messages.select-rows-to-delete-them'))();
-    }
+    mutateAsync(selectedRows).catch(err => {
+      throw err;
+    });
   };
 
-  return { onDelete };
+  const confirmAndDelete = useDeleteConfirmation({
+    selectedRows,
+    deleteAction: onDelete,
+    canDelete: !isDisabled,
+    messages: {
+      confirmMessage: t('messages.confirm-delete-requisition-lines', {
+        count: selectedRows.length,
+      }),
+      deleteSuccess: t('messages.deleted-lines', {
+        count: selectedRows.length,
+      }),
+      cantDelete: t('label.cant-delete-disabled-requisition'),
+    },
+  });
+
+  return confirmAndDelete;
 };