Skip to content

Commit

Permalink
UIOR-1348: Add "Donor (Deprecated)" label for PO line search by Donor…
Browse files Browse the repository at this point in the history
… filed
  • Loading branch information
alisher-epam committed Nov 27, 2024
1 parent 9657ceb commit f75fc55
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 28 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## 7.1.0 (IN PROGRESS)

* Add "Donor (Deprecated)" label for PO line search by Donor filed. Refs UIOR-1348.

## [7.0.1](https://github.com/folio-org/ui-orders/tree/v7.0.1) (2024-11-14)
[Full Changelog](https://github.com/folio-org/ui-orders/compare/v7.0.0...v7.0.1)

Expand Down
13 changes: 0 additions & 13 deletions src/common/utils/getAcqUnitsByIds.js

This file was deleted.

7 changes: 0 additions & 7 deletions src/common/utils/getVersionMetadata.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/common/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export * from './checkPOLinesAbandonedHoldings';
export * from './checkRelatedHoldings';
export * from './createClearFilterHandler';
export * from './fieldArray';
export * from './getAcqUnitsByIds';
export * from './getFundOptions';
export * from './getSettingsList';
export * from './getAddresses';
Expand All @@ -16,7 +15,6 @@ export * from './getLocations';
export * from './getPOLinePieces';
export * from './getMaterialTypes';
export * from './getUserNameById';
export * from './getVersionMetadata';
export * from './getExportAccountNumbers';
export * from './getRecordMap';
export * from './getTenantAddresses';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ import {
useNamespace,
useOkapiKy,
} from '@folio/stripes/core';
import { useLocationsQuery } from '@folio/stripes-acq-components';
import {
useLocationsQuery,
getVersionMetadata,
} from '@folio/stripes-acq-components';

import {
getMaterialTypes,
getOrganizationsByIds,
getVersionMetadata,
} from '../../../../common/utils';
import {
useAcqMethods,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import {
} from '@folio/stripes/core';
import { getFullName } from '@folio/stripes/util';
import {
fetchAcqUnitsByIds,
getAddresses,
getVersionMetadata,
useUsersBatch,
} from '@folio/stripes-acq-components';

import { useOrder } from '../../../../common/hooks';
import {
getAcqUnitsByIds,
getOrganizationsByIds,
getTenantAddresses,
getVersionMetadata,
} from '../../../../common/utils';

const getUniqItems = (arr) => (
Expand Down Expand Up @@ -81,7 +81,7 @@ export const useSelectedPOVersion = ({ versionId, versions, snapshotPath }, opti
addressesMap,
] = await Promise.all([
getOrganizationsByIds(ky)(organizationIds).then(keyBy('id')),
getAcqUnitsByIds(ky)(acqUnitsIds).then(keyBy('id')),
fetchAcqUnitsByIds(ky)(acqUnitsIds).then(keyBy('id')),
getTenantAddresses(ky)()
.then(({ configs }) => getAddresses(configs))
.then(keyBy('id')),
Expand Down
3 changes: 3 additions & 0 deletions src/components/PurchaseOrder/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,8 @@ export const getPoFieldsLabelMap = () => {
'closeReason': 'ui-orders.orderSummary.closingReason',
'closeReason.reason': 'ui-orders.orderSummary.closingReason',
'closeReason.note': 'ui-orders.orderSummary.closingNote',

// Custom fields
'customFields.externalOrderNumber': 'ui-orders.orderDetails.externalOrderNumber',
};
};
2 changes: 1 addition & 1 deletion translations/ui-orders/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -681,8 +681,8 @@
"search.contributors": "Contributor",
"search.dateOpened": "Date opened",
"search.details.productIds": "Product ID",
"search.donor": "Donor",
"search.keyword": "Keyword",
"search.donor": "Donor (Deprecated)",
"search.metadata.createdDate": "Date created",
"search.physical.volumes": "Volumes",
"search.poLineNumber": "PO line number",
Expand Down

0 comments on commit f75fc55

Please sign in to comment.