Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UITEN-266 No errors when inventory-related interfaces are not present #375

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change history for ui-tenant-settings

## IN PROGRESS
## 8.0.1 (IN PROGRESS)

* [UITEN-266](https://issues.folio.org/browse/UITEN-266) No longer displays non-working inventory-related pages when the inventory interfaces are not present.

## [8.0.0](https://github.com/folio-org/ui-tenant-settings/tree/v8.0.0)(2023-10-13)
[Full Changelog](https://github.com/folio-org/ui-tenant-settings/compare/v7.4.0...v8.0.0)
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"route": "/tenant-settings",
"okapiInterfaces": {
"configuration": "2.0",
"location-units": "2.0",
"locations": "3.0",
"login-saml": "2.0",
"service-points": "3.0",
"users": "15.0 16.0"
},
"optionalOkapiInterfaces": {
"location-units": "2.0",
"locations": "3.0",
"remote-storage-configurations": "1.0",
"remote-storage-mappings": "1.0 2.0"
"remote-storage-mappings": "1.0 2.0",
"service-points": "3.0"
},
"permissionSets": [
{
Expand Down
15 changes: 14 additions & 1 deletion src/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class Organization extends React.Component {
label: <FormattedMessage id="ui-tenant-settings.settings.servicePoints.label" />,
component: ServicePoints,
perm: 'ui-tenant-settings.settings.servicepoints.view',
iface: 'service-points',
},
],
},
Expand All @@ -72,24 +73,28 @@ class Organization extends React.Component {
label: <FormattedMessage id="ui-tenant-settings.settings.location.institutions" />,
component: LocationInstitutions,
perm: 'ui-tenant-settings.settings.location.view',
iface: 'location-units',
},
{
route: 'location-campuses',
label: <FormattedMessage id="ui-tenant-settings.settings.location.campuses" />,
component: LocationCampuses,
perm: 'ui-tenant-settings.settings.location.view',
iface: 'location-units',
},
{
route: 'location-libraries',
label: <FormattedMessage id="ui-tenant-settings.settings.location.libraries" />,
component: LocationLibraries,
perm: 'ui-tenant-settings.settings.location.view',
iface: 'location-units',
},
{
route: 'location-locations',
label: <FormattedMessage id="ui-tenant-settings.settings.location.locations" />,
component: LocationLocations,
perm: 'ui-tenant-settings.settings.location.view',
iface: 'location-units',
},
],
}
Expand All @@ -109,10 +114,18 @@ class Organization extends React.Component {
*/

render() {
// If this PR is accepted, we will not need to do this filtering by hand:
// https://github.com/folio-org/stripes-smart-components/pull/1401#issuecomment-1771334495
// But for now ...
const sections = this.sections.map(section => ({
label: section.label,
pages: section.pages.filter(page => !page.iface || this.props.stripes.hasInterface(page.iface)),
}));

return (
<Settings
{...this.props}
sections={this.sections}
sections={sections}
paneTitle={<FormattedMessage id="ui-tenant-settings.settings.index.paneTitle" />}
/>
);
Expand Down
Loading