Merge remote-tracking branch 'origin/main'

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@openmrs/esm-dispensing-app",
- "version": "1.3.2",
+ "version": "1.4.0",
  "license": "MPL-2.0",
  "description": "Medication dispensing application",
  "browser": "dist/openmrs-esm-dispensing-app.js",

src/forms/dispense-form.component.tsx

@@ -64,11 +64,6 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
  // to prevent duplicate submits
  const [isSubmitting, setIsSubmitting] = useState(false);
 
- //track quantity to dispense
- const [currentQuantity, setCurrentQuantity] = useState(
- quantityRemaining ? quantityRemaining : medicationDispense?.quantity?.value,
- );
-
  // Submit medication dispense form
  const handleSubmit = () => {
  if (!isSubmitting) {
@@ -170,10 +165,6 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
  }
  };
 
- const setAvailableQuantity = (batch) => {
- setCurrentQuantity(Number(batch.quantity));
- };
-
  // initialize the internal dispense payload with the dispenses passed in as props
  useEffect(() => setMedicationDispensePayload(medicationDispense), [medicationDispense]);
 
@@ -218,14 +209,13 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
  <MedicationDispenseReview
  medicationDispense={medicationDispensePayload}
  updateMedicationDispense={setMedicationDispensePayload}
- quantityRemaining={currentQuantity}
+ quantityRemaining={quantityRemaining}
  />
  {config.enableStockDispense && (
  <StockDispense
  inventoryItem={inventoryItem}
  medicationDispense={medicationDispense}
  updateInventoryItem={setInventoryItem}
- updateAvailableQuantityToMedicationDispenseQuantity={setAvailableQuantity}
  />
  )}
  </div>

src/forms/medication-dispense-review.component.tsx

@@ -305,11 +305,7 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
  }
  min={0}
  max={config.dispenseBehavior.restrictTotalQuantityDispensed ? quantityRemaining : undefined}
- value={
- quantityRemaining <= medicationDispense.quantity.value
- ? quantityRemaining
- : medicationDispense.quantity.value
- }
+ value={medicationDispense.quantity.value}
  onChange={(e) => {
  updateMedicationDispense({
  ...medicationDispense,

src/forms/stock-dispense/stock-dispense.component.tsx

@@ -9,14 +9,9 @@ type StockDispenseProps = {
  medicationDispense: MedicationDispense;
  updateInventoryItem: (inventoryItem: InventoryItem) => void;
  inventoryItem: InventoryItem;
- updateAvailableQuantityToMedicationDispenseQuantity: (inventoryItem: InventoryItem) => void;
 };
 
-const StockDispense: React.FC<StockDispenseProps> = ({
- medicationDispense,
- updateInventoryItem,
- updateAvailableQuantityToMedicationDispenseQuantity,
-}) => {
+const StockDispense: React.FC<StockDispenseProps> = ({ medicationDispense, updateInventoryItem }) => {
  const { t } = useTranslation();
  const drugUuid = medicationDispense?.medicationReference?.reference?.split('/')[1];
  const { inventoryItems, error, isLoading } = useDispenseStock(drugUuid);
@@ -26,6 +21,7 @@ const StockDispense: React.FC<StockDispenseProps> = ({
  return new Date(dateString);
  }
 
+ //check whether the drug will expire before the medication period ends
  function isValidBatch(medicationToDispense, inventoryItem) {
  if (medicationToDispense?.dosageInstruction && medicationToDispense?.dosageInstruction.length > 0) {
  return medicationToDispense.dosageInstruction.some((instruction) => {
@@ -110,7 +106,6 @@ const StockDispense: React.FC<StockDispenseProps> = ({
  items={validInventoryItems}
  onChange={({ selectedItem }) => {
  updateInventoryItem(selectedItem);
- updateAvailableQuantityToMedicationDispenseQuantity(selectedItem);
  }}
  itemToString={(item) => (item ? toStockDispense(item) : '')}
  titleText={t('stockDispense', 'Stock Dispense')}