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

@@ -21,7 +21,7 @@ import {
AdvancedFilterPopover,
DashboardRowsHeightButton,
} from 'components';
import { Bill_Abilities, AbilitySubject } from '../../../../common/abilityOption';
import { BillAction, AbilitySubject } from '../../../../common/abilityOption';
import withBillsActions from './withBillsActions';
import withBills from './withBills';
@@ -88,7 +88,7 @@ function BillActionsBar({
onChange={handleTabChange}
/>
<NavbarDivider />
<Can I={Bill_Abilities.Create} a={AbilitySubject.Bill}>
<Can I={BillAction.Create} a={AbilitySubject.Bill}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />}

View File

@@ -3,10 +3,7 @@ import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
import { Can, FormattedMessage as T } from 'components';
import {
Bill_Abilities,
AbilitySubject,
} from '../../../../common/abilityOption';
import { BillAction, AbilitySubject } from '../../../../common/abilityOption';
export default function BillsEmptyStatus() {
const history = useHistory();
@@ -21,7 +18,7 @@ export default function BillsEmptyStatus() {
}
action={
<>
<Can I={Bill_Abilities.Create} a={AbilitySubject.Bill}>
<Can I={BillAction.Create} a={AbilitySubject.Bill}>
<Button
intent={Intent.PRIMARY}
large={true}

View File

@@ -20,8 +20,8 @@ import {
} from 'components';
import { formattedAmount, safeCallback, isBlank, calculateStatus } from 'utils';
import {
Bill_Abilities,
Payment_Made_Abilities,
BillAction,
PaymentMadeAction,
AbilitySubject,
} from '../../../../common/abilityOption';
@@ -46,7 +46,7 @@ export function ActionsMenu({
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<Can I={Bill_Abilities.Edit} a={AbilitySubject.Bill}>
<Can I={BillAction.Edit} a={AbilitySubject.Bill}>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
@@ -62,7 +62,7 @@ export function ActionsMenu({
/>
</If>
</Can>
<Can I={Payment_Made_Abilities.Create} a={AbilitySubject.PaymentMade}>
<Can I={PaymentMadeAction.Create} a={AbilitySubject.PaymentMade}>
<If condition={original.is_open && !original.is_fully_paid}>
<MenuItem
icon={<Icon icon="quick-payment-16" iconSize={16} />}
@@ -76,7 +76,7 @@ export function ActionsMenu({
text={intl.get('allocate_landed_coast')}
onClick={safeCallback(onAllocateLandedCost, original)}
/>
<Can I={Bill_Abilities.Delete} a={AbilitySubject.Bill}>
<Can I={BillAction.Delete} a={AbilitySubject.Bill}>
<MenuItem
text={intl.get('delete_bill')}
intent={Intent.DANGER}

View File

@@ -31,7 +31,7 @@ import withSettings from 'containers/Settings/withSettings';
import { usePaymentMadesListContext } from './PaymentMadesListProvider';
import { useRefreshPaymentMades } from 'hooks/query/paymentMades';
import {
Payment_Made_Abilities,
PaymentMadeAction,
AbilitySubject,
} from '../../../../common/abilityOption';
@@ -90,7 +90,7 @@ function PaymentMadeActionsBar({
onChange={handleTabChange}
/>
<NavbarDivider />
<Can I={Payment_Made_Abilities.Create} a={AbilitySubject.PaymentMade}>
<Can I={PaymentMadeAction.Create} a={AbilitySubject.PaymentMade}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />}

View File

@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
import { Can, FormattedMessage as T } from 'components';
import {
Payment_Made_Abilities,
PaymentMadeAction,
AbilitySubject,
} from '../../../../common/abilityOption';
@@ -21,7 +21,7 @@ export default function PaymentMadesEmptyStatus() {
}
action={
<>
<Can I={Payment_Made_Abilities.Create} a={AbilitySubject.PaymentMade}>
<Can I={PaymentMadeAction.Create} a={AbilitySubject.PaymentMade}>
<Button
intent={Intent.PRIMARY}
large={true}

View File

@@ -12,7 +12,7 @@ import intl from 'react-intl-universal';
import { Icon, Money, FormatDateCell, Can } from 'components';
import {
Payment_Made_Abilities,
PaymentMadeAction,
AbilitySubject,
} from '../../../../common/abilityOption';
@@ -37,7 +37,7 @@ export function ActionsMenu({
onClick={safeCallback(onViewDetails, original)}
/>
<Can I={Payment_Made_Abilities.Edit} a={AbilitySubject.PaymentMade}>
<Can I={PaymentMadeAction.Edit} a={AbilitySubject.PaymentMade}>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
@@ -45,7 +45,7 @@ export function ActionsMenu({
onClick={safeCallback(onEdit, original)}
/>
</Can>
<Can I={Payment_Made_Abilities.Delete} a={AbilitySubject.PaymentMade}>
<Can I={PaymentMadeAction.Delete} a={AbilitySubject.PaymentMade}>
<MenuItem
text={intl.get('delete_payment_made')}
intent={Intent.DANGER}