Skip to content

Commit

Permalink
Merge branch 'master' into UIU-2701
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-blazhko authored Jan 23, 2025
2 parents 39a6e6d + 7d0fc72 commit 834a5ba
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.10...v11.0.11)

* Rename permission after BE changes. Refs UIU-3309.
* Permission sets detail record view: Description text marked as heading. Refs UIU-2938.

## [11.0.10](https://github.com/folio-org/ui-users/tree/v11.0.10) (2025-01-10)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.9...v11.0.10)
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"description": "",
"subPermissions": [
"ui-users.view",
"ui-users.edit",
"ui-authorization-roles.users.settings.manage"
],
"visible": true
Expand Down
11 changes: 7 additions & 4 deletions src/settings/permissions/PermissionSetDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { ViewMetaData } from '@folio/stripes/smart-components';

import RenderPermissions from '../../components/RenderPermissions';
import AssignedUsers from '../../components/AssignedUsers';
import css from './PermissionSetForm.css';

class PermissionSetDetails extends React.Component {
static propTypes = {
Expand Down Expand Up @@ -104,10 +105,12 @@ class PermissionSetDetails extends React.Component {
label={<FormattedMessage id="ui-users.permissions.permissionSetName" />}
value={_.get(selectedSet, ['displayName'], untitledPermissionSetMessage)}
/>
<KeyValue
label={<FormattedMessage id="ui-users.description" />}
value={_.get(selectedSet, ['description'], '-')}
/>
<Headline tag="h3" margin="xx-small" className={css.heading}>
<FormattedMessage id="ui-users.description" />
</Headline>
<div>
{_.get(selectedSet, ['description'], '-')}
</div>
</section>
</Col>
</Row>
Expand Down
4 changes: 4 additions & 0 deletions src/settings/permissions/PermissionSetForm.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.permSetForm {
height: 100%;
}

.heading{
font-size: 1.05rem;
}

0 comments on commit 834a5ba

Please sign in to comment.