fix: Abilities keys.

This commit is contained in:
elforjani13
2021-11-26 20:56:00 +02:00
parent ca3ff3fd8f
commit 63cb3f9fef
58 changed files with 443 additions and 494 deletions

View File

@@ -31,7 +31,7 @@ import withAlertActions from 'containers/Alert/withAlertActions';
import withAccountsTableActions from './withAccountsTableActions';
import withSettings from '../Settings/withSettings';
import withSettingsActions from '../Settings/withSettingsActions';
import { Account_Abilities, AbilitySubject } from '../../common/abilityOption';
import { AccountAction, AbilitySubject } from '../../common/abilityOption';
import { compose } from 'utils';
@@ -119,7 +119,7 @@ function AccountsActionsBar({
onChange={handleTabChange}
/>
<NavbarDivider />
<Can I={Account_Abilities.Create} a={AbilitySubject.Account}>
<Can I={AccountAction.Create} a={AbilitySubject.Account}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="plus" />}
@@ -187,7 +187,7 @@ function AccountsActionsBar({
onChange={handleTableRowSizeChange}
/>
<NavbarDivider />
<Can I={Account_Abilities.Edit} a={AbilitySubject.Account}>
<Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<Switch
labelElement={<T id={'inactive'} />}
defaultChecked={accountsInactiveMode}

View File

@@ -11,7 +11,7 @@ import {
import { Can, Icon, Money, If } from 'components';
import intl from 'react-intl-universal';
import { safeCallback } from 'utils';
import { AbilitySubject, Account_Abilities } from '../../common/abilityOption';
import { AbilitySubject, AccountAction } from '../../common/abilityOption';
/**
* Accounts table actions menu.
@@ -35,7 +35,7 @@ export function ActionsMenu({
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<Can I={Account_Abilities.Edit} a={AbilitySubject.Account}>
<Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
@@ -50,7 +50,7 @@ export function ActionsMenu({
/>
<MenuDivider />
</Can>
<Can I={Account_Abilities.Edit} a={AbilitySubject.Account}>
<Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<If condition={original.active}>
<MenuItem
text={intl.get('inactivate_account')}
@@ -66,7 +66,7 @@ export function ActionsMenu({
/>
</If>
</Can>
<Can I={Account_Abilities.Edit} a={AbilitySubject.Account}>
<Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<MenuItem
text={intl.get('delete_account')}
icon={<Icon icon="trash-16" iconSize={16} />}