diff --git a/CHANGELOG.md b/CHANGELOG.md index 4026bd20..07078bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change history for ui-organizations -## 5.0.0 (IN PROGRESS) +## 5.1.0 (IN PROGRESS) + +* Designate Organization as donor. Refs UIORGS-383. + +## [5.0.0](https://github.com/folio-org/ui-organizations/tree/v5.0.0) (2023-10-12) +[Full Changelog](https://github.com/folio-org/ui-organizations/compare/v4.0.0...v5.0.0) * Unpin `@rehooks/local-storage` now that it's no longer broken. Refs UIORGS-344. * Add `Note` field to contact people summary list. Refs UIORGS-352. @@ -11,6 +16,7 @@ * Upgrade `Node.js` to `18` version in GitHub Actions. Refs UIORGS-378. * *BREAKING* bump `react-intl` to `v6.4.4`. Refs UIORGS-386. * Add a message indicating future functionality for EDI naming convention. Refs UIORGS-382. +* Bump optional plugins to their `@folio/stripes` `v9` compatible versions. Refs UIORGS-404. ## [4.0.0](https://github.com/folio-org/ui-organizations/tree/v4.0.0) (2023-02-22) [Full Changelog](https://github.com/folio-org/ui-organizations/compare/v3.3.1...v4.0.0) diff --git a/package.json b/package.json index 36ef3a48..913f9a26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@folio/organizations", - "version": "5.0.0", + "version": "5.1.0", "description": "Organizations", "main": "index.js", "repository": "folio-org/ui-organizations", @@ -264,7 +264,7 @@ "@folio/service-interaction": "^2.0.0", "@folio/stripes": "^9.0.0", "@folio/stripes-cli": "^3.0.0", - "@formatjs/cli": "^6.1.3", + "@formatjs/cli": "^6.1.3", "babel-jest": "^26.3.0", "chai": "^4.2.0", "core-js": "^3.6.4", @@ -290,7 +290,7 @@ "regenerator-runtime": "^0.13.3" }, "dependencies": { - "@folio/plugin-find-organization": "^4.0.0", + "@folio/plugin-find-organization": "^5.0.0", "@folio/stripes-acq-components": "~5.0.0", "lodash": "^4.17.5", "moment-timezone": "^0.5.20", @@ -312,12 +312,10 @@ "redux": "^4.0.0" }, "optionalDependencies": { - "@folio/plugin-find-contact": "^3.2.0", - "@folio/plugin-find-interface": "^3.2.0" + "@folio/plugin-find-contact": "^5.0.0", + "@folio/plugin-find-interface": "^5.0.0" }, "optionalOkapiInterfaces": { - "servint": "2.0 3.0", - "@folio/plugin-find-contact": "^4.0.0", - "@folio/plugin-find-interface": "^4.0.0" + "servint": "2.0 3.0" } } diff --git a/src/Organizations/OrganizationCreate/OrganizationCreate.js b/src/Organizations/OrganizationCreate/OrganizationCreate.js index 26bbf3f2..24f5d6de 100644 --- a/src/Organizations/OrganizationCreate/OrganizationCreate.js +++ b/src/Organizations/OrganizationCreate/OrganizationCreate.js @@ -19,6 +19,7 @@ const INITIAL_VALUES = { interfaces: [], contacts: [], isVendor: false, + isDonor: false, edi: { vendorEdiType: '31B/US-SAN', libEdiType: '31B/US-SAN', diff --git a/src/Organizations/OrganizationDetails/OrganizationDetails.js b/src/Organizations/OrganizationDetails/OrganizationDetails.js index 2d381b61..6c6a71d1 100644 --- a/src/Organizations/OrganizationDetails/OrganizationDetails.js +++ b/src/Organizations/OrganizationDetails/OrganizationDetails.js @@ -269,6 +269,7 @@ const OrganizationDetails = ({ description={organization.description} erpCode={organization.erpCode} isVendor={organization.isVendor} + isDonor={organization.isDonor} language={organization.language} metadata={organization.metadata} name={organization.name} diff --git a/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.js b/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.js index d8a04dc6..ae5cb36a 100644 --- a/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.js +++ b/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.js @@ -31,6 +31,7 @@ const OrganizationSummary = ({ description, erpCode, isVendor, + isDonor, language, metadata, name, @@ -101,6 +102,15 @@ const OrganizationSummary = ({ /> + + } + vertical + /> + +
-
+
- ui-organizations.contactPeople.name -
-
- ui-organizations.contactPeople.categories -
-
- ui-organizations.contactPeople.emails -
-
- ui-organizations.contactPeople.note +
+ ui-organizations.contactPeople.name +
+
+ ui-organizations.contactPeople.categories +
+
+ ui-organizations.contactPeople.emails +
+
+ ui-organizations.contactPeople.note +
+
-
-
-
- -
- Brownstein, Carrie -
-
-
- cust.service03@amazon.com -
-
- - notes - -
-
- -
- -
-
+
+
+ +
+ +
diff --git a/src/Organizations/OrganizationForm/OrganizationForm.test.js b/src/Organizations/OrganizationForm/OrganizationForm.test.js index 5ff71694..71c527bd 100644 --- a/src/Organizations/OrganizationForm/OrganizationForm.test.js +++ b/src/Organizations/OrganizationForm/OrganizationForm.test.js @@ -1,7 +1,3 @@ -import React from 'react'; -import { render, screen, act } from '@folio/jest-config-stripes/testing-library/react'; -import { queryHelpers } from '@folio/jest-config-stripes/testing-library/dom'; -import user from '@folio/jest-config-stripes/testing-library/user-event'; import { MemoryRouter } from 'react-router-dom'; import { useHistory } from 'react-router'; @@ -10,12 +6,18 @@ import { expandAllSections, collapseAllSections, } from '@folio/stripes/components'; -import { organizationTypes } from 'fixtures'; +import { + render, + screen, + act, +} from '@folio/jest-config-stripes/testing-library/react'; +import { queryHelpers } from '@folio/jest-config-stripes/testing-library/dom'; +import user from '@folio/jest-config-stripes/testing-library/user-event'; +import { organizationTypes } from 'fixtures'; import { ORGANIZATIONS_ROUTE } from '../../common/constants'; import OrganizationForm from './OrganizationForm'; - jest.mock('react-router', () => ({ ...jest.requireActual('react-router'), useHistory: jest.fn(), diff --git a/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap index 80fd9bb2..87554144 100644 --- a/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap +++ b/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap @@ -10,90 +10,74 @@ exports[`OrganizationInterfacesForm should render correct structure 1`] = ` class="col-xs-12" >
-
+
- ui-organizations.interface.name -
-
- ui-organizations.interface.url +
+ ui-organizations.interface.name +
+
+ ui-organizations.interface.url +
+
-
-
-
- -
- GOBI -
-
- - www.gobi3.com +
+ GOBI +
-
-
-
+
+ + +
-
-
diff --git a/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.js b/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.js index d9459640..6973df2e 100644 --- a/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.js +++ b/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.js @@ -159,20 +159,6 @@ function OrganizationSummaryForm({ initialValues }) { name="language" /> - - } - name="isVendor" - type="checkbox" - onChange={onChangeIsVendor} - vertical - validateFields={[]} - /> - + + } + name="isDonor" + type="checkbox" + vertical + validateFields={[]} + /> + + + } + name="isVendor" + type="checkbox" + vertical + onChange={onChangeIsVendor} + validateFields={[]} + /> + } diff --git a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap index 200624cf..048253ee 100644 --- a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap +++ b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap @@ -7765,60 +7765,6 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
-
-
- -
-
-
@@ -7945,14 +7891,14 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = ` >