diff --git a/.gitignore b/.gitignore index 169a9e36..b3a6300c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +yarn.lock + # Runtime data pids *.pid diff --git a/CHANGELOG.md b/CHANGELOG.md index 11fa798e..1cf73c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,31 @@ # Change history for ui-licenses -## 8.1.0 IN PROGRESS +## 8.1.0 2022-03-03 +* ERM-1982 Licenses: Organization interface credentials malfunction +* ERM-1945 Add AppSettings panel to Licenses +* ERM-1898 Upgrade `@folio/react-intl-safe-html` for compatibility with `@folio/stripes` `v7`. +* ERM-1758 Licenses: Apply keyboard shortcuts modal guidelines +* ERM-1745 Add Organisations to Licenses simple search widget definition +* ERM-1628 Expand emptyAccordion.* {type} for correct translations +* FAT-82 + * ERM-1508 PickListValueSettings + * ERM-1506 withFileHandlers + * ERM-1505 ViewLicenseRoute + * ERM-1504 ViewAmendmentRoute + * ERM-1503 NoteViewRoute + * ERM-1496 CreateAmendmentRoute + * ERM-1344 formSections + * ERM-1454 LicenseFormOrganizations + * ERM-1453 LicenseFormInternalContacts + * ERM-1452 LicenseFormInfo + * ERM-1451 FormTerms + * ERM-1450 FormSupplementaryDocs + * ERM-1449 FormCoreDocs + * ERM-1448 AmendmentFormInfo + * ERM-1301 NoPermissions + * ERM-1300 LicenseForm + * ERM-1293 Amendment -* Upgrade `@folio/react-intl-safe-html` for compatibility with `@folio/stripes` `v7`. ERM-1898 ## 8.0.0 2021-10-07 * Fixed bug with error on saving license if a change is made to the visibility (internal) flag of a primary property without populating it. ERM-1770 diff --git a/package.json b/package.json index 63a98389..7c178817 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,10 @@ "@bigtest/interactor": "^0.9.3", "@bigtest/mocha": "^0.5.2", "@bigtest/react": "^0.1.2", - "@folio/eslint-config-stripes": "^6.0.0", - "@folio/stripes": "^7.0.0", - "@folio/stripes-cli": "^2.3.0", - "@folio/stripes-testing": "^4.0.0", + "@folio/eslint-config-stripes": "^6.1.0", + "@folio/stripes": "^7.1.0", + "@folio/stripes-cli": "^2.5.0", + "@folio/stripes-testing": "^4.2.0", "@formatjs/cli": "^4.2.29", "@testing-library/dom": "^7.26.6", "@testing-library/jest-dom": "^5.11.5", @@ -63,9 +63,9 @@ }, "dependencies": { "@folio/react-intl-safe-html": "^3.1.0", - "@folio/stripes-erm-components": "^6.0.0", + "@folio/stripes-erm-components": "^6.1.0", "@k-int/stripes-kint-components": "^1.7.0", - "@folio/stripes-testing": "^4.0.0", + "@folio/stripes-testing": "^4.2.0", "@rehooks/local-storage": "2.4.0", "@testing-library/react": "^12.1.2", "compose-function": "^3.0.3", @@ -79,7 +79,7 @@ "react-router-prop-types": "^1.0.4" }, "peerDependencies": { - "@folio/stripes": "^7.0.0", + "@folio/stripes": "^7.1.0", "moment": "^2.22.2", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/src/routes/ViewAmendmentRoute/ViewAmendmentRoute.js b/src/routes/ViewAmendmentRoute/ViewAmendmentRoute.js index a4cc2eae..85e89c64 100644 --- a/src/routes/ViewAmendmentRoute/ViewAmendmentRoute.js +++ b/src/routes/ViewAmendmentRoute/ViewAmendmentRoute.js @@ -60,7 +60,7 @@ class ViewAmendmentRoute extends React.Component { }).isRequired, resources: PropTypes.shape({ license: PropTypes.object, - linkedAgreements: PropTypes.array, + linkedAgreements: PropTypes.arrayOf(PropTypes.object), terms: PropTypes.object, }).isRequired, stripes: PropTypes.shape({ diff --git a/test/bigtest/tests/pick-list-test.js b/test/bigtest/tests/pick-list-test.js index 366a367e..d19b35a2 100644 --- a/test/bigtest/tests/pick-list-test.js +++ b/test/bigtest/tests/pick-list-test.js @@ -95,7 +95,7 @@ describe('Pick list', () => { this.server.create('pickList', refDataCategories[3]); } - /* describe('Pick lists', () => { + describe.skip('Pick lists', () => { setupApplication(); const interactor = new PickListInteractor(); @@ -170,5 +170,5 @@ describe('Pick list', () => { }); }); }); - }); */ + }); });