Merge branch 'master' of github.com:folio-org/ui-organizations into f…

…eat/number_generator
folio-org · Oct 23, 2023 · 5b3bde5 · 5b3bde5
2 parents d79dcd9 + 3b34502
commit 5b3bde5
Show file tree

Hide file tree

Showing 42 changed files with 868 additions and 701 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -31,6 +31,7 @@ const OrganizationSummary = ({
   description,
   erpCode,
   isVendor,
+  isDonor,
   language,
   metadata,
   name,
@@ -101,6 +102,15 @@ const OrganizationSummary = ({
           />
         </Col>
 
+        <Col xs={4}>
+          <Checkbox
+            checked={isDonor}
+            disabled
+            label={<FormattedMessage id="ui-organizations.summary.isDonor" />}
+            vertical
+          />
+        </Col>
+
         <Col xs={4}>
           <KeyValue
             data-testid="type"
@@ -150,6 +160,7 @@ OrganizationSummary.propTypes = {
   description: PropTypes.string,
   erpCode: PropTypes.string,
   isVendor: PropTypes.bool,
+  isDonor: PropTypes.bool,
   language: PropTypes.string,
   metadata: PropTypes.object,
   name: PropTypes.string,
@@ -160,6 +171,7 @@ OrganizationSummary.propTypes = {
 OrganizationSummary.defaultProps = {
   aliases: [],
   isVendor: false,
+  isDonor: false,
 };
 
 export default OrganizationSummary;