From 03ddde33f2a0f7510bb6c8f12565fd3c0601a49c Mon Sep 17 00:00:00 2001 From: Aliaksei Chumakou Date: Mon, 14 Jan 2019 18:51:25 +0300 Subject: [PATCH] UIOR-93 remove status field from PO Line screens --- .../POLineDetails/FieldWorkflowStatus.js | 37 ------------------- .../POLine/POLineDetails/POLineDetails.js | 6 --- .../POLine/POLineDetails/POLineDetailsForm.js | 4 -- .../CloseOrder/CloseOrderModal.js | 2 +- .../Summary/FieldWorkflowStatus.js | 2 +- translations/ui-orders/en.json | 4 -- 6 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 src/components/POLine/POLineDetails/FieldWorkflowStatus.js diff --git a/src/components/POLine/POLineDetails/FieldWorkflowStatus.js b/src/components/POLine/POLineDetails/FieldWorkflowStatus.js deleted file mode 100644 index 4ba7beff5..000000000 --- a/src/components/POLine/POLineDetails/FieldWorkflowStatus.js +++ /dev/null @@ -1,37 +0,0 @@ -import React, { Component } from 'react'; -import { FormattedMessage } from 'react-intl'; -import { Field } from 'redux-form'; - -import { Select } from '@folio/stripes/components'; - -export const WORKFLOW_STATUS = { - closed: 'Closed', - open: 'Open', - pending: 'Pending', -}; - -class FieldWorkflowStatus extends Component { - render() { - return ( - } - name="po_line_workflow_status" - > - - {(message) => } - - {Object.keys(WORKFLOW_STATUS).map((key) => ( - - {(message) => } - - ))} - - ); - } -} - -export default FieldWorkflowStatus; diff --git a/src/components/POLine/POLineDetails/POLineDetails.js b/src/components/POLine/POLineDetails/POLineDetails.js index df17e3560..e72e306d6 100644 --- a/src/components/POLine/POLineDetails/POLineDetails.js +++ b/src/components/POLine/POLineDetails/POLineDetails.js @@ -49,12 +49,6 @@ class POLineDetails extends Component { value={get(initialValues, 'order_format')} /> - - } - value={get(initialValues, 'po_line_workflow_status')} - /> - diff --git a/src/components/POLine/POLineDetails/POLineDetailsForm.js b/src/components/POLine/POLineDetails/POLineDetailsForm.js index a2e49d686..db5b5a845 100644 --- a/src/components/POLine/POLineDetails/POLineDetailsForm.js +++ b/src/components/POLine/POLineDetails/POLineDetailsForm.js @@ -16,7 +16,6 @@ import { import FolioFormattedTime from '../../FolioFormattedTime'; import FieldPaymentStatus from './FieldPaymentStatus'; import FieldReceiptStatus from './FieldReceiptStatus'; -import FieldWorkflowStatus from './FieldWorkflowStatus'; import FieldOrderFormat from './FieldOrderFormat'; import FieldAcquisitionMethod from './FieldAcquisitionMethod'; // import FieldSource from './FieldSource'; @@ -84,9 +83,6 @@ class POLineDetailsForm extends Component { orderVendorId={order.vendor} /> - - - diff --git a/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js b/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js index 1d25fb44c..d88c2332d 100644 --- a/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js +++ b/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js @@ -11,7 +11,7 @@ import { TextArea, } from '@folio/stripes/components'; -import { WORKFLOW_STATUS } from '../../POLine/POLineDetails/FieldWorkflowStatus'; +import { WORKFLOW_STATUS } from '../Summary/FieldWorkflowStatus'; import css from './CloseOrderModal.css'; const DEFAULT_REASONS = { diff --git a/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js b/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js index 912db339a..3f9184625 100644 --- a/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js +++ b/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js @@ -4,7 +4,7 @@ import { Field } from 'redux-form'; import { Select } from '@folio/stripes/components'; -const WORKFLOW_STATUS = { +export const WORKFLOW_STATUS = { closed: 'Closed', open: 'Open', pending: 'Pending', diff --git a/translations/ui-orders/en.json b/translations/ui-orders/en.json index 2eb220c16..1218b1100 100644 --- a/translations/ui-orders/en.json +++ b/translations/ui-orders/en.json @@ -440,9 +440,6 @@ "physical.removeBtn": "Remove", "physical.volume": "Volume", "physical.volumes": "Volumes", - "po_line_workflow_status.closed": "Closed", - "po_line_workflow_status.open": "Open", - "po_line_workflow_status.pending": "Pending", "poLine.acquisitionMethod": "Acquisition Method*", "poLine.cancellationRestriction": "Cancellation Restriction", "poLine.cancellationRestrictionNote": "Cancellation Description", @@ -454,7 +451,6 @@ "poLine.paymentStatus": "Payment Status", "poLine.poLineDescription": "Line Description", "poLine.poLineNumber": "PO Line ID", - "poLine.poLineWorkflowStatus": "Status", "poLine.receiptDate": "Receipt Date", "poLine.receiptStatus": "Receipt Status", "poLine.requester": "Requester",