From 9603db9f3809a5303fcce307dcd26eddcdd78492 Mon Sep 17 00:00:00 2001
From: Artem Blazhko <artem_blazhko@epam.com>
Date: Wed, 16 Nov 2022 23:49:25 +0200
Subject: [PATCH] UIREQ-840: Cannot save item request from On Order item,
 because need a barcode (#978)

---
 src/RequestForm.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/RequestForm.js b/src/RequestForm.js
index 89ff07d3..5cc87f1d 100644
--- a/src/RequestForm.js
+++ b/src/RequestForm.js
@@ -208,6 +208,7 @@ class RequestForm extends React.Component {
       shouldValidateInstanceId: false,
       isInstanceIdBlur: false,
       validatedInstanceId: null,
+      isItemIdRequest: Boolean(this.props.query?.itemId),
     };
 
     this.connectedCancelRequestDialog = props.stripes.connect(CancelRequestDialog);
@@ -669,13 +670,16 @@ class RequestForm extends React.Component {
     });
   }
 
-  findItem(key, value, isValidation = false) {
+  findItem(key, value, isValidation = false, isBarcodeRequired = false) {
     const {
       findResource,
       form,
       onSetSelectedItem,
       onShowErrorModal,
     } = this.props;
+    const {
+      isItemIdRequest,
+    } = this.state;
 
     this.setState({
       isItemOrInstanceLoading: true,
@@ -696,6 +700,16 @@ class RequestForm extends React.Component {
 
       return findResource(RESOURCE_TYPES.ITEM, value, key)
         .then((result) => {
+          if (key === 'id' && !isBarcodeRequired) {
+            this.setState({
+              isItemIdRequest: true,
+            });
+          } else if (key === 'barcode' && isItemIdRequest) {
+            this.setState({
+              isItemIdRequest: false,
+            });
+          }
+
           if (!result || result.totalRecords === 0) {
             this.setState({
               isItemOrInstanceLoading: false,
@@ -945,8 +959,13 @@ class RequestForm extends React.Component {
     } = this.props;
     const {
       shouldValidateItemBarcode,
+      isItemIdRequest,
     } = this.state;
 
+    if (isItemIdRequest && !barcode) {
+      return undefined;
+    }
+
     if (!barcode || (!barcode && !selectedItem?.id)) {
       return <FormattedMessage id="ui-requests.errors.selectItemRequired" />;
     }
@@ -1217,13 +1236,15 @@ class RequestForm extends React.Component {
     this.setState({
       isItemsDialogOpen: false,
       requestTypeOptions: [],
-    });
+      isItemIdRequest: false,
+    }, this.triggerItemBarcodeValidation);
   }
 
   handleInstanceItemClick = (event, item) => {
     const {
       onSetSelectedInstance,
     } = this.props;
+    let isBarcodeRequired = false;
 
     onSetSelectedInstance(undefined);
     this.setState({
@@ -1231,7 +1252,14 @@ class RequestForm extends React.Component {
       requestTypeOptions: [],
     });
 
-    this.findItem('id', item.id);
+    if (item?.barcode) {
+      isBarcodeRequired = true;
+      this.setState({
+        isItemIdRequest: false,
+      });
+    }
+
+    this.findItem('id', item.id, false, isBarcodeRequired);
   }
 
   handleCloseProxy = () => {