Skip to content

Commit

Permalink
UIEH-1436: Rename permissions to match the naming convention. (#1743)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmytro-Melnyshyn authored Oct 30, 2024
1 parent 4645e2f commit 9006788
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* *BREAKING* Upgrade `eholdings` to `4.0`. Change permission `kb-ebsco.kb-credentials.item.get` to `kb-ebsco.kb-credentials.key.item.get` and `kb-ebsco.kb-credentials.uc.item.get` to `kb-ebsco.kb-credentials.uc.key.item.get`. (UIEH-1431)
* Return permissions: `kb-ebsco.kb-credentials.uc.item.get`, `kb-ebsco.kb-credentials.item.get`. (UIEH-1434)
* migrate to shared CI workflows. (UIEH-1429)
* Rename permissions to match the naming convention. (UIEH-1436)

## [9.1.1] (https://github.com/folio-org/ui-eholdings/tree/v9.1.1) (2024-03-24)

Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
]
},
{
"permissionName": "ui-eholdings.app.enabled",
"permissionName": "ui-eholdings.app.view",
"replaces": ["ui-eholdings.app.enabled"],
"subPermissions": [
"module.eholdings.enabled"
],
Expand Down Expand Up @@ -222,8 +223,9 @@
]
},
{
"permissionName": "ui-eholdings.package-title.select-unselect",
"permissionName": "ui-eholdings.package-title.select-unselect.execute",
"displayName": "eHoldings: Can select/unselect packages and titles to/from your holdings",
"replaces": ["ui-eholdings.package-title.select-unselect"],
"visible": true,
"subPermissions": [
"module.eholdings.enabled",
Expand All @@ -244,8 +246,9 @@
]
},
{
"permissionName": "ui-eholdings.titles-packages.create-delete",
"permissionName": "ui-eholdings.titles-packages.create-delete.manage",
"displayName": "eHoldings: Can create and delete custom packages and titles",
"replaces": ["ui-eholdings.titles-packages.create-delete"],
"visible": true,
"subPermissions": [
"module.eholdings.enabled",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const ManagedPackageEdit = ({

const getActionMenu = () => {
const isAddButtonNeeded = !packageSelected || model.isPartiallySelected;
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect');
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect.execute');

if (!hasSelectPermission) return null;

Expand Down
2 changes: 1 addition & 1 deletion src/components/package/selection-status.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const SelectionStatus = ({
>
<SelectionStatusMessage model={model} />
<br />
<IfPermission perm="ui-eholdings.package-title.select-unselect">
<IfPermission perm="ui-eholdings.package-title.select-unselect.execute">
<SelectionStatusButton
model={model}
onAddToHoldings={onAddToHoldings}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const EditHoldingStatus = ({
const renderToggleSelectionStatusButton = () => {
if ((!resourceSelected && !isSelectInFlight) || (!model.isSelected && isSelectInFlight)) {
return (
<IfPermission perm="ui-eholdings.package-title.select-unselect">
<IfPermission perm="ui-eholdings.package-title.select-unselect.execute">
<Button
buttonStyle="primary"
onClick={handleToggleResourceHoldings}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const ResourceEditCustomTitle = ({
};

const getActionMenu = () => {
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect');
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect.execute');

if (!hasSelectPermission || !resourceSelected) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const ResourceEditManagedTitle = ({
};

const getActionMenu = () => {
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect');
const hasSelectPermission = stripes.hasPerm('ui-eholdings.package-title.select-unselect.execute');

if (!hasSelectPermission) {
return null;
Expand Down
4 changes: 2 additions & 2 deletions src/constants/permissionNames.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const RECORDS_EDIT_PERMISSION = 'ui-eholdings.records.edit';

export const TITLES_PACKAGES_CREATE_DELETE_PERMISSION = 'ui-eholdings.titles-packages.create-delete';
export const TITLES_PACKAGES_CREATE_DELETE_PERMISSION = 'ui-eholdings.titles-packages.create-delete.manage';

export const PACKAGE_TITLE_SELECT_UNSELECT_PERMISSION = 'ui-eholdings.package-title.select-unselect';
export const PACKAGE_TITLE_SELECT_UNSELECT_PERMISSION = 'ui-eholdings.package-title.select-unselect.execute';
6 changes: 3 additions & 3 deletions translations/ui-eholdings/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -619,14 +619,14 @@
"selection-modal.buttonWorking": "Removing...",
"selection-modal.buttonConfirm": "Yes, remove",

"permission.app.enabled": "eHoldings: Can view providers, packages, titles detail records",
"permission.app.view": "eHoldings: Can view providers, packages, titles detail records",
"permission.settings.enabled": "Settings (eHoldings): View settings",
"permission.settings.kb": "Settings (eHoldings): Can create, edit, and view knowledge base credentials",
"permission.settings.kb.delete": "Settings (eHoldings): Can delete knowledge base credentials",
"permission.settings.root-proxy": "Settings (eHoldings): configure root proxy setting",
"permission.package-title.select-unselect": "eHoldings: Can select/unselect packages and titles to/from your holdings",
"permission.package-title.select-unselect.execute": "eHoldings: Can select/unselect packages and titles to/from your holdings",
"permission.records.edit": "eHoldings: Can edit providers, packages, titles detail records",
"permission.titles-packages.create-delete": "eHoldings: Can create and delete custom packages and titles",
"permission.titles-packages.create-delete.manage": "eHoldings: Can create and delete custom packages and titles",
"permission.costperuse.view": "eHoldings: Can view Usage & analysis data for packages, titles and resources",
"permission.settings.access-types.all": "Settings (eholdings): Can create, edit, view, and delete access status types",
"permission.settings.access-types.create-edit": "Settings (eholdings): Can create, edit, and view access status types",
Expand Down

0 comments on commit 9006788

Please sign in to comment.