Skip to content

Commit

Permalink
Merge branch 'uid-159' of github.com:folio-org/ui-developer into uid-159
Browse files Browse the repository at this point in the history
  • Loading branch information
ncovercash committed Oct 10, 2024
2 parents 616a4ce + 8213efe commit 6a59ac2
Show file tree
Hide file tree
Showing 7 changed files with 273 additions and 268 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Optionally suppress react-intl warnings. Refs UID-140.
* Use type=password for auto login password field. Refs UID-147.
* *BREAKING* Purge service-worker cruft; leverage new STCOR functions for RTR display.
* Fence off ShowCapabilities behind IfInterface checks for capabilities, capability-sets. Refs UID-162.

## [8.0.0](https://github.com/folio-org/ui-developer/tree/v8.0.0) (2023-10-19)
[Full Changelog](https://github.com/folio-org/ui-developer/compare/v7.0.0...v8.0.0)
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
],
"okapiInterfaces": {},
"optionalOkapiInterfaces": {
"app-manager": "1.0"
"app-manager": "1.0",
"capabilities": "1.0",
"capability-sets": "1.0"
},
"permissionSets": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/settings/RefreshTokenRotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
import { useCallback, useEffect, useState } from 'react';
import { FormattedMessage } from 'react-intl';

import { Button, LoadingPane, Pane, PaneHeader } from '@folio/stripes/components';
import { getTokenExpiry, RTR_CONSTANTS } from '@folio/stripes/core';
import { Button, LoadingPane, Pane, PaneHeader } from '@folio/stripes/components';

/**
* manipulate AT/RT expiration dates in storage in order to test RTR.
Expand Down
14 changes: 8 additions & 6 deletions src/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ const pages = [
labelId: 'ui-developer.okapiPaths',
component: OkapiPaths,
},
{
route: 'capabilities',
labelId: 'ui-developer.canIUseCapabilities',
component: ShowCapabilities,
perm: 'ui-developer.settings.configuration',
},
{
route: 'can-i-use',
labelId: 'ui-developer.canIUse',
Expand Down Expand Up @@ -168,6 +162,14 @@ const DeveloperSettings = (props) => {
});
}

if (stripes.hasInterface('capabilities') || stripes.hasInterface('capability-sets')) {
allPages.push({
route: 'capabilities',
labelId: 'ui-developer.canIUseCapabilities',
component: ShowCapabilities,
});
}

allPages.forEach(p => {
p.label = intl.formatMessage({ id: p.labelId });
});
Expand Down
264 changes: 132 additions & 132 deletions translations/ui-developer/es.json

Large diffs are not rendered by default.

252 changes: 126 additions & 126 deletions translations/ui-developer/es_ES.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions translations/ui-developer/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"configuration.listInvisiblePermissions": "add-permメニューに「非表示」の権限をリストしますか?",
"configuration.actAsRoot": "ユーザーがすべての権限を持っているかのように振る舞いますか?",
"hotkeys.instructions": "この領域がフォーカスされている場合は、次のように入力します。",
"hotkeys.home": "to go to the Home page",
"hotkeys.about": "to go to the About page",
"hotkeys.home": "Homeページへ",
"hotkeys.about": "Aboutページへ",
"hotkeys.undefined": "undefined",
"setToken.authenticationToken": "認証トークン(JWT)",
"sessionLocale.temporarySessionLocale": "暫定セッションロケール",
Expand Down

0 comments on commit 6a59ac2

Please sign in to comment.