Compare commits

...

62 Commits

Author SHA1 Message Date
elforjani13
43c3f5e3de feat: add easysms integrate api. 2021-12-01 19:24:02 +02:00
elforjani13
a99fc78fe1 feat: EasySMS integrate. 2021-11-29 20:28:28 +02:00
elforjani13
346696f673 fix: ability option key. 2021-11-27 20:23:40 +02:00
elforjani13
68227b81e8 fix: pause transactions locaking. 2021-11-27 19:44:06 +02:00
elforjani13
0c806366cd feat: handle error delete role. 2021-11-27 18:51:35 +02:00
a.bouhuolia
8b28d6894f feat: avoid display any dashboard before boot complete loading. 2021-11-27 17:53:54 +02:00
a.bouhuolia
3db00f6f70 feat: universal search permissions access control. 2021-11-27 17:22:29 +02:00
a.bouhuolia
56ab0a68e2 feat: add default role permissions in new mode. 2021-11-27 16:43:33 +02:00
elforjani13
4ac32b3aad feat: handle error roles table. 2021-11-27 13:52:37 +02:00
elforjani13
f98b429fcc feat: add localiztion. 2021-11-27 11:50:21 +02:00
a.bouhuolia
012f204c5c Merge branch 'featrue/roles-permission' into develop 2021-11-26 23:56:34 +02:00
a.bouhuolia
7c62466c5b Merge branch 'featrue/roles-permission' of https://github.com/bigcapitalhq/client into featrue/roles-permission 2021-11-26 23:38:49 +02:00
a.bouhuolia
111ade2ac8 feat: shortcuts keyword table permissions access control. 2021-11-26 23:38:39 +02:00
elforjani13
408e3cbb0b Merge branch 'featrue/roles-permission' of https://github.com/bigcapitalhq/client into featrue/roles-permission 2021-11-26 22:40:50 +02:00
elforjani13
9cc770f168 feat: edit user dialog handle error. 2021-11-26 22:40:06 +02:00
a.bouhuolia
383a9aad3b Merge branch 'featrue/roles-permission' of https://github.com/bigcapitalhq/client into featrue/roles-permission 2021-11-26 22:27:37 +02:00
a.bouhuolia
1be30fd142 feat: application and dashboard async booting. 2021-11-26 22:27:27 +02:00
elforjani13
63cb3f9fef fix: Abilities keys. 2021-11-26 20:56:00 +02:00
elforjani13
ca3ff3fd8f Merge branch 'featrue/roles-permission' of https://github.com/bigcapitalhq/client into featrue/roles-permission 2021-11-26 19:51:29 +02:00
elforjani13
313d0f3d0f fix: role field in invite & User dialog. 2021-11-26 19:48:19 +02:00
elforjani13
64bf223458 feat: handle errors. 2021-11-26 19:46:48 +02:00
elforjani13
97c421e2f1 feat: roles data & delete alert. 2021-11-26 19:43:06 +02:00
a.bouhuolia
ccad55dd4a feat: dashboard quick new access control. 2021-11-26 19:37:36 +02:00
a.bouhuolia
a21d70a59d feat: sidebar permission access control. 2021-11-26 19:07:18 +02:00
a.bouhuolia
c2ccb7f879 Merge branch 'featrue/roles-permission' of https://github.com/bigcapitalhq/client into featrue/roles-permission 2021-11-26 16:13:51 +02:00
a.bouhuolia
fe9ca215ab feat: handle forbidden request error. 2021-11-26 16:11:42 +02:00
a.bouhuolia
c14b35356b feat: dashboard meta boot and authenticated user request query. 2021-11-26 16:09:42 +02:00
a.bouhuolia
6fd8a24802 feat: dashboard meta boot. 2021-11-26 16:08:49 +02:00
a.bouhuolia
80531b7fdb feat: save @casl package dependency. 2021-11-25 22:54:16 +02:00
elforjani13
600a835dad feat: home page ability. 2021-11-25 16:03:40 +02:00
elforjani13
3dff8763d4 feat: ability reports home page. 2021-11-25 15:20:44 +02:00
elforjani13
e197d66d9f Merge branch 'feature/draft' into featrue/roles-permission 2021-11-25 14:37:09 +02:00
elforjani13
5dfb592ecc feat: ability context. 2021-11-25 14:36:34 +02:00
elforjani13
2630e0235d feat: add cashflow & vendor ability. 2021-11-25 13:02:09 +02:00
elforjani13
8b4dfe4ded feat: add role name in edit & invite user dialog. 2021-11-25 12:21:29 +02:00
elforjani13
9ceee6d02e feat: reports abilities. 2021-11-24 14:35:38 +02:00
elforjani13
553334f063 feat: ability home page option. 2021-11-24 14:09:24 +02:00
elforjani13
aef8eb7907 feat: empty status ability. 2021-11-24 11:47:18 +02:00
elforjani13
cc1f4cc26b feat: ability option. 2021-11-23 22:38:16 +02:00
elforjani13
719302b241 feat: add expense ability. 2021-11-23 22:15:02 +02:00
elforjani13
3db52e9c63 feat: add manual journal ability. 2021-11-23 21:56:36 +02:00
elforjani13
7393d68b7a feat: add account ability. 2021-11-23 21:42:16 +02:00
elforjani13
6ec86d3cf7 feat: add customer & vendor ability. 2021-11-23 21:26:34 +02:00
elforjani13
1cba4b5f18 feat: add bill & payment made ability. 2021-11-23 20:29:35 +02:00
elforjani13
3a8e1f5238 feat: add payment receive ability. 2021-11-23 20:15:29 +02:00
elforjani13
371e374dc5 feat: add receipt ability. 2021-11-23 20:08:05 +02:00
elforjani13
c2650c76e8 feat: add invoice ability. 2021-11-23 20:03:26 +02:00
elforjani13
fc74346695 feat: add estimate ability. 2021-11-23 19:37:49 +02:00
elforjani13
fca4dedeac feat: add item & inventory adjustment ability. 2021-11-23 19:29:58 +02:00
elforjani13
e5d02043ad feat: item & inventory. 2021-11-23 16:51:40 +02:00
elforjani13
afee2e90e0 ability. 2021-11-23 15:24:53 +02:00
elforjani13
d45005d8c2 fix: delete role alert. 2021-11-22 19:58:43 +02:00
elforjani13
15e7f34879 feat: delete & edit role. 2021-11-22 19:53:40 +02:00
elforjani13
a54ddf27c7 feat: delete & edit role. 2021-11-21 23:56:29 +02:00
elforjani13
955ae97c19 feat: add roles permission schema. 2021-11-21 18:21:10 +02:00
elforjani13
ddbadb67c8 feat: submit roles permission schema. 2021-11-21 17:10:49 +02:00
elforjani13
b853eb1e75 fix: roles form. 2021-11-21 01:45:14 +02:00
elforjani13
c139e129bf feat: roles permission & style & component. 2021-11-21 01:13:41 +02:00
elforjani13
3d3827b683 feat: add transactions locking icon. 2021-11-20 20:55:57 +02:00
a.bouhuolia
cf6d8d6038 feat: add hints to transactions locking item. 2021-11-20 20:40:09 +02:00
a.bouhuolia
d12b965bac feat: optimize transactions locking page style. 2021-11-20 20:38:02 +02:00
elforjani13
fe8f41f200 feat: Transactions locking. 2021-11-18 17:28:11 +02:00
167 changed files with 5014 additions and 1210 deletions

View File

@@ -10,6 +10,8 @@
"@blueprintjs/select": "^3.11.2", "@blueprintjs/select": "^3.11.2",
"@blueprintjs/table": "^3.8.3", "@blueprintjs/table": "^3.8.3",
"@blueprintjs/timezone": "^3.6.2", "@blueprintjs/timezone": "^3.6.2",
"@casl/ability": "^5.4.3",
"@casl/react": "^2.3.0",
"@reduxjs/toolkit": "^1.2.5", "@reduxjs/toolkit": "^1.2.5",
"@sentry/react": "^6.13.2", "@sentry/react": "^6.13.2",
"@sentry/tracing": "^6.13.2", "@sentry/tracing": "^6.13.2",

161
src/common/abilityOption.js Normal file
View File

@@ -0,0 +1,161 @@
export const AbilitySubject = {
Item: 'Item',
InventoryAdjustment: 'InventoryAdjustment',
Estimate: 'SaleEstimate',
Invoice: 'SaleInvoice',
Receipt: 'SaleReceipt',
PaymentReceive: 'PaymentReceive',
Bill: 'Bill',
PaymentMade: 'PaymentMade',
Customer: 'Customer',
Vendor: 'Vendor',
Account: 'Account',
ManualJournal: 'ManualJournal',
Expense: 'Expense',
Cashflow: 'Cashflow',
Report: 'Report',
Preferences: 'Preferences',
ExchangeRate: 'ExchangeRate',
SubscriptionBilling: 'SubscriptionBilling',
};
export const ItemAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
};
export const InventoryAdjustmentAction = {
Create: 'Create',
Edit: 'Edit',
View: 'View',
Delete: 'Delete',
};
export const SaleEstimateAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
NotifyBySms: 'NotifyBySms',
};
export const SaleInvoiceAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
Writeoff: 'bad-debt',
NotifyBySms: 'NotifyBySms',
};
export const SaleReceiptAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
NotifyBySms: 'NotifyBySms',
};
export const PaymentReceiveAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
NotifyBySms: 'NotifyBySms',
};
export const BillAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
NotifyBySms: 'NotifyBySms',
};
export const PaymentMadeAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
};
export const CustomerAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
};
export const VendorAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
};
export const AccountAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
TransactionsLocking: 'TransactionsLocking',
};
export const ManualJournalAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
TransactionLocking: 'TransactionLocking',
};
export const ExpenseAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
};
export const CashflowAction = {
View: 'View',
Create: 'Create',
Delete: 'Delete',
};
export const ReportsAction = {
ALL: 'all',
READ_BALANCE_SHEET: 'read-balance-sheet',
READ_TRIAL_BALANCE_SHEET: 'read-trial-balance-sheet',
READ_PROFIT_LOSS: 'read-profit-loss',
READ_JOURNAL: 'read-journal',
READ_GENERAL_LEDGET: 'read-general-ledger',
READ_CASHFLOW: 'read-cashflow',
READ_AR_AGING_SUMMARY: 'read-ar-aging-summary',
READ_AP_AGING_SUMMARY: 'read-ap-aging-summary',
READ_PURCHASES_BY_ITEMS: 'read-purchases-by-items',
READ_SALES_BY_ITEMS: 'read-sales-by-items',
READ_CUSTOMERS_TRANSACTIONS: 'read-customers-transactions',
READ_VENDORS_TRANSACTIONS: 'read-vendors-transactions',
READ_CUSTOMERS_SUMMARY_BALANCE: 'read-customers-summary-balance',
READ_VENDORS_SUMMARY_BALANCE: 'read-vendors-summary-balance',
READ_INVENTORY_VALUATION_SUMMARY: 'read-inventory-valuation-summary',
READ_INVENTORY_ITEM_DETAILS: 'read-inventory-item-details',
READ_CASHFLOW_ACCOUNT_TRANSACTION: 'read-cashflow-account-transactions',
};
export const PreferencesAbility = {
Mutate: 'Mutate',
};
export const ExchangeRateAbility = {
View: 'view',
Create: 'create',
Delete: 'delete',
};
export const SubscriptionBillingAbility = {
View: 'view',
Payment: 'payment',
};

View File

@@ -67,6 +67,7 @@ const CLASSES = {
PREFERENCES_PAGE_INSIDE_CONTENT_CURRENCIES: 'preferences-page__inside-content--currencies', PREFERENCES_PAGE_INSIDE_CONTENT_CURRENCIES: 'preferences-page__inside-content--currencies',
PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT: 'preferences-page__inside-content--accountant', PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT: 'preferences-page__inside-content--accountant',
PREFERENCES_PAGE_INSIDE_CONTENT_SMS_INTEGRATION: 'preferences-page__inside-content--sms-integration', PREFERENCES_PAGE_INSIDE_CONTENT_SMS_INTEGRATION: 'preferences-page__inside-content--sms-integration',
PREFERENCES_PAGE_INSIDE_CONTENT_ROLES_FORM: 'preferences-page__inside-content--roles-form',
FINANCIAL_REPORT_INSIDER: 'dashboard__insider--financial-report', FINANCIAL_REPORT_INSIDER: 'dashboard__insider--financial-report',

View File

@@ -1,5 +1,21 @@
import React from 'react'; import React from 'react';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import {
SaleInvoiceAction,
SaleEstimateAction,
AbilitySubject,
SaleReceiptAction,
CustomerAction,
PaymentReceiveAction,
BillAction,
VendorAction,
PaymentMadeAction,
AccountAction,
ManualJournalAction,
ExpenseAction,
ItemAction,
ReportsAction,
} from '../common/abilityOption';
export const accountsReceivable = [ export const accountsReceivable = [
{ {
@@ -9,21 +25,29 @@ export const accountsReceivable = [
title: <T id={'sales_invoices'} />, title: <T id={'sales_invoices'} />,
description: <T id={'tracking_sales_invoices_with_your_customers'} />, description: <T id={'tracking_sales_invoices_with_your_customers'} />,
link: '/invoices', link: '/invoices',
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.View,
}, },
{ {
title: <T id={'sales_estimates'} />, title: <T id={'sales_estimates'} />,
description: <T id={'manage_your_sales_estimates_to_create_quotes'} />, description: <T id={'manage_your_sales_estimates_to_create_quotes'} />,
link: '/estimates', link: '/estimates',
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.View,
}, },
{ {
title: <T id={'sales_receipts'} />, title: <T id={'sales_receipts'} />,
description: <T id={'manage_sales_receipts_for_sales_that_get_paid'} />, description: <T id={'manage_sales_receipts_for_sales_that_get_paid'} />,
link: '/receipts', link: '/receipts',
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.View,
}, },
{ {
title: <T id={'customers'} />, title: <T id={'customers'} />,
description: <T id={'manage_the_customers_relations_with_customer'} />, description: <T id={'manage_the_customers_relations_with_customer'} />,
link: '/customers', link: '/customers',
subject: AbilitySubject.Customer,
ability: CustomerAction.View,
}, },
{ {
title: <T id={'customers_payments'} />, title: <T id={'customers_payments'} />,
@@ -31,6 +55,8 @@ export const accountsReceivable = [
<T id={'manage_payment_transactions_from_your_customers'} /> <T id={'manage_payment_transactions_from_your_customers'} />
), ),
link: '/payment-receives', link: '/payment-receives',
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.View,
}, },
], ],
}, },
@@ -46,6 +72,8 @@ export const accountsPayable = [
<T id={'manage_the_purchase_invoices_with_your_vendors'} /> <T id={'manage_the_purchase_invoices_with_your_vendors'} />
), ),
link: '/bills', link: '/bills',
subject: AbilitySubject.Bill,
ability: BillAction.View,
}, },
{ {
title: <T id={'vendors'} />, title: <T id={'vendors'} />,
@@ -53,11 +81,15 @@ export const accountsPayable = [
<T id={'manage_the_vendors_relations_with_vendor_relations'} /> <T id={'manage_the_vendors_relations_with_vendor_relations'} />
), ),
link: '/vendors', link: '/vendors',
subject: AbilitySubject.Vendor,
ability: VendorAction.View,
}, },
{ {
title: <T id={'vendors_payments'} />, title: <T id={'vendors_payments'} />,
description: <T id={'manage_payments_transactions_to_your_vendors'} />, description: <T id={'manage_payments_transactions_to_your_vendors'} />,
link: '/payment-mades', link: '/payment-mades',
subject: AbilitySubject.PaymentMade,
ability: PaymentMadeAction.View,
}, },
], ],
}, },
@@ -77,21 +109,35 @@ export const financialAccounting = [
/> />
), ),
link: '/accounts', link: '/accounts',
subject: AbilitySubject.Account,
ability: AccountAction.View,
}, },
{ {
title: <T id={'manual_journal'}/>, title: <T id={'manual_journal'} />,
description:<T id={'manage_manual_journal_transactions_on_accounts'}/>, description: (
<T id={'manage_manual_journal_transactions_on_accounts'} />
),
link: '/manual-journals', link: '/manual-journals',
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.View,
}, },
{ {
title: <T id={'expenses'}/>, title: <T id={'expenses'} />,
description:<T id={'track_your_indirect_expenses_under_specific_categories'}/>, description: (
<T id={'track_your_indirect_expenses_under_specific_categories'} />
),
link: '/expenses', link: '/expenses',
subject: AbilitySubject.Expense,
ability: ExpenseAction.View,
}, },
{ {
title: <T id={'financial_statements'}/>, title: <T id={'financial_statements'} />,
description:<T id={'show_financial_reports_about_your_organization'}/>, description: (
<T id={'show_financial_reports_about_your_organization'} />
),
link: '/financial-reports', link: '/financial-reports',
subject: AbilitySubject.Report,
ability: ReportsAction.ALL,
}, },
], ],
}, },
@@ -102,19 +148,27 @@ export const productsServices = [
sectionTitle: <T id={'products_services_inventory'} />, sectionTitle: <T id={'products_services_inventory'} />,
shortcuts: [ shortcuts: [
{ {
title: <T id={'products_services'}/>, title: <T id={'products_services'} />,
description:<T id={'manage_your_products_inventory_or_non_inventory'}/>, description: (
<T id={'manage_your_products_inventory_or_non_inventory'} />
),
link: '/items', link: '/items',
subject: AbilitySubject.Item,
ability: ItemAction.View,
}, },
{ {
title: <T id={'products_services_categories'}/>, title: <T id={'products_services_categories'} />,
description:<T id={'group_your_products_and_service'}/>, description: <T id={'group_your_products_and_service'} />,
link: 'items/categories', link: 'items/categories',
}, },
{ {
title: <T id={'inventory_adjustments'}/>, title: <T id={'inventory_adjustments'} />,
description: <T id={'manage_your_inventory_adjustment_of_inventory_items'}/>, description: (
<T id={'manage_your_inventory_adjustment_of_inventory_items'} />
),
link: '/inventory-adjustments', link: '/inventory-adjustments',
subject: AbilitySubject.InventoryAdjustment,
ability: SaleInvoiceAction.View,
}, },
], ],
}, },

View File

@@ -1,110 +1,228 @@
import React from 'react';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import {
AbilitySubject,
AccountAction,
BillAction,
CashflowAction,
CustomerAction,
ExpenseAction,
ItemAction,
ManualJournalAction,
ReportsAction,
SaleEstimateAction,
SaleInvoiceAction,
SaleReceiptAction,
VendorAction,
} from './abilityOption';
export default [ export default [
{ {
shortcut_key: 'Shift + I', shortcut_key: 'Shift + I',
description: intl.get('jump_to_the_invoices'), description: intl.get('jump_to_the_invoices'),
permission: {
ability: SaleInvoiceAction.View,
subject: AbilitySubject.Invoice,
},
}, },
{ {
shortcut_key: 'Shift + E', shortcut_key: 'Shift + E',
description: intl.get('jump_to_the_estimates'), description: intl.get('jump_to_the_estimates'),
permission: {
ability: SaleEstimateAction.View,
subject: AbilitySubject.Estimate,
},
}, },
{ {
shortcut_key: 'Shift + R', shortcut_key: 'Shift + R',
description: intl.get('jump_to_the_receipts'), description: intl.get('jump_to_the_receipts'),
permission: {
ability: SaleReceiptAction.View,
subject: AbilitySubject.Receipt,
},
}, },
{ {
shortcut_key: 'Shift + X', shortcut_key: 'Shift + X',
description: intl.get('jump_to_the_expenses'), description: intl.get('jump_to_the_expenses'),
permission: {
ability: ExpenseAction.View,
subject: AbilitySubject.Expense,
},
}, },
{ {
shortcut_key: 'Shift + C', shortcut_key: 'Shift + C',
description: intl.get('jump_to_the_customers'), description: intl.get('jump_to_the_customers'),
permission: {
ability: CustomerAction.View,
subject: AbilitySubject.Customer,
},
}, },
{ {
shortcut_key: 'Shift + V', shortcut_key: 'Shift + V',
description: intl.get('jump_to_the_vendors'), description: intl.get('jump_to_the_vendors'),
permission: {
ability: VendorAction.View,
subject: AbilitySubject.Vendor,
},
}, },
{ {
shortcut_key: 'Shift + A', shortcut_key: 'Shift + A',
description: intl.get('jump_to_the_chart_of_accounts'), description: intl.get('jump_to_the_chart_of_accounts'),
permission: {
ability: AccountAction.View,
subject: AbilitySubject.Account,
},
}, },
{ {
shortcut_key: 'Shift + B', shortcut_key: 'Shift + B',
description: intl.get('jump_to_the_bills'), description: intl.get('jump_to_the_bills'),
permission: {
ability: BillAction.View,
subject: AbilitySubject.Bill,
},
}, },
{ {
shortcut_key: 'Shift + M', shortcut_key: 'Shift + M',
description: intl.get('jump_to_the_manual_journals'), description: intl.get('jump_to_the_manual_journals'),
permission: {
ability: ManualJournalAction.View,
subject: AbilitySubject.ManualJournal,
},
}, },
{ {
shortcut_key: 'Shift + W', shortcut_key: 'Shift + W',
description: intl.get('jump_to_the_items'), description: intl.get('jump_to_the_items'),
permission: {
ability: ItemAction.View,
subject: AbilitySubject.Item,
},
}, },
{ {
shortcut_key: 'Shift + D', shortcut_key: 'Shift + D',
description: intl.get('jump_to_the_add_money_in'), description: intl.get('jump_to_the_add_money_in'),
permission: {
ability: CashflowAction.Create,
subject: AbilitySubject.Cashflow,
},
}, },
{ {
shortcut_key: 'Shift + Q', shortcut_key: 'Shift + Q',
description: intl.get('jump_to_the_add_money_out'), description: intl.get('jump_to_the_add_money_out'),
permission: {
ability: CashflowAction.Create,
subject: AbilitySubject.Cashflow,
},
}, },
{ {
shortcut_key: 'Shift + 1', shortcut_key: 'Shift + 1',
description: intl.get('jump_to_the_balance_sheet'), description: intl.get('jump_to_the_balance_sheet'),
permission: {
ability: ReportsAction.READ_BALANCE_SHEET,
subject: AbilitySubject.Report,
},
}, },
{ {
shortcut_key: 'Shift + 2', shortcut_key: 'Shift + 2',
description: intl.get('jump_to_the_profit_loss_sheet'), description: intl.get('jump_to_the_profit_loss_sheet'),
permission: {
ability: ReportsAction.READ_PROFIT_LOSS,
subject: AbilitySubject.Report,
},
}, },
{ {
shortcut_key: 'Shift + 3', shortcut_key: 'Shift + 3',
description: intl.get('jump_to_the_journal_sheet'), description: intl.get('jump_to_the_journal_sheet'),
permission: {
ability: ReportsAction.READ_JOURNAL,
subject: AbilitySubject.Report,
},
}, },
{ {
shortcut_key: 'Shift + 4', shortcut_key: 'Shift + 4',
description: intl.get('jump_to_the_general_ledger_sheet'), description: intl.get('jump_to_the_general_ledger_sheet'),
permission: {
ability: ReportsAction.READ_GENERAL_LEDGET,
subject: AbilitySubject.Report,
},
}, },
{ {
shortcut_key: 'Shift + 5', shortcut_key: 'Shift + 5',
description: intl.get('jump_to_the_trial_balance_sheet'), description: intl.get('jump_to_the_trial_balance_sheet'),
permission: {
ability: ReportsAction.READ_TRIAL_BALANCE_SHEET,
subject: AbilitySubject.Report,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + I ', shortcut_key: 'Ctrl + Shift + I ',
description: intl.get('create_a_new_invoice'), description: intl.get('create_a_new_invoice'),
permission: {
ability: SaleInvoiceAction.Create,
subject: AbilitySubject.Invoice,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + E ', shortcut_key: 'Ctrl + Shift + E ',
description: intl.get('create_a_new_estimate'), description: intl.get('create_a_new_estimate'),
permission: {
ability: SaleEstimateAction.Create,
subject: AbilitySubject.Estimate,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + R ', shortcut_key: 'Ctrl + Shift + R ',
description: intl.get('create_a_new_receipt'), description: intl.get('create_a_new_receipt'),
permission: {
ability: SaleReceiptAction.Create,
subject: AbilitySubject.Receipt,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + X ', shortcut_key: 'Ctrl + Shift + X ',
description: intl.get('create_a_new_expense'), description: intl.get('create_a_new_expense'),
permission: {
ability: ExpenseAction.Create,
subject: AbilitySubject.Expense,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + C ', shortcut_key: 'Ctrl + Shift + C ',
description: intl.get('create_a_new_customer'), description: intl.get('create_a_new_customer'),
permission: {
ability: CustomerAction.Create,
subject: AbilitySubject.Customer,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + V ', shortcut_key: 'Ctrl + Shift + V ',
description: intl.get('create_a_new_vendor'), description: intl.get('create_a_new_vendor'),
permission: {
ability: VendorAction.Create,
subject: AbilitySubject.Vendor,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + B ', shortcut_key: 'Ctrl + Shift + B ',
description: intl.get('create_a_new_bill'), description: intl.get('create_a_new_bill'),
permission: {
ability: BillAction.Create,
subject: AbilitySubject.Bill,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + M ', shortcut_key: 'Ctrl + Shift + M ',
description: intl.get('create_a_new_journal'), description: intl.get('create_a_new_journal'),
permission: {
ability: ManualJournalAction.Create,
subject: AbilitySubject.ManualJournal,
},
}, },
{ {
shortcut_key: 'Ctrl + Shift + W ', shortcut_key: 'Ctrl + Shift + W ',
description: intl.get('create_a_new_item'), description: intl.get('create_a_new_item'),
permission: {
ability: ItemAction.Create,
subject: AbilitySubject.Item,
},
}, },
{ {
shortcut_key: 'Ctrl + / ', shortcut_key: 'Ctrl + / ',

View File

@@ -1,10 +1,71 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import {
AbilitySubject,
SaleInvoiceAction,
CustomerAction,
VendorAction,
ManualJournalAction,
ExpenseAction,
} from '../common/abilityOption';
import { useAbilitiesFilter } from '../hooks';
export const getQuickNewActions = () => [ export const getQuickNewActions = () => [
{ path: 'invoices/new', name: intl.get('sale_invoice') }, {
{ path: 'bills/new', name: intl.get('purchase_invoice') }, path: 'invoices/new',
{ path: 'make-journal-entry', name: intl.get('manual_journal') }, name: intl.get('sale_invoice'),
{ path: 'expenses/new', name: intl.get('expense') }, permission: {
{ path: 'customers/new', name: intl.get('customer') }, subject: AbilitySubject.Invoice,
{ path: 'vendors/new', name: intl.get('vendor') }, ability: SaleInvoiceAction.Create,
},
},
{
path: 'bills/new',
name: intl.get('purchase_invoice'),
permission: {
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.Create,
},
},
{
path: 'make-journal-entry',
name: intl.get('manual_journal'),
permission: {
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.Create,
},
},
{
path: 'expenses/new',
name: intl.get('expense'),
permission: {
subject: AbilitySubject.Expense,
ability: ExpenseAction.Create,
},
},
{
path: 'customers/new',
name: intl.get('customer'),
permission: {
subject: AbilitySubject.Customer,
ability: CustomerAction.Create,
},
},
{
path: 'vendors/new',
name: intl.get('vendor'),
permission: {
subject: AbilitySubject.Vendor,
ability: VendorAction.Vendor,
},
},
]; ];
/**
* Retrieve the dashboard quick new menu items.
*/
export const useGetQuickNewMenu = () => {
const quickNewMenu = getQuickNewActions();
const abilitiesFilter = useAbilitiesFilter();
return abilitiesFilter(quickNewMenu);
};

View File

@@ -1,28 +0,0 @@
import React from 'react';
import { useUser } from 'hooks/query';
import withAuthentication from '../../containers/Authentication/withAuthentication';
const AuthenticatedUserContext = React.createContext();
function AuthenticatedUserComponent({ authenticatedUserId, children }) {
const { data: user, ...restProps } = useUser(authenticatedUserId);
return (
<AuthenticatedUserContext.Provider
value={{
user,
...restProps,
}}
children={children}
/>
);
}
export const AuthenticatedUser = withAuthentication(
({ authenticatedUserId }) => ({
authenticatedUserId,
}),
)(AuthenticatedUserComponent);
export const useAuthenticatedUser = () =>
React.useContext(AuthenticatedUserContext);

View File

@@ -0,0 +1,25 @@
import React from 'react';
import { Ability } from '@casl/ability';
import { createContextualCan } from '@casl/react';
import { useDashboardMeta } from '../../hooks/query';
export const AbilityContext = React.createContext();
export const Can = createContextualCan(AbilityContext.Consumer);
/**
* Dashboard ability provider.
*/
export function DashboardAbilityProvider({ children }) {
const {
data: { abilities },
} = useDashboardMeta();
// Ability instance.
const ability = new Ability(abilities);
return (
<AbilityContext.Provider value={ability}>
{children}
</AbilityContext.Provider>
);
}

View File

@@ -1,18 +1,53 @@
import React from 'react'; import React from 'react';
import * as R from 'ramda'; import {
useAuthenticatedAccount,
import { useUser, useCurrentOrganization } from '../../hooks/query'; useCurrentOrganization,
useDashboardMeta,
} from '../../hooks/query';
import { useSplashLoading } from '../../hooks/state'; import { useSplashLoading } from '../../hooks/state';
import { useWatch, useWatchImmediate, useWhen } from '../../hooks'; import { useWatch, useWatchImmediate, useWhen } from '../../hooks';
import withAuthentication from '../../containers/Authentication/withAuthentication';
import { setCookie, getCookie } from '../../utils'; import { setCookie, getCookie } from '../../utils';
/** /**
* Dashboard async booting. * Dashboard meta async booting.
*/ */
function DashboardBootJSX({ authenticatedUserId }) { export function useDashboardMetaBoot() {
const {
data: dashboardMeta,
isLoading: isDashboardMetaLoading,
isSuccess: isDashboardMetaSuccess,
} = useDashboardMeta({
keepPreviousData: true,
});
const [startLoading, stopLoading] = useSplashLoading();
useWatchImmediate((value) => {
value && startLoading();
}, isDashboardMetaLoading);
useWatchImmediate(() => {
isDashboardMetaSuccess && stopLoading();
}, isDashboardMetaSuccess);
return {
isLoading: isDashboardMetaLoading,
};
}
/**
* Dashboard async booting.
* @returns {{ isLoading: boolean }}
*/
export function useDashboardBoot() {
const { isLoading } = useDashboardMetaBoot();
return { isLoading };
}
/**
* Application async booting.
*/
export function useApplicationBoot() {
// Fetches the current user's organization. // Fetches the current user's organization.
const { const {
isSuccess: isCurrentOrganizationSuccess, isSuccess: isCurrentOrganizationSuccess,
@@ -22,7 +57,7 @@ function DashboardBootJSX({ authenticatedUserId }) {
// Authenticated user. // Authenticated user.
const { isSuccess: isAuthUserSuccess, isLoading: isAuthUserLoading } = const { isSuccess: isAuthUserSuccess, isLoading: isAuthUserLoading } =
useUser(authenticatedUserId); useAuthenticatedAccount();
// Initial locale cookie value. // Initial locale cookie value.
const localeCookie = getCookie('locale'); const localeCookie = getCookie('locale');
@@ -86,11 +121,8 @@ function DashboardBootJSX({ authenticatedUserId }) {
isBooted.current = true; isBooted.current = true;
}, },
); );
return null;
}
export const DashboardBoot = R.compose( return {
withAuthentication(({ authenticatedUserId }) => ({ isLoading: isOrgLoading || isAuthUserLoading,
authenticatedUserId, };
})), }
)(DashboardBootJSX);

View File

@@ -1,8 +1,16 @@
import React from 'react'; import React from 'react';
import { DashboardAbilityProvider } from '../../components';
import { useDashboardBoot } from './DashboardBoot';
/** /**
* Dashboard provider. * Dashboard provider.
*/ */
export default function DashboardProvider({ children }) { export default function DashboardProvider({ children }) {
return children; const { isLoading } = useDashboardBoot();
// Avoid display any dashboard component before complete booting.
if (isLoading) {
return null;
}
return <DashboardAbilityProvider>{children}</DashboardAbilityProvider>;
} }

View File

@@ -23,6 +23,7 @@ import withDashboard from 'containers/Dashboard/withDashboard';
import QuickNewDropdown from 'containers/QuickNewDropdown/QuickNewDropdown'; import QuickNewDropdown from 'containers/QuickNewDropdown/QuickNewDropdown';
import { compose } from 'utils'; import { compose } from 'utils';
import withSubscriptions from '../../containers/Subscriptions/withSubscriptions'; import withSubscriptions from '../../containers/Subscriptions/withSubscriptions';
import { useGetUniversalSearchTypeOptions } from '../../containers/UniversalSearch/utils';
function DashboardTopbarSubscriptionMessage() { function DashboardTopbarSubscriptionMessage() {
return ( return (
@@ -142,11 +143,8 @@ function DashboardTopbar({
<Navbar class="dashboard__topbar-navbar"> <Navbar class="dashboard__topbar-navbar">
<NavbarGroup> <NavbarGroup>
<If condition={isSubscriptionActive}> <If condition={isSubscriptionActive}>
<Button <DashboardQuickSearchButton
onClick={() => openGlobalSearch(true)} onClick={() => openGlobalSearch(true)}
className={Classes.MINIMAL}
icon={<Icon icon={'search-24'} iconSize={20} />}
text={<T id={'quick_find'} />}
/> />
<QuickNewDropdown /> <QuickNewDropdown />
@@ -195,3 +193,23 @@ export default compose(
'main', 'main',
), ),
)(DashboardTopbar); )(DashboardTopbar);
/**
* Dashboard quick search button.
*/
function DashboardQuickSearchButton({ ...rest }) {
const searchTypeOptions = useGetUniversalSearchTypeOptions();
// Can't continue if there is no any search type option.
if (searchTypeOptions.length <= 0) {
return null;
}
return (
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'search-24'} iconSize={20} />}
text={<T id={'quick_find'} />}
{...rest}
/>
);
}

View File

@@ -1,31 +1,15 @@
import React from 'react'; import React from 'react';
import * as R from 'ramda';
import { AuthenticatedUser } from './AuthenticatedUser'; import { useApplicationBoot } from '../../components';
import { DashboardBoot } from '../../components';
import withDashboard from '../../containers/Dashboard/withDashboard';
/** /**
* Private pages provider. * Private pages provider.
*/ */
function PrivatePagesProviderComponent({ export function PrivatePagesProvider({
splashScreenCompleted,
// #ownProps // #ownProps
children, children,
}) { }) {
return ( const { isLoading } = useApplicationBoot();
<AuthenticatedUser>
<DashboardBoot />
{splashScreenCompleted ? children : null} return <React.Fragment>{!isLoading ? children : null}</React.Fragment>;
</AuthenticatedUser>
);
} }
export const PrivatePagesProvider = R.compose(
withDashboard(({ splashScreenCompleted }) => ({
splashScreenCompleted,
})),
)(PrivatePagesProviderComponent);

View File

@@ -14,10 +14,14 @@ import { firstLettersArgs } from 'utils';
import { useAuthActions } from 'hooks/state'; import { useAuthActions } from 'hooks/state';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
import withSubscriptions from '../../containers/Subscriptions/withSubscriptions'; import withSubscriptions from '../../containers/Subscriptions/withSubscriptions';
import { useAuthenticatedUser } from './AuthenticatedUser';
import { useAuthenticatedAccount } from 'hooks/query'
import { compose } from 'utils';
/**
* Dashboard topbar user.
*/
function DashboardTopbarUser({ function DashboardTopbarUser({
openDialog, openDialog,
@@ -28,7 +32,7 @@ function DashboardTopbarUser({
const { setLogout } = useAuthActions(); const { setLogout } = useAuthActions();
// Retrieve authenticated user information. // Retrieve authenticated user information.
const { user } = useAuthenticatedUser(); const { data: user } = useAuthenticatedAccount();
const onClickLogout = () => { const onClickLogout = () => {
setLogout(); setLogout();

View File

@@ -1,3 +1,4 @@
export * from './SplashScreen'; export * from './SplashScreen';
export * from './DashboardBoot'; export * from './DashboardBoot';
export * from './DashboardThemeProvider'; export * from './DashboardThemeProvider';
export * from './DashboardAbilityProvider';

View File

@@ -23,8 +23,10 @@ import BadDebtDialog from '../containers/Dialogs/BadDebtDialog';
import NotifyInvoiceViaSMSDialog from '../containers/Dialogs/NotifyInvoiceViaSMSDialog'; import NotifyInvoiceViaSMSDialog from '../containers/Dialogs/NotifyInvoiceViaSMSDialog';
import NotifyReceiptViaSMSDialog from '../containers/Dialogs/NotifyReceiptViaSMSDialog'; import NotifyReceiptViaSMSDialog from '../containers/Dialogs/NotifyReceiptViaSMSDialog';
import NotifyEstimateViaSMSDialog from '../containers/Dialogs/NotifyEstimateViaSMSDialog'; import NotifyEstimateViaSMSDialog from '../containers/Dialogs/NotifyEstimateViaSMSDialog';
import NotifyPaymentReceiveViaSMSDialog from '../containers/Dialogs/NotifyPaymentReceiveViaSMSDialog' import NotifyPaymentReceiveViaSMSDialog from '../containers/Dialogs/NotifyPaymentReceiveViaSMSDialog';
import SMSMessageDialog from '../containers/Dialogs/SMSMessageDialog'; import SMSMessageDialog from '../containers/Dialogs/SMSMessageDialog';
import TransactionsLockingDialog from '../containers/Dialogs/TransactionsLockingDialog';
import EasySMSIntegrationDialog from '../containers/Dialogs/EasySMSIntegrationDialog';
/** /**
* Dialogs container. * Dialogs container.
@@ -58,6 +60,8 @@ export default function DialogsContainer() {
<BadDebtDialog dialogName={'write-off-bad-debt'} /> <BadDebtDialog dialogName={'write-off-bad-debt'} />
<SMSMessageDialog dialogName={'sms-message-form'} /> <SMSMessageDialog dialogName={'sms-message-form'} />
<TransactionsLockingDialog dialogName={'transactions-locking'} />
<EasySMSIntegrationDialog dialogName={'easysms-integrate'} />
</div> </div>
); );
} }

View File

@@ -2,16 +2,19 @@ import React from 'react';
import SidebarContainer from 'components/Sidebar/SidebarContainer'; import SidebarContainer from 'components/Sidebar/SidebarContainer';
import SidebarHead from 'components/Sidebar/SidebarHead'; import SidebarHead from 'components/Sidebar/SidebarHead';
import SidebarMenu from 'components/Sidebar/SidebarMenu'; import SidebarMenu from 'components/Sidebar/SidebarMenu';
import { useGetSidebarMenu } from './utils';
import 'style/containers/Dashboard/Sidebar.scss'; import 'style/containers/Dashboard/Sidebar.scss';
export default function Sidebar({ dashboardContentRef }) { export default function Sidebar({ dashboardContentRef }) {
const menu = useGetSidebarMenu();
return ( return (
<SidebarContainer> <SidebarContainer>
<SidebarHead /> <SidebarHead />
<div className="sidebar__menu"> <div className="sidebar__menu">
<SidebarMenu /> <SidebarMenu menu={menu} />
</div> </div>
<div class="sidebar__version">0.0.1-beta version.</div> <div class="sidebar__version">0.0.1-beta version.</div>

View File

@@ -3,7 +3,7 @@ import { Button, Popover, Menu, Position } from '@blueprintjs/core';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import { compose, firstLettersArgs } from 'utils'; import { compose, firstLettersArgs } from 'utils';
import withCurrentOrganization from '../../containers/Organization/withCurrentOrganization'; import withCurrentOrganization from '../../containers/Organization/withCurrentOrganization';
import { useAuthenticatedUser } from '../Dashboard/AuthenticatedUser'; import { useAuthenticatedAccount } from '../../hooks/query';
// Popover modifiers. // Popover modifiers.
const POPOVER_MODIFIERS = { const POPOVER_MODIFIERS = {
@@ -18,7 +18,7 @@ function SidebarHead({
organization, organization,
}) { }) {
// Retrieve authenticated user information. // Retrieve authenticated user information.
const { user } = useAuthenticatedUser(); const { data: user } = useAuthenticatedAccount();
return ( return (
<div className="sidebar__head"> <div className="sidebar__head">

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Menu, MenuDivider } from '@blueprintjs/core'; import { Menu, MenuDivider } from '@blueprintjs/core';
import { useHistory, useLocation } from 'react-router-dom'; import { useHistory, useLocation } from 'react-router-dom';
import sidebarMenuList from 'config/sidebarMenu';
import { Choose } from 'components'; import { Choose } from 'components';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import MenuItem from 'components/MenuItem'; import MenuItem from 'components/MenuItem';
@@ -24,7 +24,7 @@ function SidebarMenuItemSpace({ space }) {
return <div class="bp3-menu-spacer" style={{ height: `${space}px` }} />; return <div class="bp3-menu-spacer" style={{ height: `${space}px` }} />;
} }
function SidebarMenu({ isSubscriptionActive }) { function SidebarMenu({ menu, isSubscriptionActive }) {
const history = useHistory(); const history = useHistory();
const location = useLocation(); const location = useLocation();
@@ -93,7 +93,7 @@ function SidebarMenu({ isSubscriptionActive }) {
}); });
}; };
const filterItems = sidebarMenuList.filter( const filterItems = menu.filter(
(item) => isSubscriptionActive || item.enableBilling, (item) => isSubscriptionActive || item.enableBilling,
); );
const items = menuItemsMapper(filterItems); const items = menuItemsMapper(filterItems);

View File

@@ -0,0 +1,48 @@
import sidebarMenuList from 'config/sidebarMenu';
import { isArray, isEmpty } from 'lodash';
import { useAbilityContext } from 'hooks/utils';
export function useGetSidebarMenu() {
const ability = useAbilityContext();
return sidebarMenuList
.map((item) => {
const children = isArray(item.children)
? item.children.filter((childItem) => {
return isArray(childItem.permission)
? childItem.permission.some((perm) =>
ability.can(perm.ability, perm.subject),
)
: childItem?.permission?.ability && childItem?.permission?.subject
? ability.can(
childItem.permission.ability,
childItem.permission.subject,
)
: true;
})
: [];
return {
...item,
...(isArray(item.children)
? {
children,
}
: {}),
};
})
.filter((item) => {
return isArray(item.permission)
? item.permission.some((per) =>
ability.can(per.ability, per.subject),
)
: item?.permission?.ability && item?.permission?.subject
? ability.can(item.permission.ability, item.permission.subject)
: true;
})
.filter((item) =>
isEmpty(item.children) && !item.href && !item.label && !item.divider
? false
: true,
);
}

View File

@@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import { ReportsAction, AbilitySubject } from '../common/abilityOption';
export const financialReportMenus = [ export const financialReportMenus = [
{ {
@@ -11,6 +12,8 @@ export const financialReportMenus = [
<T id={'reports_a_company_s_assets_liabilities_and_shareholders'} /> <T id={'reports_a_company_s_assets_liabilities_and_shareholders'} />
), ),
link: '/financial-reports/balance-sheet', link: '/financial-reports/balance-sheet',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_BALANCE_SHEET,
}, },
{ {
title: <T id={'trial_balance_sheet'} />, title: <T id={'trial_balance_sheet'} />,
@@ -18,11 +21,15 @@ export const financialReportMenus = [
<T id={'summarizes_the_credit_and_debit_balance_of_each_account'} /> <T id={'summarizes_the_credit_and_debit_balance_of_each_account'} />
), ),
link: '/financial-reports/trial-balance-sheet', link: '/financial-reports/trial-balance-sheet',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_TRIAL_BALANCE_SHEET,
}, },
{ {
title: <T id={'profit_loss_report'} />, title: <T id={'profit_loss_report'} />,
desc: <T id={'reports_the_revenues_costs_and_expenses'} />, desc: <T id={'reports_the_revenues_costs_and_expenses'} />,
link: '/financial-reports/profit-loss-sheet', link: '/financial-reports/profit-loss-sheet',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PROFIT_LOSS,
}, },
{ {
title: <T id={'cash_flow_statement'} />, title: <T id={'cash_flow_statement'} />,
@@ -30,16 +37,22 @@ export const financialReportMenus = [
<T id={'reports_inflow_and_outflow_of_cash_and_cash_equivalents'} /> <T id={'reports_inflow_and_outflow_of_cash_and_cash_equivalents'} />
), ),
link: '/financial-reports/cash-flow', link: '/financial-reports/cash-flow',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CASHFLOW,
}, },
{ {
title: <T id={'journal_report'} />, title: <T id={'journal_report'} />,
desc: <T id={'the_debit_and_credit_entries_of_system_transactions'} />, desc: <T id={'the_debit_and_credit_entries_of_system_transactions'} />,
link: '/financial-reports/journal-sheet', link: '/financial-reports/journal-sheet',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_JOURNAL,
}, },
{ {
title: <T id={'general_ledger_report'} />, title: <T id={'general_ledger_report'} />,
desc: <T id={'reports_every_transaction_going_in_and_out_of_your'} />, desc: <T id={'reports_every_transaction_going_in_and_out_of_your'} />,
link: '/financial-reports/general-ledger', link: '/financial-reports/general-ledger',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_GENERAL_LEDGET,
}, },
{ {
title: <T id={'receivable_aging_summary'} />, title: <T id={'receivable_aging_summary'} />,
@@ -47,11 +60,15 @@ export const financialReportMenus = [
<T id={'summarize_total_unpaid_balances_of_customers_invoices'} /> <T id={'summarize_total_unpaid_balances_of_customers_invoices'} />
), ),
link: '/financial-reports/receivable-aging-summary', link: '/financial-reports/receivable-aging-summary',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_AR_AGING_SUMMARY,
}, },
{ {
title: <T id={'payable_aging_summary'} />, title: <T id={'payable_aging_summary'} />,
desc: <T id={'summarize_total_unpaid_balances_of_vendors_purchase'} />, desc: <T id={'summarize_total_unpaid_balances_of_vendors_purchase'} />,
link: '/financial-reports/payable-aging-summary', link: '/financial-reports/payable-aging-summary',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_AP_AGING_SUMMARY,
}, },
], ],
}, },
@@ -71,6 +88,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/purchases-by-items', link: '/financial-reports/purchases-by-items',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PURCHASES_BY_ITEMS,
}, },
{ {
title: <T id={'sales_by_items'} />, title: <T id={'sales_by_items'} />,
@@ -82,6 +101,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/sales-by-items', link: '/financial-reports/sales-by-items',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_SALES_BY_ITEMS,
}, },
{ {
title: <T id={'inventory_valuation'} />, title: <T id={'inventory_valuation'} />,
@@ -93,6 +114,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/inventory-valuation', link: '/financial-reports/inventory-valuation',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
}, },
{ {
title: <T id={'customers_balance_summary'} />, title: <T id={'customers_balance_summary'} />,
@@ -104,6 +127,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/customers-balance-summary', link: '/financial-reports/customers-balance-summary',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE,
}, },
{ {
title: <T id={'vendors_balance_summary'} />, title: <T id={'vendors_balance_summary'} />,
@@ -111,6 +136,8 @@ export const SalesAndPurchasesReportMenus = [
<T id={'summerize_the_total_amount_your_business_owes_each_vendor'} /> <T id={'summerize_the_total_amount_your_business_owes_each_vendor'} />
), ),
link: '/financial-reports/vendors-balance-summary', link: '/financial-reports/vendors-balance-summary',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE,
}, },
{ {
title: <T id={'customers_transactions'} />, title: <T id={'customers_transactions'} />,
@@ -120,6 +147,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/transactions-by-customers', link: '/financial-reports/transactions-by-customers',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS,
}, },
{ {
title: <T id={'vendors_transactions'} />, title: <T id={'vendors_transactions'} />,
@@ -131,6 +160,8 @@ export const SalesAndPurchasesReportMenus = [
/> />
), ),
link: '/financial-reports/transactions-by-vendors', link: '/financial-reports/transactions-by-vendors',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_TRANSACTIONS,
}, },
{ {
title: <T id={'inventory_item_details'} />, title: <T id={'inventory_item_details'} />,
@@ -138,6 +169,8 @@ export const SalesAndPurchasesReportMenus = [
<T id={'reports_every_transaction_going_in_and_out_of_your_items'} /> <T id={'reports_every_transaction_going_in_and_out_of_your_items'} />
), ),
link: '/financial-reports/inventory-item-details', link: '/financial-reports/inventory-item-details',
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS,
}, },
], ],
}, },

View File

@@ -1,5 +1,26 @@
import React from 'react'; import React from 'react';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import {
ReportsAction,
AbilitySubject,
ItemAction,
InventoryAdjustmentAction,
SaleEstimateAction,
SaleInvoiceAction,
SaleReceiptAction,
PaymentReceiveAction,
BillAction,
PaymentMadeAction,
CustomerAction,
VendorAction,
AccountAction,
ManualJournalAction,
ExpenseAction,
CashflowAction,
PreferencesAbility,
ExchangeRateAbility,
SubscriptionBillingAbility,
} from '../common/abilityOption';
export default [ export default [
{ {
@@ -11,6 +32,32 @@ export default [
{ {
text: <T id={'sales_inventory'} />, text: <T id={'sales_inventory'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Item,
ability: ItemAction.View,
},
{
subject: AbilitySubject.InventoryAdjustment,
ability: InventoryAdjustmentAction.View,
},
{
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.View,
},
{
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.View,
},
{
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.View,
},
{
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.View,
},
],
}, },
{ {
text: <T id={'items'} />, text: <T id={'items'} />,
@@ -18,37 +65,70 @@ export default [
{ {
text: <T id={'items'} />, text: <T id={'items'} />,
href: '/items', href: '/items',
permission: {
subject: AbilitySubject.Item,
ability: ItemAction.View,
},
}, },
{ {
text: <T id={'inventory_adjustments'} />, text: <T id={'inventory_adjustments'} />,
href: '/inventory-adjustments', href: '/inventory-adjustments',
permission: {
subject: AbilitySubject.InventoryAdjustment,
ability: InventoryAdjustmentAction.View,
},
}, },
{ {
text: <T id={'category_list'} />, text: <T id={'category_list'} />,
href: '/items/categories', href: '/items/categories',
permission: {
subject: AbilitySubject.Item,
ability: ItemAction.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Item,
ability: ItemAction.Create,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Item,
ability: ItemAction.Create,
},
],
}, },
{ {
text: <T id={'New inventory item'} />, text: <T id={'New inventory item'} />,
href: '/items/new', href: '/items/new',
permission: {
subject: AbilitySubject.Item,
ability: ItemAction.Create,
},
}, },
{ {
text: <T id={'New service'} />, text: <T id={'New service'} />,
href: '/items/new', href: '/items/new',
permission: {
subject: AbilitySubject.Item,
ability: ItemAction.Create,
},
}, },
{ {
text: <T id={'New item category'} />, text: <T id={'New item category'} />,
href: '/items/categories/new', href: '/items/categories/new',
permission: {
subject: AbilitySubject.Item,
ability: ItemAction.Create,
},
}, },
// {
// text: <T id={'New inventory adjustment'} />,
// },
], ],
}, },
{ {
@@ -57,43 +137,109 @@ export default [
{ {
text: <T id={'estimates'} />, text: <T id={'estimates'} />,
href: '/estimates', href: '/estimates',
newTabHref: '/estimates/new', permission: {
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.View,
},
}, },
{ {
text: <T id={'invoices'} />, text: <T id={'invoices'} />,
href: '/invoices', href: '/invoices',
newTabHref: '/invoices/new', permission: {
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.View,
},
}, },
{ {
text: <T id={'receipts'} />, text: <T id={'receipts'} />,
href: '/receipts', href: '/receipts',
permission: {
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.View,
},
}, },
{ {
text: <T id={'payment_receives'} />, text: <T id={'payment_receives'} />,
href: '/payment-receives', href: '/payment-receives',
permission: {
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.Create,
},
{
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.Create,
},
{
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.Create,
},
{
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.Create,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.Create,
},
{
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.Create,
},
{
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.Create,
},
{
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.Create,
},
],
}, },
{ {
text: <T id={'new_estimate'} />, text: <T id={'new_estimate'} />,
href: '/estimates/new', href: '/estimates/new',
permission: {
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.Create,
},
}, },
{ {
text: <T id={'new_invoice'} />, text: <T id={'new_invoice'} />,
href: '/invoices/new', href: '/invoices/new',
permission: {
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.Create,
},
}, },
{ {
text: <T id={'new_receipt'} />, text: <T id={'new_receipt'} />,
href: '/receipts/new', href: '/receipts/new',
permission: {
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.Create,
},
}, },
{ {
text: <T id={'new_payment_receive'} />, text: <T id={'new_payment_receive'} />,
href: '/payment-receives/new', href: '/payment-receives/new',
permission: {
subject: AbilitySubject.PaymentReceive,
ability: PaymentReceiveAction.Create,
},
}, },
], ],
}, },
@@ -103,27 +249,62 @@ export default [
{ {
text: <T id={'bills'} />, text: <T id={'bills'} />,
href: '/bills', href: '/bills',
newTabHref: '/bills/new', permission: {
subject: AbilitySubject.Bill,
ability: BillAction.View,
},
}, },
{ {
text: <T id={'payment_mades'} />, text: <T id={'payment_mades'} />,
href: '/payment-mades', href: '/payment-mades',
newTabHref: '/payment-mades/new', newTabHref: '/payment-mades/new',
permission: {
subject: AbilitySubject.PaymentMade,
ability: PaymentMadeAction.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Bill,
ability: BillAction.Create,
},
{
subject: AbilitySubject.PaymentMade,
ability: PaymentMadeAction.Create,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Bill,
ability: BillAction.Create,
},
{
subject: AbilitySubject.PaymentMade,
ability: PaymentMadeAction.Create,
},
],
}, },
{ {
text: <T id={'New purchase invoice'} />, text: <T id={'New purchase invoice'} />,
href: '/bills/new', href: '/bills/new',
permission: {
subject: AbilitySubject.Bill,
ability: BillAction.Create,
},
}, },
{ {
text: <T id={'new_payment_made'} />, text: <T id={'new_payment_made'} />,
href: '/payment-mades/new', href: '/payment-mades/new',
permission: {
subject: AbilitySubject.PaymentMade,
ability: PaymentMadeAction.Create,
},
}, },
], ],
}, },
@@ -133,33 +314,77 @@ export default [
{ {
text: <T id={'customers'} />, text: <T id={'customers'} />,
href: '/customers', href: '/customers',
newTabHref: '/customers/new', permission: {
subject: AbilitySubject.Customer,
ability: CustomerAction.View,
},
}, },
{ {
text: <T id={'vendors'} />, text: <T id={'vendors'} />,
href: '/vendors', href: '/vendors',
newTabHref: '/vendors/new', permission: {
subject: AbilitySubject.Vendor,
ability: VendorAction.Create,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Customer,
ability: CustomerAction.View,
},
{
subject: AbilitySubject.Vendor,
ability: VendorAction.View,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Customer,
ability: CustomerAction.View,
},
{
subject: AbilitySubject.Vendor,
ability: VendorAction.View,
},
],
}, },
{ {
text: <T id={'new_customer'} />, text: <T id={'new_customer'} />,
href: '/customers/new', href: '/customers/new',
permission: {
subject: AbilitySubject.Customer,
ability: CustomerAction.View,
},
}, },
{ {
text: <T id={'new_vendor'} />, text: <T id={'new_vendor'} />,
href: '/vendors/new', href: '/vendors/new',
permission: {
subject: AbilitySubject.Vendor,
ability: VendorAction.View,
},
}, },
], ],
}, },
{ {
text: <T id={'accounting'} />, text: <T id={'accounting'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Account,
ability: AccountAction.View,
},
{
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.View,
},
],
}, },
{ {
text: <T id={'financial'} />, text: <T id={'financial'} />,
@@ -167,25 +392,57 @@ export default [
{ {
text: <T id={'accounts_chart'} />, text: <T id={'accounts_chart'} />,
href: '/accounts', href: '/accounts',
permission: {
subject: AbilitySubject.Account,
ability: AccountAction.View,
},
}, },
{ {
text: <T id={'manual_journals'} />, text: <T id={'manual_journals'} />,
href: '/manual-journals', href: '/manual-journals',
permission: {
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.View,
},
}, },
// {
// text: <T id={'sidebar.transactions_locaking'} />,
// href: '/transactions-locking',
// permission: {
// subject: AbilitySubject.ManualJournal,
// ability: ManualJournalAction.TransactionLocking,
// },
// },
{ {
text: <T id={'exchange_rate'} />, text: <T id={'exchange_rate'} />,
href: '/exchange-rates', href: '/exchange-rates',
permission: {
subject: AbilitySubject.ExchangeRate,
ability: ExchangeRateAbility.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: {
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.Create,
},
}, },
{ {
divider: true, divider: true,
permission: {
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.Create,
},
}, },
{ {
text: <T id={'make_journal_entry'} />, text: <T id={'make_journal_entry'} />,
href: '/make-journal-entry', href: '/make-journal-entry',
permission: {
subject: AbilitySubject.ManualJournal,
ability: ManualJournalAction.Create,
},
}, },
], ],
}, },
@@ -195,29 +452,61 @@ export default [
{ {
text: <T id={'siebar.cashflow.label_cash_and_bank_accounts'} />, text: <T id={'siebar.cashflow.label_cash_and_bank_accounts'} />,
href: '/cashflow-accounts', href: '/cashflow-accounts',
permission: {
subject: AbilitySubject.Cashflow,
ability: CashflowAction.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
],
}, },
{ {
text: <T id={'cash_flow.label.add_money_in'} />, text: <T id={'cash_flow.label.add_money_in'} />,
href: '/cashflow-accounts', href: '/cashflow-accounts',
permission: {
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
}, },
{ {
text: <T id={'cash_flow.label.add_money_out'} />, text: <T id={'cash_flow.label.add_money_out'} />,
href: '/cashflow-accounts', href: '/cashflow-accounts',
permission: {
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
}, },
{ {
text: <T id={'cash_flow.label.add_cash_account'} />, text: <T id={'cash_flow.label.add_cash_account'} />,
href: '/cashflow-accounts', href: '/cashflow-accounts',
permission: {
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
}, },
{ {
text: <T id={'cash_flow.label.add_bank_account'} />, text: <T id={'cash_flow.label.add_bank_account'} />,
href: '/cashflow-accounts', href: '/cashflow-accounts',
permission: {
subject: AbilitySubject.Cashflow,
ability: CashflowAction.Create,
},
}, },
], ],
}, },
@@ -227,17 +516,33 @@ export default [
{ {
text: <T id={'expenses'} />, text: <T id={'expenses'} />,
href: '/expenses', href: '/expenses',
permission: {
subject: AbilitySubject.Expense,
ability: ExpenseAction.View,
},
}, },
{ {
text: <T id={'New tasks'} />, text: <T id={'New tasks'} />,
label: true, label: true,
permission: {
subject: AbilitySubject.Expense,
ability: ExpenseAction.Create,
},
}, },
{ {
divider: true, divider: true,
permission: {
subject: AbilitySubject.Expense,
ability: ExpenseAction.Create,
},
}, },
{ {
text: <T id={'new_expense'} />, text: <T id={'new_expense'} />,
href: '/expenses/new', href: '/expenses/new',
permission: {
subject: AbilitySubject.Expense,
ability: ExpenseAction.Create,
},
}, },
], ],
}, },
@@ -247,80 +552,216 @@ export default [
{ {
text: <T id={'balance_sheet'} />, text: <T id={'balance_sheet'} />,
href: '/financial-reports/balance-sheet', href: '/financial-reports/balance-sheet',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_BALANCE_SHEET,
},
}, },
{ {
text: <T id={'trial_balance_sheet'} />, text: <T id={'trial_balance_sheet'} />,
href: '/financial-reports/trial-balance-sheet', href: '/financial-reports/trial-balance-sheet',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_TRIAL_BALANCE_SHEET,
},
}, },
{ {
text: <T id={'journal'} />, text: <T id={'journal'} />,
href: '/financial-reports/journal-sheet', href: '/financial-reports/journal-sheet',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_JOURNAL,
},
}, },
{ {
text: <T id={'general_ledger'} />, text: <T id={'general_ledger'} />,
href: '/financial-reports/general-ledger', href: '/financial-reports/general-ledger',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_GENERAL_LEDGET,
},
}, },
{ {
text: <T id={'profit_loss_sheet'} />, text: <T id={'profit_loss_sheet'} />,
href: '/financial-reports/profit-loss-sheet', href: '/financial-reports/profit-loss-sheet',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PROFIT_LOSS,
},
}, },
{ {
text: <T id={'cash_flow_statement'} />, text: <T id={'cash_flow_statement'} />,
href: '/financial-reports/cash-flow', href: '/financial-reports/cash-flow',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CASHFLOW_ACCOUNT_TRANSACTION,
},
}, },
{ {
text: <T id={'AR_Aging_Summary'} />, text: <T id={'AR_Aging_Summary'} />,
href: '/financial-reports/receivable-aging-summary', href: '/financial-reports/receivable-aging-summary',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_AR_AGING_SUMMARY,
},
}, },
{ {
text: <T id={'AP_Aging_Summary'} />, text: <T id={'AP_Aging_Summary'} />,
href: '/financial-reports/payable-aging-summary', href: '/financial-reports/payable-aging-summary',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_AP_AGING_SUMMARY,
},
}, },
{ {
text: <T id={'Sales/Purchases'} />, text: <T id={'Sales/Purchases'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PURCHASES_BY_ITEMS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_SALES_BY_ITEMS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_TRANSACTIONS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PURCHASES_BY_ITEMS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_SALES_BY_ITEMS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_TRANSACTIONS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE,
},
],
}, },
{ {
text: <T id={'purchases_by_items'} />, text: <T id={'purchases_by_items'} />,
href: '/financial-reports/purchases-by-items', href: '/financial-reports/purchases-by-items',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_PURCHASES_BY_ITEMS,
},
}, },
{ {
text: <T id={'sales_by_items'} />, text: <T id={'sales_by_items'} />,
href: '/financial-reports/sales-by-items', href: '/financial-reports/sales-by-items',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_SALES_BY_ITEMS,
},
}, },
{ {
text: <T id={'customers_transactions'} />, text: <T id={'customers_transactions'} />,
href: '/financial-reports/transactions-by-customers', href: '/financial-reports/transactions-by-customers',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS,
},
}, },
{ {
text: <T id={'vendors_transactions'} />, text: <T id={'vendors_transactions'} />,
href: '/financial-reports/transactions-by-vendors', href: '/financial-reports/transactions-by-vendors',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_TRANSACTIONS,
},
}, },
{ {
text: <T id={'customers_balance_summary'} />, text: <T id={'customers_balance_summary'} />,
href: '/financial-reports/customers-balance-summary', href: '/financial-reports/customers-balance-summary',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE,
},
}, },
{ {
text: <T id={'vendors_balance_summary'} />, text: <T id={'vendors_balance_summary'} />,
href: '/financial-reports/vendors-balance-summary', href: '/financial-reports/vendors-balance-summary',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE,
},
}, },
{ {
text: <T id={'inventory'} />, text: <T id={'inventory'} />,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
},
],
}, },
{ {
divider: true, divider: true,
permission: [
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS,
},
{
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
},
],
}, },
{ {
text: <T id={'inventory_item_details'} />, text: <T id={'inventory_item_details'} />,
href: '/financial-reports/inventory-item-details', href: '/financial-reports/inventory-item-details',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS,
},
}, },
{ {
text: <T id={'inventory_valuation'} />, text: <T id={'inventory_valuation'} />,
href: '/financial-reports/inventory-valuation', href: '/financial-reports/inventory-valuation',
permission: {
subject: AbilitySubject.Report,
ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
},
}, },
], ],
}, },
@@ -328,14 +769,32 @@ export default [
text: <T id={'system'} />, text: <T id={'system'} />,
enableBilling: true, enableBilling: true,
label: true, label: true,
permission: [
{
subject: AbilitySubject.Preferences,
ability: PreferencesAbility.Mutate,
},
{
subject: AbilitySubject.SubscriptionBilling,
ability: SubscriptionBillingAbility.View,
},
],
}, },
{ {
text: <T id={'preferences'} />, text: <T id={'preferences'} />,
href: '/preferences', href: '/preferences',
permission: {
subject: AbilitySubject.Preferences,
ability: PreferencesAbility.Mutate,
},
}, },
{ {
text: <T id={'billing'} />, text: <T id={'billing'} />,
href: '/billing', href: '/billing',
enableBilling: true, enableBilling: true,
permission: {
subject: AbilitySubject.SubscriptionBilling,
ability: SubscriptionBillingAbility.View,
},
}, },
]; ];

View File

@@ -26,8 +26,11 @@ import withManualJournals from './withManualJournals';
import withSettingsActions from '../../Settings/withSettingsActions'; import withSettingsActions from '../../Settings/withSettingsActions';
import withSettings from '../../Settings/withSettings'; import withSettings from '../../Settings/withSettings';
import { If, DashboardActionViewsList } from 'components'; import { Can, If, DashboardActionViewsList } from 'components';
import {
ManualJournalAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -86,13 +89,14 @@ function ManualJournalActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={ManualJournalAction.Create} a={AbilitySubject.ManualJournal}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="plus" />} icon={<Icon icon="plus" />}
text={<T id={'journal_entry'} />} text={<T id={'journal_entry'} />}
onClick={onClickNewManualJournal} onClick={onClickNewManualJournal}
/> />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: manualJournalsFilterConditions, conditions: manualJournalsFilterConditions,

View File

@@ -2,7 +2,11 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core'; import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components'; import { EmptyStatus } from 'components';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import {
AbilitySubject,
ManualJournalAction,
} from '../../../common/abilityOption';
export default function ManualJournalsEmptyStatus() { export default function ManualJournalsEmptyStatus() {
const history = useHistory(); const history = useHistory();
@@ -17,19 +21,21 @@ export default function ManualJournalsEmptyStatus() {
} }
action={ action={
<> <>
<Button <Can I={ManualJournalAction.Create} a={AbilitySubject.ManualJournal}>
intent={Intent.PRIMARY} <Button
large={true} intent={Intent.PRIMARY}
onClick={() => { large={true}
history.push('/make-journal-entry'); onClick={() => {
}} history.push('/make-journal-entry');
> }}
<T id={'make_journal'} /> >
</Button> <T id={'make_journal'} />
</Button>
<Button intent={Intent.NONE} large={true}> <Button intent={Intent.NONE} large={true}>
<T id={'learn_more'} /> <T id={'learn_more'} />
</Button> </Button>
</Can>
</> </>
} }
/> />

View File

@@ -13,7 +13,18 @@ import {
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { FormattedMessage as T, Choose, Money, If, Icon } from 'components'; import {
Can,
FormattedMessage as T,
Choose,
Money,
If,
Icon,
} from 'components';
import {
ManualJournalAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
/** /**
@@ -150,25 +161,31 @@ export const ActionsMenu = ({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={ManualJournalAction.Edit} a={AbilitySubject.ManualJournal}>
<If condition={!original.is_published}> <MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon="arrow-to-top" />}
text={intl.get('publish_journal')}
onClick={safeCallback(onPublish, original)}
/>
</If>
</Can>
<Can I={ManualJournalAction.Edit} a={AbilitySubject.ManualJournal}>
<MenuItem <MenuItem
icon={<Icon icon="arrow-to-top" />} icon={<Icon icon="pen-18" />}
text={intl.get('publish_journal')} text={intl.get('edit_journal')}
onClick={safeCallback(onPublish, original)} onClick={safeCallback(onEdit, original)}
/> />
</If> </Can>
<MenuItem <Can I={ManualJournalAction.Delete} a={AbilitySubject.ManualJournal}>
icon={<Icon icon="pen-18" />} <MenuItem
text={intl.get('edit_journal')} text={intl.get('delete_journal')}
onClick={safeCallback(onEdit, original)} icon={<Icon icon="trash-16" iconSize={16} />}
/> intent={Intent.DANGER}
<MenuItem onClick={safeCallback(onDelete, original)}
text={intl.get('delete_journal')} />
icon={<Icon icon="trash-16" iconSize={16} />} </Can>
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Menu> </Menu>
); );
}; };

View File

@@ -1,6 +1,10 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { RESOURCES_TYPES } from 'common/resourcesTypes'; import { RESOURCES_TYPES } from 'common/resourcesTypes';
import withDrawerActions from '../Drawer/withDrawerActions'; import withDrawerActions from '../Drawer/withDrawerActions';
import {
AbilitySubject,
ManualJournalAction,
} from '../../common/abilityOption';
/** /**
* Universal search manual journal item select action. * Universal search manual journal item select action.
@@ -44,4 +48,8 @@ export const universalSearchJournalBind = () => ({
optionItemLabel: intl.get('manual_journals'), optionItemLabel: intl.get('manual_journals'),
selectItemAction: JournalUniversalSearchSelectAction, selectItemAction: JournalUniversalSearchSelectAction,
itemSelect: manualJournalsToSearch, itemSelect: manualJournalsToSearch,
permission: {
ability: ManualJournalAction.View,
subject: AbilitySubject.ManualJournal,
},
}); });

View File

@@ -1,7 +1,10 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { RESOURCES_TYPES } from '../../common/resourcesTypes';
import withDrawerActions from '../Drawer/withDrawerActions'; import withDrawerActions from '../Drawer/withDrawerActions';
import { AbilitySubject, AccountAction } from '../../common/abilityOption';
import { RESOURCES_TYPES } from '../../common/resourcesTypes';
function AccountUniversalSearchItemSelectComponent({ function AccountUniversalSearchItemSelectComponent({
// #ownProps // #ownProps
resourceType, resourceType,
@@ -42,4 +45,8 @@ export const universalSearchAccountBind = () => ({
optionItemLabel: intl.get('accounts'), optionItemLabel: intl.get('accounts'),
selectItemAction: AccountUniversalSearchItemSelect, selectItemAction: AccountUniversalSearchItemSelect,
itemSelect: accountToSearch, itemSelect: accountToSearch,
permission: {
ability: AccountAction.View,
subject: AbilitySubject.Account,
},
}); });

View File

@@ -15,6 +15,7 @@ import { FormattedMessage as T } from 'components';
import { import {
AdvancedFilterPopover, AdvancedFilterPopover,
If, If,
Can,
DashboardActionViewsList, DashboardActionViewsList,
DashboardFilterButton, DashboardFilterButton,
DashboardRowsHeightButton, DashboardRowsHeightButton,
@@ -30,6 +31,8 @@ import withAlertActions from 'containers/Alert/withAlertActions';
import withAccountsTableActions from './withAccountsTableActions'; import withAccountsTableActions from './withAccountsTableActions';
import withSettings from '../Settings/withSettings'; import withSettings from '../Settings/withSettings';
import withSettingsActions from '../Settings/withSettingsActions'; import withSettingsActions from '../Settings/withSettingsActions';
import { AccountAction, AbilitySubject } from '../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -116,13 +119,14 @@ function AccountsActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={AccountAction.Create} a={AbilitySubject.Account}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="plus" />} icon={<Icon icon="plus" />}
text={<T id={'new_account'} />} text={<T id={'new_account'} />}
onClick={onClickNewAccount} onClick={onClickNewAccount}
/> />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: accountsFilterConditions, conditions: accountsFilterConditions,
@@ -183,11 +187,13 @@ function AccountsActionsBar({
onChange={handleTableRowSizeChange} onChange={handleTableRowSizeChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Switch <Can I={AccountAction.Edit} a={AbilitySubject.Account}>
labelElement={<T id={'inactive'} />} <Switch
defaultChecked={accountsInactiveMode} labelElement={<T id={'inactive'} />}
onChange={handleInactiveSwitchChange} defaultChecked={accountsInactiveMode}
/> onChange={handleInactiveSwitchChange}
/>
</Can>
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>
<Button <Button

View File

@@ -8,9 +8,10 @@ import {
MenuDivider, MenuDivider,
Intent, Intent,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { Icon, Money, If } from 'components'; import { Can, Icon, Money, If } from 'components';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
import { AbilitySubject, AccountAction } from '../../common/abilityOption';
/** /**
* Accounts table actions menu. * Accounts table actions menu.
@@ -34,38 +35,45 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<MenuItem <MenuDivider />
icon={<Icon icon="pen-18" />}
text={intl.get('edit_account')}
onClick={safeCallback(onEdit, original)}
/>
<MenuItem
icon={<Icon icon="plus" />}
text={intl.get('new_child_account')}
onClick={safeCallback(onNewChild, original)}
/>
<MenuDivider />
<If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_account')} icon={<Icon icon="pen-18" />}
icon={<Icon icon="pause-16" iconSize={16} />} text={intl.get('edit_account')}
onClick={safeCallback(onInactivate, original)} onClick={safeCallback(onEdit, original)}
/> />
</If>
<If condition={!original.active}>
<MenuItem <MenuItem
text={intl.get('activate_account')} icon={<Icon icon="plus" />}
icon={<Icon icon="play-16" iconSize={16} />} text={intl.get('new_child_account')}
onClick={safeCallback(onActivate, original)} onClick={safeCallback(onNewChild, original)}
/> />
</If> <MenuDivider />
<MenuItem </Can>
text={intl.get('delete_account')} <Can I={AccountAction.Edit} a={AbilitySubject.Account}>
icon={<Icon icon="trash-16" iconSize={16} />} <If condition={original.active}>
intent={Intent.DANGER} <MenuItem
onClick={safeCallback(onDelete, original)} text={intl.get('inactivate_account')}
/> icon={<Icon icon="pause-16" iconSize={16} />}
onClick={safeCallback(onInactivate, original)}
/>
</If>
<If condition={!original.active}>
<MenuItem
text={intl.get('activate_account')}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={safeCallback(onActivate, original)}
/>
</If>
</Can>
<Can I={AccountAction.Edit} a={AbilitySubject.Account}>
<MenuItem
text={intl.get('delete_account')}
icon={<Icon icon="trash-16" iconSize={16} />}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Can>
</Menu> </Menu>
); );
} }

View File

@@ -0,0 +1,68 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useSettingEasySMSDisconnect } from 'hooks/query';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* Easy SMS disconnect alert.
*/
function EasySMSDisconnectAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: {},
// #withAlertActions
closeAlert,
}) {
const { mutateAsync: disconnectEasySMS, isLoading } =
useSettingEasySMSDisconnect();
// Handle cancel Disconnect alert.
const handleCancelDisconnect = () => {
closeAlert(name);
};
// Handle confirm Disconnect alert.
const handleConfirmDisconnect = () => {
disconnectEasySMS()
.then(() => {
AppToaster.show({
message: intl.get('easysms.disconnect.alert.success_message'),
intent: Intent.SUCCESS,
});
})
.catch(() => {})
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'easysms.label.disconnect'} />}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleCancelDisconnect}
onConfirm={handleConfirmDisconnect}
loading={isLoading}
>
<p>Ea aliqua elit reprehenderit pariatur consequat voluptate quis.</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
)(EasySMSDisconnectAlert);

View File

@@ -0,0 +1,83 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useDeleteRole } from 'hooks/query';
import { handleDeleteErrors } from '../../Preferences/Users/Roles/utils';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* Role delete alert.
*/
function RoleDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { roleId },
// #withAlertActions
closeAlert,
}) {
const { mutateAsync: deleteRole, isLoading } = useDeleteRole();
// Handle cancel delete role alert.
const handleCancelDelete = () => {
closeAlert(name);
};
// Handle confirm delete role.
const handleConfirmDeleteRole = () => {
deleteRole(roleId)
.then(() => {
AppToaster.show({
message: intl.get('roles.permission_schema.delete.alert_message'),
intent: Intent.SUCCESS,
});
})
.catch(
({
response: {
data: { errors },
},
}) => {
handleDeleteErrors(errors);
},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelDelete}
onConfirm={handleConfirmDeleteRole}
loading={isLoading}
>
<p>
<FormattedHTMLMessage
id={
'roles.permission_schema.once_delete_this_role_you_will_able_to_restore_it'
}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
)(RoleDeleteAlert);

View File

@@ -16,6 +16,8 @@ import ExpensesAlerts from '../Expenses/ExpensesAlerts';
import AccountTransactionsAlerts from '../CashFlow/AccountTransactions/AccountTransactionsAlerts'; import AccountTransactionsAlerts from '../CashFlow/AccountTransactions/AccountTransactionsAlerts';
import UsersAlerts from '../Preferences/Users/UsersAlerts'; import UsersAlerts from '../Preferences/Users/UsersAlerts';
import CurrenciesAlerts from '../Preferences/Currencies/CurrenciesAlerts'; import CurrenciesAlerts from '../Preferences/Currencies/CurrenciesAlerts';
import RolesAlerts from '../Preferences/Users/Roles/RolesAlerts';
import EasySMSIntegrationAlerts from '../Preferences/EasySMSIntegration/EasySMSIntegrationAlerts';
export default [ export default [
...AccountsAlerts, ...AccountsAlerts,
@@ -36,4 +38,6 @@ export default [
...AccountTransactionsAlerts, ...AccountTransactionsAlerts,
...UsersAlerts, ...UsersAlerts,
...CurrenciesAlerts, ...CurrenciesAlerts,
...RolesAlerts,
...EasySMSIntegrationAlerts,
]; ];

View File

@@ -4,9 +4,10 @@ import intl from 'react-intl-universal';
import { Intent, Menu, MenuItem, MenuDivider } from '@blueprintjs/core'; import { Intent, Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
import { MaterialProgressBar } from 'components'; import { MaterialProgressBar } from 'components';
import { FormatDateCell, If, Icon } from 'components'; import { Can, FormatDateCell, If, Icon } from 'components';
import { useAccountTransactionsContext } from './AccountTransactionsProvider'; import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { TRANSACRIONS_TYPE } from 'common/cashflowOptions'; import { TRANSACRIONS_TYPE } from 'common/cashflowOptions';
import { AbilitySubject, CashflowAction } from '../../../common/abilityOption';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
export function ActionsMenu({ export function ActionsMenu({
@@ -20,15 +21,17 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<If condition={TRANSACRIONS_TYPE.includes(original.reference_type)}> <Can I={CashflowAction.Delete} a={AbilitySubject.Cashflow}>
<MenuDivider /> <If condition={TRANSACRIONS_TYPE.includes(original.reference_type)}>
<MenuItem <MenuDivider />
text={intl.get('delete_transaction')} <MenuItem
intent={Intent.DANGER} text={intl.get('delete_transaction')}
onClick={safeCallback(onDelete, original)} intent={Intent.DANGER}
icon={<Icon icon="trash-16" iconSize={16} />} onClick={safeCallback(onDelete, original)}
/> icon={<Icon icon="trash-16" iconSize={16} />}
</If> />
</If>
</Can>
</Menu> </Menu>
); );
} }
@@ -83,7 +86,7 @@ export function useAccountTransactionsColumns() {
className: 'deposit', className: 'deposit',
textOverview: true, textOverview: true,
align: 'right', align: 'right',
clickable: true clickable: true,
}, },
{ {
id: 'withdrawal', id: 'withdrawal',
@@ -93,7 +96,7 @@ export function useAccountTransactionsColumns() {
width: 150, width: 150,
textOverview: true, textOverview: true,
align: 'right', align: 'right',
clickable: true clickable: true,
}, },
{ {
id: 'running_balance', id: 'running_balance',
@@ -103,7 +106,7 @@ export function useAccountTransactionsColumns() {
width: 150, width: 150,
textOverview: true, textOverview: true,
align: 'right', align: 'right',
clickable: true clickable: true,
}, },
{ {
id: 'balance', id: 'balance',

View File

@@ -7,8 +7,9 @@ import {
Alignment, Alignment,
Switch, Switch,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import { useRefreshCashflowAccounts } from 'hooks/query'; import { useRefreshCashflowAccounts } from 'hooks/query';
import { CashflowAction, AbilitySubject } from '../../../common/abilityOption';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
@@ -56,19 +57,22 @@ function CashFlowAccountsActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={CashflowAction.Create} a={AbilitySubject.Cashflow}>
className={Classes.MINIMAL} <Button
icon={<Icon icon={'plus-24'} iconSize={20} />} className={Classes.MINIMAL}
text={<T id={'cash_flow.label.add_cash_account'} />} icon={<Icon icon={'plus-24'} iconSize={20} />}
onClick={handleAddBankAccount} text={<T id={'cash_flow.label.add_cash_account'} />}
/> onClick={handleAddBankAccount}
<Button />
className={Classes.MINIMAL}
icon={<Icon icon={'plus-24'} iconSize={20} />} <Button
text={<T id={'cash_flow.label.add_bank_account'} />} className={Classes.MINIMAL}
onClick={handleAddCashAccount} icon={<Icon icon={'plus-24'} iconSize={20} />}
/> text={<T id={'cash_flow.label.add_bank_account'} />}
<NavbarDivider /> onClick={handleAddCashAccount}
/>
<NavbarDivider />
</Can>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="print-16" iconSize={16} />} icon={<Icon icon="print-16" iconSize={16} />}
@@ -85,13 +89,15 @@ function CashFlowAccountsActionsBar({
text={<T id={'import'} />} text={<T id={'import'} />}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={CashflowAction.Edit} a={AbilitySubject.Cashflow}>
<Switch <Switch
labelElement={<T id={'inactive'} />} labelElement={<T id={'inactive'} />}
defaultChecked={false} defaultChecked={false}
onChange={handleInactiveSwitchChange} onChange={handleInactiveSwitchChange}
/> />
</Can>
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}

View File

@@ -13,7 +13,13 @@ import {
If, If,
Icon, Icon,
T, T,
Can,
} from '../../../components'; } from '../../../components';
import {
AccountAction,
CashflowAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { useCashFlowAccountsContext } from './CashFlowAccountsProvider'; import { useCashFlowAccountsContext } from './CashFlowAccountsProvider';
@@ -222,48 +228,56 @@ function CashflowAccountContextMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewClick)} onClick={safeCallback(onViewClick)}
/> />
<MenuDivider /> <Can I={CashflowAction.Create} a={AbilitySubject.Cashflow}>
<MenuItem <MenuDivider />
text={<T id={'cash_flow_money_in'} />}
icon={<Icon icon={'arrow-downward'} iconSize={16} />}
>
<CashflowAccountMoneyInContextMenu onClick={onMoneyInClick} />
</MenuItem>
<MenuItem
text={<T id={'cash_flow_money_out'} />}
icon={<Icon icon={'arrow-upward'} iconSize={16} />}
>
<CashflowAccountMoneyOutContextMenu onClick={onMoneyOutClick} />
</MenuItem>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
text={intl.get('edit_account')}
onClick={safeCallback(onEditClick)}
/>
<MenuDivider />
<If condition={account.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_account')} text={<T id={'cash_flow_money_in'} />}
icon={<Icon icon="pause-16" iconSize={16} />} icon={<Icon icon={'arrow-downward'} iconSize={16} />}
onClick={safeCallback(onInactivateClick)} >
/> <CashflowAccountMoneyInContextMenu onClick={onMoneyInClick} />
</If> </MenuItem>
<If condition={!account.active}>
<MenuItem <MenuItem
text={intl.get('activate_account')} text={<T id={'cash_flow_money_out'} />}
icon={<Icon icon="play-16" iconSize={16} />} icon={<Icon icon={'arrow-upward'} iconSize={16} />}
onClick={safeCallback(onActivateClick)} >
<CashflowAccountMoneyOutContextMenu onClick={onMoneyOutClick} />
</MenuItem>
</Can>
<Can I={CashflowAction.Edit} a={AbilitySubject.Cashflow}>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
text={intl.get('edit_account')}
onClick={safeCallback(onEditClick)}
/> />
</If> </Can>
<MenuItem <Can I={AccountAction.Edit} a={AbilitySubject.Account}>
text={intl.get('delete_account')} <MenuDivider />
icon={<Icon icon="trash-16" iconSize={16} />} <If condition={account.active}>
intent={Intent.DANGER} <MenuItem
onClick={safeCallback(onDeleteClick)} text={intl.get('inactivate_account')}
/> icon={<Icon icon="pause-16" iconSize={16} />}
onClick={safeCallback(onInactivateClick)}
/>
</If>
<If condition={!account.active}>
<MenuItem
text={intl.get('activate_account')}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={safeCallback(onActivateClick)}
/>
</If>
</Can>
<Can I={CashflowAction.Delete} a={AbilitySubject.Cashflow}>
<MenuItem
text={intl.get('delete_account')}
icon={<Icon icon="trash-16" iconSize={16} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteClick)}
/>
</Can>
</Menu> </Menu>
); );
} }

View File

@@ -14,6 +14,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { import {
If, If,
Icon, Icon,
Can,
FormattedMessage as T, FormattedMessage as T,
DashboardActionViewsList, DashboardActionViewsList,
AdvancedFilterPopover, AdvancedFilterPopover,
@@ -29,6 +30,7 @@ import withCustomersActions from './withCustomersActions';
import withAlertActions from 'containers/Alert/withAlertActions'; import withAlertActions from 'containers/Alert/withAlertActions';
import withSettingsActions from '../../Settings/withSettingsActions'; import withSettingsActions from '../../Settings/withSettingsActions';
import withSettings from '../../Settings/withSettings'; import withSettings from '../../Settings/withSettings';
import { CustomerAction, AbilitySubject } from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -103,15 +105,15 @@ function CustomerActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={CustomerAction.Create} a={AbilitySubject.Item}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />} icon={<Icon icon={'plus'} />}
text={<T id={'new_customer'} />} text={<T id={'new_customer'} />}
onClick={onClickNewCustomer} onClick={onClickNewCustomer}
/> />
<NavbarDivider /> <NavbarDivider />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: customersFilterConditions, conditions: customersFilterConditions,
@@ -152,11 +154,13 @@ function CustomerActionsBar({
onChange={handleTableRowSizeChange} onChange={handleTableRowSizeChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Switch <Can I={CustomerAction.Edit} a={AbilitySubject.Customer}>
labelElement={<T id={'inactive'} />} <Switch
defaultChecked={accountsInactiveMode} labelElement={<T id={'inactive'} />}
onChange={handleInactiveSwitchChange} defaultChecked={accountsInactiveMode}
/> onChange={handleInactiveSwitchChange}
/>
</Can>
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>
<Button <Button

View File

@@ -2,7 +2,8 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core'; import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components'; import { EmptyStatus } from 'components';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import { AbilitySubject, CustomerAction } from '../../../common/abilityOption';
export default function CustomersEmptyStatus() { export default function CustomersEmptyStatus() {
const history = useHistory(); const history = useHistory();
@@ -17,19 +18,21 @@ export default function CustomersEmptyStatus() {
} }
action={ action={
<> <>
<Button <Can I={CustomerAction.Create} a={AbilitySubject.Customer}>
intent={Intent.PRIMARY} <Button
large={true} intent={Intent.PRIMARY}
onClick={() => { large={true}
history.push('/customers/new'); onClick={() => {
}} history.push('/customers/new');
> }}
<T id={'new_customer'} /> >
</Button> <T id={'new_customer'} />
</Button>
<Button intent={Intent.NONE} large={true}> <Button intent={Intent.NONE} large={true}>
<T id={'learn_more'} /> <T id={'learn_more'} />
</Button> </Button>
</Can>
</> </>
} }
/> />

View File

@@ -4,7 +4,8 @@ import clsx from 'classnames';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { Icon, Money, If, AvaterCell } from 'components'; import { Can, Icon, Money, If, AvaterCell } from 'components';
import { CustomerAction, AbilitySubject } from '../../../common/abilityOption';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
@@ -29,37 +30,46 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={CustomerAction.Edit} a={AbilitySubject.Customer}>
<MenuItem <MenuDivider />
icon={<Icon icon="pen-18" />}
text={intl.get('edit_customer')}
onClick={safeCallback(onEdit, original)}
/>
<MenuItem
icon={<Icon icon="duplicate-16" />}
text={intl.get('duplicate')}
onClick={safeCallback(onDuplicate, original)}
/>
<If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_customer')} icon={<Icon icon="pen-18" />}
icon={<Icon icon="pause-16" iconSize={16} />} text={intl.get('edit_customer')}
onClick={safeCallback(onInactivate, original)} onClick={safeCallback(onEdit, original)}
/> />
</If> </Can>
<If condition={!original.active}> <Can I={CustomerAction.Create} a={AbilitySubject.Customer}>
<MenuItem <MenuItem
text={intl.get('activate_customer')} icon={<Icon icon="duplicate-16" />}
icon={<Icon icon="play-16" iconSize={16} />} text={intl.get('duplicate')}
onClick={safeCallback(onActivate, original)} onClick={safeCallback(onDuplicate, original)}
/> />
</If> </Can>
<MenuItem <Can I={CustomerAction.Edit} a={AbilitySubject.Customer}>
icon={<Icon icon="trash-16" iconSize={16} />} <If condition={original.active}>
text={intl.get('delete_customer')} <MenuItem
intent={Intent.DANGER} text={intl.get('inactivate_customer')}
onClick={safeCallback(onDelete, original)} icon={<Icon icon="pause-16" iconSize={16} />}
/> onClick={safeCallback(onInactivate, original)}
/>
</If>
<If condition={!original.active}>
<MenuItem
text={intl.get('activate_customer')}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={safeCallback(onActivate, original)}
/>
</If>
</Can>
<Can I={CustomerAction.Delete} a={AbilitySubject.Customer}>
<MenuItem
icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_customer')}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Can>
</Menu> </Menu>
); );
} }

View File

@@ -1,4 +1,5 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { AbilitySubject, CustomerAction } from '../../common/abilityOption';
import { RESOURCES_TYPES } from '../../common/resourcesTypes'; import { RESOURCES_TYPES } from '../../common/resourcesTypes';
import withDrawerActions from '../Drawer/withDrawerActions'; import withDrawerActions from '../Drawer/withDrawerActions';
@@ -42,4 +43,8 @@ export const universalSearchCustomerBind = () => ({
optionItemLabel: intl.get('customers'), optionItemLabel: intl.get('customers'),
selectItemAction: CustomerUniversalSearchSelectAction, selectItemAction: CustomerUniversalSearchSelectAction,
itemSelect: customersToSearch, itemSelect: customersToSearch,
permission: {
ability: CustomerAction.View,
subject: AbilitySubject.Customer,
},
}); });

View File

@@ -0,0 +1,18 @@
import React from 'react';
import { EasySMSIntegrationProvider } from './EasySMSIntegrationProvider';
import EasySMSIntegrationForm from './EasySMSIntegrationForm';
/**
* EasySMS integration dialog content.
*/
export default function EasySMSIntegrationDialogContent({
// #ownProps
dialogName,
}) {
return (
<EasySMSIntegrationProvider dialogName={dialogName}>
<EasySMSIntegrationForm />
</EasySMSIntegrationProvider>
);
}

View File

@@ -0,0 +1,66 @@
import React from 'react';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import { Intent } from '@blueprintjs/core';
import '../../../style/pages/EasySMSIntegration/EasySMSIntegration.scss';
import { AppToaster } from 'components';
import EasySMSIntegrationFormContent from './EasySMSIntegrationFormContent';
import { CreateEasySMSIntegrationSchema } from './EasySMSIntegrationForm.schema';
import { useEasySMSIntegration } from './EasySMSIntegrationProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
const defaultInitialValues = {
token: '',
};
/**
* EasySMS Integration form.
*/
function EasySMSIntegrationForm({
// #withDialogActions
closeDialog,
}) {
const { dialogName, easySMSIntegrateMutate } = useEasySMSIntegration();
// Initial form values.
const initialValues = {
...defaultInitialValues,
};
// Handles the form submit.
const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
// Handle request response success.
const onSuccess = (response) => {
AppToaster.show({
message: intl.get('easysms.integrate.dialog.success_message'),
intent: Intent.SUCCESS,
});
closeDialog(dialogName);
};
// Handle request response errors.
const onError = ({
response: {
data: { errors },
},
}) => {
setSubmitting(false);
};
easySMSIntegrateMutate(values).then(onSuccess).catch(onError);
};
return (
<Formik
validationSchema={CreateEasySMSIntegrationSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
component={EasySMSIntegrationFormContent}
/>
);
}
export default compose(withDialogActions)(EasySMSIntegrationForm);

View File

@@ -0,0 +1,7 @@
import * as Yup from 'yup';
const Schema = Yup.object().shape({
token: Yup.string().required(),
});
export const CreateEasySMSIntegrationSchema = Schema;

View File

@@ -0,0 +1,68 @@
import React from 'react';
import { Form, FastField, ErrorMessage, useFormikContext } from 'formik';
import { Classes, FormGroup, InputGroup, Button } from '@blueprintjs/core';
import { FieldRequiredHint, FormattedMessage as T } from 'components';
import { useEasySMSIntegration } from './EasySMSIntegrationProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { inputIntent, compose } from 'utils';
/**
* EasySMS Integration form content.
*/
function EasySMSIntegrationFormContent({
// #withDialogActions
closeDialog,
}) {
// Formik context.
const { isSubmitting } = useFormikContext();
// EasySMS Integration dialog context.
const { dialogName } = useEasySMSIntegration();
// Handle close button click.
const handleCloseBtnClick = () => {
closeDialog(dialogName);
};
return (
<Form>
<div className={Classes.DIALOG_BODY}>
{/*------------ Token -----------*/}
<FastField name={'token'}>
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'easysms.integrate.dialog.label.token'} />}
labelInfo={<FieldRequiredHint />}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="token" />}
className={'form-group--token'}
>
<InputGroup intent={inputIntent({ error, touched })} {...field} />
</FormGroup>
)}
</FastField>
</div>
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
disabled={isSubmitting}
onClick={handleCloseBtnClick}
style={{ minWidth: '75px' }}
>
<T id={'close'} />
</Button>
<Button
loading={isSubmitting}
style={{ minWidth: '75px' }}
type="submit"
>
{<T id={'save'} />}
</Button>
</div>
</div>
</Form>
);
}
export default compose(withDialogActions)(EasySMSIntegrationFormContent);

View File

@@ -0,0 +1,29 @@
import React from 'react';
import { DialogContent } from 'components';
import { useSettingEasySMSIntegrate } from 'hooks/query';
const EasySMSIntegrationDialogContext = React.createContext();
/**
* Easy SMS integration dialog provider.
*/
function EasySMSIntegrationProvider({ dialogName, ...props }) {
// easysms integrate mutations.
const { mutateAsync: easySMSIntegrateMutate } = useSettingEasySMSIntegrate();
// State provider.
const provider = {
dialogName,
easySMSIntegrateMutate,
};
return (
<DialogContent>
<EasySMSIntegrationDialogContext.Provider value={provider} {...props} />
</DialogContent>
);
}
const useEasySMSIntegration = () =>
React.useContext(EasySMSIntegrationDialogContext);
export { EasySMSIntegrationProvider, useEasySMSIntegration };

View File

@@ -0,0 +1,29 @@
import React from 'react';
import { Dialog, DialogSuspense, FormattedMessage as T } from 'components';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'redux';
const EasySMSIntegrationDialogContent = React.lazy(() =>
import('./EasySMSIntegrationDialogContent'),
);
/**
* EasySms integration dialog.
*/
function EasySMSIntegrationDialog({ dialogName, payload = {}, isOpen }) {
return (
<Dialog
name={dialogName}
title={'EasySMS Inegration'}
isOpen={isOpen}
canEscapeJeyClose={true}
autoFocus={true}
className={'dialog--easysms-integrate'}
>
<DialogSuspense>
<EasySMSIntegrationDialogContent dialogName={dialogName} />
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(EasySMSIntegrationDialog);

View File

@@ -2,10 +2,8 @@ import * as Yup from 'yup';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
const Schema = Yup.object().shape({ const Schema = Yup.object().shape({
email: Yup.string() email: Yup.string().email().required().label(intl.get('email')),
.email() role_id: Yup.string().required().label(intl.get('roles.label.role_name_')),
.required()
.label(intl.get('email')),
}); });
export const InviteUserFormSchema = Schema; export const InviteUserFormSchema = Schema;

View File

@@ -1,7 +1,11 @@
import React from 'react'; import React from 'react';
import { FormGroup, InputGroup, Intent, Button } from '@blueprintjs/core'; import { FormGroup, InputGroup, Intent, Button } from '@blueprintjs/core';
import { FastField, Form, useFormikContext, ErrorMessage } from 'formik'; import { FastField, Form, useFormikContext, ErrorMessage } from 'formik';
import { FormattedMessage as T } from 'components'; import {
ListSelect,
FieldRequiredHint,
FormattedMessage as T,
} from 'components';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import classNames from 'classnames'; import classNames from 'classnames';
import { inputIntent } from 'utils'; import { inputIntent } from 'utils';
@@ -15,23 +19,24 @@ function InviteUserFormContent({
closeDialog, closeDialog,
}) { }) {
const { isSubmitting } = useFormikContext(); const { isSubmitting } = useFormikContext();
const { isEditMode, dialogName } = useInviteUserFormContext(); const { isEditMode, dialogName, roles } = useInviteUserFormContext();
const handleClose = () => { const handleClose = () => {
closeDialog(dialogName); closeDialog(dialogName);
}; };
console.log(roles, 'XX');
return ( return (
<Form> <Form>
<div className={CLASSES.DIALOG_BODY}> <div className={CLASSES.DIALOG_BODY}>
<p className="mb2"> <p className="mb2">
<T id={'your_access_to_your_team'} /> <T id={'your_access_to_your_team'} />
</p> </p>
{/* ----------- Email ----------- */}
<FastField name={'email'}> <FastField name={'email'}>
{({ field, meta: { error, touched } }) => ( {({ field, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'email'} />} label={<T id={'email'} />}
labelInfo={<FieldRequiredHint />}
className={classNames('form-group--email', CLASSES.FILL)} className={classNames('form-group--email', CLASSES.FILL)}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="email" />} helperText={<ErrorMessage name="email" />}
@@ -40,6 +45,31 @@ function InviteUserFormContent({
</FormGroup> </FormGroup>
)} )}
</FastField> </FastField>
{/* ----------- Role name ----------- */}
<FastField name={'role_id'}>
{({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup
label={<T id={'roles.label.role_name'} />}
labelInfo={<FieldRequiredHint />}
helperText={<ErrorMessage name="role_id" />}
className={classNames(CLASSES.FILL, 'form-group--role_name')}
intent={inputIntent({ error, touched })}
>
<ListSelect
items={roles}
onItemSelect={({ id }) => {
form.setFieldValue('role_id', id);
}}
selectedItem={value}
selectedItemProp={'id'}
textProp={'name'}
// labelProp={'id '}
popoverProps={{ minimal: true }}
intent={inputIntent({ error, touched })}
/>
</FormGroup>
)}
</FastField>
</div> </div>
<div className={CLASSES.DIALOG_FOOTER}> <div className={CLASSES.DIALOG_FOOTER}>

View File

@@ -1,5 +1,5 @@
import React, { createContext } from 'react'; import React, { createContext } from 'react';
import { useCreateInviteUser, useUsers } from 'hooks/query'; import { useCreateInviteUser, useUsers, useRoles } from 'hooks/query';
import { DialogContent } from 'components'; import { DialogContent } from 'components';
const InviteUserFormContext = createContext(); const InviteUserFormContext = createContext();
@@ -14,6 +14,9 @@ function InviteUserFormProvider({ userId, isEditMode, dialogName, ...props }) {
// fetch users list. // fetch users list.
const { isLoading: isUsersLoading } = useUsers(); const { isLoading: isUsersLoading } = useUsers();
// fetch roles list.
const { data: roles, isLoading: isRolesLoading } = useRoles();
// Provider state. // Provider state.
const provider = { const provider = {
inviteUserMutate, inviteUserMutate,
@@ -21,10 +24,14 @@ function InviteUserFormProvider({ userId, isEditMode, dialogName, ...props }) {
userId, userId,
isUsersLoading, isUsersLoading,
isEditMode, isEditMode,
roles,
}; };
return ( return (
<DialogContent isLoading={isUsersLoading} name={'invite-form'}> <DialogContent
isLoading={isUsersLoading || isRolesLoading}
name={'invite-form'}
>
<InviteUserFormContext.Provider value={provider} {...props} /> <InviteUserFormContext.Provider value={provider} {...props} />
</DialogContent> </DialogContent>
); );

View File

@@ -0,0 +1,14 @@
import React from 'react';
import { TransactionsLockingFormProvider } from './TransactionsLockingFormProvider';
import TransactionsLockingForm from './TransactionsLockingForm';
export default function TransactionsLockingDialogContent({
// #ownProps
dialogName,
}) {
return (
<TransactionsLockingFormProvider dialogName={dialogName}>
<TransactionsLockingForm />
</TransactionsLockingFormProvider>
);
}

View File

@@ -0,0 +1,50 @@
import React from 'react';
import { Intent, Button, Classes } from '@blueprintjs/core';
import { useFormikContext } from 'formik';
import { FormattedMessage as T } from 'components';
import { useTransactionLockingContext } from './TransactionsLockingFormProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
/**
* Transactions locking floating actions.
*/
function TransactionsLockingFloatingActions({
// #withDialogActions
closeDialog,
}) {
// Formik context.
const { isSubmitting } = useFormikContext();
const { dialogName } = useTransactionLockingContext();
// Handle cancel button click.
const handleCancelBtnClick = (event) => {
closeDialog(dialogName);
};
return (
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
disabled={isSubmitting}
onClick={handleCancelBtnClick}
style={{ minWidth: '75px' }}
>
<T id={'cancel'} />
</Button>
<Button
intent={Intent.PRIMARY}
loading={isSubmitting}
style={{ minWidth: '75px' }}
type="submit"
>
{<T id={'submit'} />}
</Button>
</div>
</div>
);
}
export default compose(withDialogActions)(TransactionsLockingFloatingActions);

View File

@@ -0,0 +1,48 @@
import React from 'react';
import moment from 'moment';
import { Intent } from '@blueprintjs/core';
import { Formik } from 'formik';
import intl from 'react-intl-universal';
import '../../../style/pages/TransactionsLocking/TransactionsLockingDialog.scss'
import { AppToaster } from 'components';
import { CreateTransactionsLockingFormSchema } from './TransactionsLockingForm.schema';
import { useTransactionLockingContext } from './TransactionsLockingFormProvider';
import TransactionsLockingFormContent from './TransactionsLockingFormContent';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
const defaultInitialValues = {
date: moment(new Date()).format('YYYY-MM-DD'),
reason: '',
};
/**
* Transactions Locking From.
*/
function TransactionsLockingForm({
// #withDialogActions
closeDialog,
}) {
const { dialogName } = useTransactionLockingContext();
// Initial form values.
const initialValues = {
...defaultInitialValues,
};
// Handles the form submit.
const handleFormSubmit = (values, { setSubmitting, setErrors }) => {};
return (
<Formik
validationSchema={CreateTransactionsLockingFormSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
component={TransactionsLockingFormContent}
/>
);
}
export default compose(withDialogActions)(TransactionsLockingForm);

View File

@@ -0,0 +1,13 @@
import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
date: Yup.date().required().label(intl.get('date')),
reason: Yup.string()
.required()
.min(3)
.max(DATATYPES_LENGTH.TEXT)
.label(intl.get('reason')),
});
export const CreateTransactionsLockingFormSchema = Schema;

View File

@@ -0,0 +1,17 @@
import React from 'react';
import { Form } from 'formik';
import TransactionsLockingFormFields from './TransactionsLockingFormFields';
import TransactionsLockingFloatingActions from './TransactionsLockingFloatingActions';
/**
* Transactions locking form content.
*/
export default function TransactionsLockingFormContent() {
return (
<Form>
<TransactionsLockingFormFields />
<TransactionsLockingFloatingActions />
</Form>
);
}

View File

@@ -0,0 +1,72 @@
import React from 'react';
import { FastField, ErrorMessage } from 'formik';
import { Classes, FormGroup, TextArea, Position } from '@blueprintjs/core';
import { DateInput } from '@blueprintjs/datetime';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import { FieldRequiredHint, FormattedMessage as T } from 'components';
import { useAutofocus } from 'hooks';
import {
inputIntent,
momentFormatter,
tansformDateValue,
handleDateChange,
} from 'utils';
/**
* Transactions locking form fields.
*/
export default function TransactionsLockingFormFields() {
const dateFieldRef = useAutofocus();
return (
<div className={Classes.DIALOG_BODY}>
{/*------------ Date -----------*/}
<FastField name={'date'}>
{({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup
label={<T id={'date'} />}
labelInfo={<FieldRequiredHint />}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="date" />}
minimal={true}
className={classNames(CLASSES.FILL, 'form-group--date')}
>
<DateInput
{...momentFormatter('YYYY/MM/DD')}
onChange={handleDateChange((formattedDate) => {
form.setFieldValue('date', formattedDate);
})}
value={tansformDateValue(value)}
popoverProps={{
position: Position.BOTTOM,
minimal: true,
}}
intent={inputIntent({ error, touched })}
inputRef={(ref) => (dateFieldRef.current = ref)}
/>
</FormGroup>
)}
</FastField>
{/*------------ reasons -----------*/}
<FastField name={'reason'}>
{({ field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'reason'} />}
labelInfo={<FieldRequiredHint />}
className={'form-group--reason'}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name={'reason'} />}
>
<TextArea
growVertically={true}
large={true}
intent={inputIntent({ error, touched })}
{...field}
/>
</FormGroup>
)}
</FastField>
</div>
);
}

View File

@@ -0,0 +1,21 @@
import React from 'react';
import { DialogContent } from 'components';
const TransactionsLockingContext = React.createContext();
function TransactionsLockingFormProvider({ dialogName, ...props }) {
// State provider.
const provider = {
dialogName,
};
return (
<DialogContent>
<TransactionsLockingContext.Provider value={provider} {...props} />
</DialogContent>
);
}
const useTransactionLockingContext = () =>
React.useContext(TransactionsLockingContext);
export { TransactionsLockingFormProvider, useTransactionLockingContext };

View File

@@ -0,0 +1,30 @@
import React from 'react';
import { Dialog, DialogSuspense, FormattedMessage as T } from 'components';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'utils';
const TransactionsLockingContent = React.lazy(() =>
import('./TransactionsLockingDialogContent'),
);
/**
* Transaction Locking dialog
*/
function TransactionsLockingDialog({ dialogName, payload = {}, isOpen }) {
return (
<Dialog
name={dialogName}
autoFocus={true}
title={<T id={'transactions_locking.dialog.label'} />}
canEscapeKeyClose={true}
isOpen={isOpen}
className={'dialog--transaction--locking'}
>
<DialogSuspense>
<TransactionsLockingContent dialogName={dialogName} />
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(TransactionsLockingDialog);

View File

@@ -10,6 +10,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { UserFormSchema } from './UserForm.schema'; import { UserFormSchema } from './UserForm.schema';
import UserFormContent from './UserFormContent'; import UserFormContent from './UserFormContent';
import { useUserFormContext } from './UserFormProvider'; import { useUserFormContext } from './UserFormProvider';
import { transformErrors } from './utils';
import { compose, objectKeysTransform } from 'utils'; import { compose, objectKeysTransform } from 'utils';
@@ -20,13 +21,10 @@ function UserForm({
// #withDialogActions // #withDialogActions
closeDialog, closeDialog,
}) { }) {
const { const [calloutCode, setCalloutCode] = React.useState([]);
dialogName,
user, const { dialogName, user, userId, isEditMode, EditUserMutate } =
userId, useUserFormContext();
isEditMode,
EditUserMutate,
} = useUserFormContext();
const initialValues = { const initialValues = {
...(isEditMode && ...(isEditMode &&
@@ -59,7 +57,7 @@ function UserForm({
data: { errors }, data: { errors },
}, },
} = error; } = error;
transformErrors(errors, { setErrors, setCalloutCode });
setSubmitting(false); setSubmitting(false);
}; };
@@ -72,7 +70,7 @@ function UserForm({
initialValues={initialValues} initialValues={initialValues}
onSubmit={handleSubmit} onSubmit={handleSubmit}
> >
<UserFormContent /> <UserFormContent calloutCode={calloutCode} />
</Formik> </Formik>
); );
} }

View File

@@ -2,20 +2,14 @@ import * as Yup from 'yup';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
const Schema = Yup.object().shape({ const Schema = Yup.object().shape({
email: Yup.string() email: Yup.string().email().required().label(intl.get('email')),
.email() first_name: Yup.string().required().label(intl.get('first_name_')),
.required() last_name: Yup.string().required().label(intl.get('last_name_')),
.label(intl.get('email')),
first_name: Yup.string()
.required()
.label(intl.get('first_name_')),
last_name: Yup.string()
.required()
.label(intl.get('last_name_')),
phone_number: Yup.string() phone_number: Yup.string()
.matches() .matches()
.required() .required()
.label(intl.get('phone_number_')), .label(intl.get('phone_number_')),
role_id: Yup.string().required().label(intl.get('roles.label.role_name_')),
}); });
export const UserFormSchema = Schema; export const UserFormSchema = Schema;

View File

@@ -11,20 +11,22 @@ import { FormattedMessage as T } from 'components';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import classNames from 'classnames'; import classNames from 'classnames';
import { inputIntent } from 'utils'; import { inputIntent } from 'utils';
import { FieldRequiredHint } from 'components'; import { ListSelect, FieldRequiredHint } from 'components';
import { useUserFormContext } from './UserFormProvider'; import { useUserFormContext } from './UserFormProvider';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils'; import { compose } from 'utils';
import { UserFormCalloutAlerts } from './components';
/** /**
* User form content. * User form content.
*/ */
function UserFormContent({ function UserFormContent({
calloutCode,
// #withDialogActions // #withDialogActions
closeDialog, closeDialog,
}) { }) {
const { isSubmitting } = useFormikContext(); const { isSubmitting } = useFormikContext();
const { dialogName } = useUserFormContext(); const { dialogName, roles, isAuth } = useUserFormContext();
const handleClose = () => { const handleClose = () => {
closeDialog(dialogName); closeDialog(dialogName);
@@ -33,6 +35,8 @@ function UserFormContent({
return ( return (
<Form> <Form>
<div className={Classes.DIALOG_BODY}> <div className={Classes.DIALOG_BODY}>
<UserFormCalloutAlerts calloutCodes={calloutCode} />
{/* ----------- Email ----------- */} {/* ----------- Email ----------- */}
<FastField name={'email'}> <FastField name={'email'}>
{({ field, meta: { error, touched } }) => ( {({ field, meta: { error, touched } }) => (
@@ -88,6 +92,32 @@ function UserFormContent({
</FormGroup> </FormGroup>
)} )}
</FastField> </FastField>
{/* ----------- Role name ----------- */}
<FastField name={'role_id'}>
{({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup
label={<T id={'roles.label.role_name'} />}
labelInfo={<FieldRequiredHint />}
helperText={<ErrorMessage name="role_id" />}
className={classNames(CLASSES.FILL, 'form-group--role_name')}
intent={inputIntent({ error, touched })}
>
<ListSelect
items={roles}
onItemSelect={({ id }) => {
form.setFieldValue('role_id', id);
}}
selectedItem={value}
selectedItemProp={'id'}
textProp={'name'}
// labelProp={'id '}
popoverProps={{ minimal: true }}
intent={inputIntent({ error, touched })}
disabled={isAuth}
/>
</FormGroup>
)}
</FastField>
</div> </div>
<div className={CLASSES.DIALOG_FOOTER}> <div className={CLASSES.DIALOG_FOOTER}>

View File

@@ -1,5 +1,10 @@
import React, { createContext, useContext } from 'react'; import React, { createContext, useContext } from 'react';
import { useEditUser, useUser } from 'hooks/query'; import {
useEditUser,
useUser,
useRoles,
useAuthenticatedAccount,
} from 'hooks/query';
import { DialogContent } from 'components'; import { DialogContent } from 'components';
@@ -17,10 +22,21 @@ function UserFormProvider({ userId, dialogName, ...props }) {
enabled: !!userId, enabled: !!userId,
}); });
// fetch roles list.
const { data: roles, isLoading: isRolesLoading } = useRoles();
// Retrieve authenticated user information.
const {
data: { id },
} = useAuthenticatedAccount();
const isEditMode = userId; const isEditMode = userId;
const isAuth = user.system_user_id == id
// Provider state. // Provider state.
const provider = { const provider = {
isAuth,
userId, userId,
dialogName, dialogName,
@@ -28,10 +44,14 @@ function UserFormProvider({ userId, dialogName, ...props }) {
EditUserMutate, EditUserMutate,
isEditMode, isEditMode,
roles,
}; };
return ( return (
<DialogContent isLoading={isUserLoading} name={'user-form'}> <DialogContent
isLoading={isUserLoading || isRolesLoading}
name={'user-form'}
>
<UserFormContext.Provider value={provider} {...props} /> <UserFormContext.Provider value={provider} {...props} />
</DialogContent> </DialogContent>
); );

View File

@@ -0,0 +1,14 @@
import React from 'react';
import intl from 'react-intl-universal';
import { includes } from 'lodash';
import { Callout, Intent } from '@blueprintjs/core';
export const UserFormCalloutAlerts = ({ calloutCodes }) => {
return [
includes(calloutCodes, 200) && (
<Callout icon={null} intent={Intent.DANGER}>
{intl.get('roles.error.you_cannot_change_your_own_role')}
</Callout>
),
];
};

View File

@@ -0,0 +1,13 @@
import intl from 'react-intl-universal';
// handle delete errors.
export const transformErrors = (errors, { setErrors, setCalloutCode }) => {
if (
errors.find((error) => error.type === 'CANNOT_AUTHORIZED_USER_MUTATE_ROLE')
) {
setCalloutCode([200]);
setErrors({
role_id: intl.get('roles.error.you_cannot_change_your_own_role'),
});
}
};

View File

@@ -7,13 +7,14 @@ import {
Intent, Intent,
NavbarDivider, NavbarDivider,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
import { AccountAction, AbilitySubject } from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
import { useAccountDrawerContext } from './AccountDrawerProvider'; import { useAccountDrawerContext } from './AccountDrawerProvider';
@@ -53,26 +54,31 @@ function AccountDrawerActionBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={AccountAction.Edit} a={AbilitySubject.Account}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_account'} />} icon={<Icon icon="pen-18" />}
onClick={safeCallback(onEditAccount)} text={<T id={'edit_account'} />}
/> onClick={safeCallback(onEditAccount)}
<Button />
className={Classes.MINIMAL}
icon={<Icon icon="plus" />} <Button
text={<T id={'new_child_account'} />} className={Classes.MINIMAL}
onClick={safeCallback(onNewChildAccount)} icon={<Icon icon="plus" />}
/> text={<T id={'new_child_account'} />}
<NavbarDivider /> onClick={safeCallback(onNewChildAccount)}
<Button />
className={Classes.MINIMAL} <NavbarDivider />
icon={<Icon icon={'trash-16'} iconSize={16} />} </Can>
text={<T id={'delete'} />} <Can I={AccountAction.Delete} a={AbilitySubject.Account}>
intent={Intent.DANGER} <Button
onClick={safeCallback(onDeleteAccount)} className={Classes.MINIMAL}
/> icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteAccount)}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -16,7 +16,12 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { If, Icon, FormattedMessage as T } from 'components'; import { Can, If, Icon, FormattedMessage as T } from 'components';
import {
BillAction,
PaymentMadeAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback, compose } from 'utils'; import { safeCallback, compose } from 'utils';
@@ -53,29 +58,35 @@ function BillDetailActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={BillAction.Edit} a={AbilitySubject.Bill}>
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_bill'} />}
onClick={safeCallback(onEditBill)}
/>
<NavbarDivider />
<If condition={bill.is_open && !bill.is_fully_paid}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="quick-payment-16" iconSize={16} />} icon={<Icon icon="pen-18" />}
text={<T id={'add_payment'} />} text={<T id={'edit_bill'} />}
onClick={handleQuickBillPayment} onClick={safeCallback(onEditBill)}
/> />
</If> <NavbarDivider />
<NavbarDivider /> </Can>
<Button <Can I={PaymentMadeAction.Create} a={AbilitySubject.PaymentMade}>
className={Classes.MINIMAL} <If condition={bill.is_open && !bill.is_fully_paid}>
icon={<Icon icon={'trash-16'} iconSize={16} />} <Button
text={<T id={'delete'} />} className={Classes.MINIMAL}
intent={Intent.DANGER} icon={<Icon icon="quick-payment-16" iconSize={16} />}
onClick={safeCallback(onDeleteBill)} text={<T id={'add_payment'} />}
/> onClick={handleQuickBillPayment}
/>
</If>
<NavbarDivider />
</Can>
<Can I={BillAction.Delete} a={AbilitySubject.Bill}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteBill)}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -1,12 +1,12 @@
import React from 'react'; import React from 'react';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import { Button, Classes, NavbarGroup, Intent } from '@blueprintjs/core'; import { Button, Classes, NavbarGroup, Intent } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider'; import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import { AbilitySubject, CashflowAction } from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -24,17 +24,19 @@ function CashflowTransactionDrawerActionBar({
}; };
return ( return (
<DashboardActionsBar> <Can I={CashflowAction.Delete} a={AbilitySubject.Cashflow}>
<NavbarGroup> <DashboardActionsBar>
<Button <NavbarGroup>
className={Classes.MINIMAL} <Button
icon={<Icon icon="trash-16" iconSize={16} />} className={Classes.MINIMAL}
text={<T id={'delete'} />} icon={<Icon icon="trash-16" iconSize={16} />}
intent={Intent.DANGER} text={<T id={'delete'} />}
onClick={handleDeleteCashflowTransaction} intent={Intent.DANGER}
/> onClick={handleDeleteCashflowTransaction}
</NavbarGroup> />
</DashboardActionsBar> </NavbarGroup>
</DashboardActionsBar>
</Can>
); );
} }
export default compose(withAlertsActions)(CashflowTransactionDrawerActionBar); export default compose(withAlertsActions)(CashflowTransactionDrawerActionBar);

View File

@@ -21,8 +21,15 @@ import { useCustomerDetailsDrawerContext } from './CustomerDetailsDrawerProvider
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import {
AbilitySubject,
SaleInvoiceAction,
SaleEstimateAction,
SaleReceiptAction,
PaymentReceiveAction,
CustomerAction,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -62,7 +69,7 @@ function CustomerDetailsActionsBar({
const handleDeleteCustomer = () => { const handleDeleteCustomer = () => {
openAlert(`customer-delete`, { contactId: customerId }); openAlert(`customer-delete`, { contactId: customerId });
}; };
const handleEditContact = () => { const handleEditContact = () => {
history.push(`/customers/${customerId}/edit`); history.push(`/customers/${customerId}/edit`);
closeDrawer('customer-details-drawer'); closeDrawer('customer-details-drawer');
@@ -74,22 +81,34 @@ function CustomerDetailsActionsBar({
<Popover <Popover
content={ content={
<Menu> <Menu>
<MenuItem <Can I={SaleInvoiceAction.Create} a={AbilitySubject.Invoice}>
text={<T id={'customer.drawer.action.new_invoice'} />} <MenuItem
onClick={handleNewInvoiceClick} text={<T id={'customer.drawer.action.new_invoice'} />}
/> onClick={handleNewInvoiceClick}
<MenuItem />
text={<T id={'customer.drawer.action.new_estimate'} />} </Can>
onClick={handleNewEstimateClick} <Can I={SaleEstimateAction.Create} a={AbilitySubject.Estimate}>
/> <MenuItem
<MenuItem text={<T id={'customer.drawer.action.new_estimate'} />}
text={<T id={'customer.drawer.action.new_receipt'} />} onClick={handleNewEstimateClick}
onClick={handleNewReceiptClick} />
/> </Can>
<MenuItem <Can I={SaleReceiptAction.Create} a={AbilitySubject.Receipt}>
text={<T id={'customer.drawer.action.new_payment'} />} <MenuItem
onClick={handleNewPaymentClick} text={<T id={'customer.drawer.action.new_receipt'} />}
/> onClick={handleNewReceiptClick}
/>
</Can>
<Can
I={PaymentReceiveAction.Create}
a={AbilitySubject.PaymentReceive}
>
<MenuItem
text={<T id={'customer.drawer.action.new_payment'} />}
onClick={handleNewPaymentClick}
/>
</Can>
</Menu> </Menu>
} }
minimal={true} minimal={true}
@@ -104,21 +123,24 @@ function CustomerDetailsActionsBar({
</Popover> </Popover>
<NavbarDivider /> <NavbarDivider />
<Can I={CustomerAction.Edit} a={AbilitySubject.Customer}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
text={intl.get('customer.drawer.action.edit')} text={intl.get('customer.drawer.action.edit')}
onClick={handleEditContact} onClick={handleEditContact}
/> />
<NavbarDivider /> <NavbarDivider />
<Button </Can>
className={Classes.MINIMAL} <Can I={CustomerAction.Delete} a={AbilitySubject.Customer}>
icon={<Icon icon={'trash-16'} iconSize={16} />} <Button
text={<T id={'delete'} />} className={Classes.MINIMAL}
intent={Intent.DANGER} icon={<Icon icon={'trash-16'} iconSize={16} />}
onClick={handleDeleteCustomer} text={<T id={'delete'} />}
/> intent={Intent.DANGER}
onClick={handleDeleteCustomer}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -14,8 +14,12 @@ import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import {
SaleEstimateAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { Icon, FormattedMessage as T, MoreMenuItems } from 'components'; import { Icon, FormattedMessage as T, MoreMenuItems, Can } from 'components';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -59,32 +63,40 @@ function EstimateDetailActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={SaleEstimateAction.Edit} a={AbilitySubject.Estimate}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_estimate'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditEstimate} text={<T id={'edit_estimate'} />}
/> onClick={handleEditEstimate}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon="print-16" />} <Can I={SaleEstimateAction.View} a={AbilitySubject.Estimate}>
text={<T id={'print'} />} <Button
onClick={handlePrintEstimate} className={Classes.MINIMAL}
/> icon={<Icon icon="print-16" />}
<Button text={<T id={'print'} />}
className={Classes.MINIMAL} onClick={handlePrintEstimate}
icon={<Icon icon={'trash-16'} iconSize={16} />} />
text={<T id={'delete'} />} </Can>
intent={Intent.DANGER} <Can I={SaleEstimateAction.Delete} a={AbilitySubject.Estimate}>
onClick={handleDeleteEstimate} <Button
/> className={Classes.MINIMAL}
<NavbarDivider /> icon={<Icon icon={'trash-16'} iconSize={16} />}
<MoreMenuItems text={<T id={'delete'} />}
payload={{ intent={Intent.DANGER}
onNotifyViaSMS: handleNotifyViaSMS, onClick={handleDeleteEstimate}
}} />
/> <NavbarDivider />
</Can>
<Can I={SaleEstimateAction.NotifyBySms} a={AbilitySubject.Estimate}>
<MoreMenuItems
payload={{
onNotifyViaSMS: handleNotifyViaSMS,
}}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -8,8 +8,8 @@ import {
Intent, Intent,
NavbarDivider, NavbarDivider,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import { ExpenseAction, AbilitySubject } from '../../../common/abilityOption';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
@@ -44,20 +44,24 @@ function ExpenseDrawerActionBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={ExpenseAction.Edit} a={AbilitySubject.Expense}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_expense'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditExpense} text={<T id={'edit_expense'} />}
/> onClick={handleEditExpense}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon="trash-16" iconSize={16} />} <Can I={ExpenseAction.Delete} a={AbilitySubject.Expense}>
text={<T id={'delete'} />} <Button
intent={Intent.DANGER} className={Classes.MINIMAL}
onClick={handleDeleteExpense} icon={<Icon icon="trash-16" iconSize={16} />}
/> text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteExpense}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -7,7 +7,11 @@ import { useInventoryAdjustmentDrawerContext } from './InventoryAdjustmentDrawer
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import { Icon, FormattedMessage as T } from 'components'; import { Icon, FormattedMessage as T, Can } from 'components';
import {
InventoryAdjustmentAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -26,17 +30,22 @@ function InventoryAdjustmentDetailActionsBar({
}; };
return ( return (
<DashboardActionsBar> <Can
<NavbarGroup> I={InventoryAdjustmentAction.Delete}
<Button a={AbilitySubject.InventoryAdjustment}
className={Classes.MINIMAL} >
icon={<Icon icon={'trash-16'} iconSize={16} />} <DashboardActionsBar>
text={<T id={'delete'} />} <NavbarGroup>
intent={Intent.DANGER} <Button
onClick={handleDeleteInventoryAdjustment} className={Classes.MINIMAL}
/> icon={<Icon icon={'trash-16'} iconSize={16} />}
</NavbarGroup> text={<T id={'delete'} />}
</DashboardActionsBar> intent={Intent.DANGER}
onClick={handleDeleteInventoryAdjustment}
/>
</NavbarGroup>
</DashboardActionsBar>
</Can>
); );
} }

View File

@@ -16,7 +16,12 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { If, Icon, FormattedMessage as T } from 'components'; import { If, Can, Icon, FormattedMessage as T } from 'components';
import {
SaleInvoiceAction,
PaymentReceiveAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -78,43 +83,54 @@ function InvoiceDetailActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={SaleInvoiceAction.Edit} a={AbilitySubject.Invoice}>
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_invoice'} />}
onClick={handleEditInvoice}
/>
<NavbarDivider />
<If condition={invoice.is_delivered && !invoice.is_fully_paid}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="quick-payment-16" iconSize={16} />} icon={<Icon icon="pen-18" />}
text={<T id={'add_payment'} />} text={<T id={'edit_invoice'} />}
onClick={handleQuickPaymentInvoice} onClick={handleEditInvoice}
/> />
</If>
<NavbarDivider /> <NavbarDivider />
<Button </Can>
className={Classes.MINIMAL} <Can I={PaymentReceiveAction.Create} a={AbilitySubject.PaymentReceive}>
icon={<Icon icon="print-16" />} <If condition={invoice.is_delivered && !invoice.is_fully_paid}>
text={<T id={'print'} />} <Button
onClick={handlePrintInvoice} className={Classes.MINIMAL}
/> icon={<Icon icon="quick-payment-16" iconSize={16} />}
<Button text={<T id={'add_payment'} />}
className={Classes.MINIMAL} onClick={handleQuickPaymentInvoice}
icon={<Icon icon={'trash-16'} iconSize={16} />} />
text={<T id={'delete'} />} </If>
intent={Intent.DANGER} <NavbarDivider />
onClick={handleDeleteInvoice} </Can>
/> <Can I={SaleInvoiceAction.View} a={AbilitySubject.Invoice}>
<NavbarDivider /> <Button
<BadDebtMenuItem className={Classes.MINIMAL}
payload={{ icon={<Icon icon="print-16" />}
onBadDebt: handleBadDebtInvoice, text={<T id={'print'} />}
onCancelBadDebt: handleCancelBadDebtInvoice, onClick={handlePrintInvoice}
onNotifyViaSMS: handleNotifyViaSMS, />
}} </Can>
/> <Can I={SaleInvoiceAction.Delete} a={AbilitySubject.Invoice}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteInvoice}
/>
</Can>
<Can I={SaleInvoiceAction.Writeoff} a={AbilitySubject.Invoice}>
<NavbarDivider />
<BadDebtMenuItem
payload={{
onBadDebt: handleBadDebtInvoice,
onCancelBadDebt: handleCancelBadDebtInvoice,
onNotifyViaSMS: handleNotifyViaSMS,
}}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -8,7 +8,11 @@ import {
MenuItem, MenuItem,
Menu, Menu,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { Icon, FormattedMessage as T, Choose } from 'components'; import { Icon, FormattedMessage as T, Choose, Can } from 'components';
import {
SaleInvoiceAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { FormatNumberCell } from '../../../components'; import { FormatNumberCell } from '../../../components';
import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider'; import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
@@ -88,10 +92,12 @@ export const BadDebtMenuItem = ({
/> />
</Choose.When> </Choose.When>
</Choose> </Choose>
<MenuItem <Can I={SaleInvoiceAction.NotifyBySms} a={AbilitySubject.Invoice}>
onClick={onNotifyViaSMS} <MenuItem
text={<T id={'notify_via_sms.dialog.notify_via_sms'} />} onClick={onNotifyViaSMS}
/> text={<T id={'notify_via_sms.dialog.notify_via_sms'} />}
/>
</Can>
</Menu> </Menu>
} }
> >

View File

@@ -10,11 +10,12 @@ import {
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { useItemDetailDrawerContext } from './ItemDetailDrawerProvider'; import { useItemDetailDrawerContext } from './ItemDetailDrawerProvider';
import { ItemAction, AbilitySubject } from '../../../common/abilityOption';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components'; import { Icon, FormattedMessage as T, Can } from 'components';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -47,20 +48,25 @@ function ItemDetailActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={ItemAction.Edit} a={AbilitySubject.Item}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_item'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditItem} text={<T id={'edit_item'} />}
/> onClick={handleEditItem}
<NavbarDivider /> />
<Button
className={Classes.MINIMAL} <NavbarDivider />
icon={<Icon icon={'trash-16'} iconSize={16} />} </Can>
text={<T id={'delete'} />} <Can I={ItemAction.Delete} a={AbilitySubject.Item}>
intent={Intent.DANGER} <Button
onClick={handleDeleteItem} className={Classes.MINIMAL}
/> icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteItem}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -8,14 +8,19 @@ import {
Intent, Intent,
NavbarDivider, NavbarDivider,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { compose } from 'utils';
import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider'; import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider';
import {
ManualJournalAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils';
/** /**
* Manual journal action bar. * Manual journal action bar.
@@ -44,20 +49,24 @@ function ManualJournalDrawerActionBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={ManualJournalAction.Edit} a={AbilitySubject.ManualJournal}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_journal'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditManualJournal} text={<T id={'edit_journal'} />}
/> onClick={handleEditManualJournal}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon="trash-16" iconSize={16} />} <Can I={ManualJournalAction.Delete} a={AbilitySubject.ManualJournal}>
text={<T id={'delete'} />} <Button
intent={Intent.DANGER} className={Classes.MINIMAL}
onClick={handleDeleteManualJournal} icon={<Icon icon="trash-16" iconSize={16} />}
/> text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteManualJournal}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -16,8 +16,11 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import {
PaymentMadeAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -48,20 +51,24 @@ function PaymentMadeDetailActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={PaymentMadeAction.Edit} a={AbilitySubject.PaymentMade}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_payment_made'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditPaymentMade} text={<T id={'edit_payment_made'} />}
/> onClick={handleEditPaymentMade}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon={'trash-16'} iconSize={16} />} <Can I={PaymentMadeAction.Delete} a={AbilitySubject.PaymentMade}>
text={<T id={'delete'} />} <Button
intent={Intent.DANGER} className={Classes.MINIMAL}
onClick={handleDeletePaymentMade} icon={<Icon icon={'trash-16'} iconSize={16} />}
/> text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeletePaymentMade}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -16,7 +16,11 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T, MoreMenuItems } from 'components'; import { Can, Icon, FormattedMessage as T, MoreMenuItems } from 'components';
import {
PaymentReceiveAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -57,26 +61,32 @@ function PaymentReceiveActionsBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={PaymentReceiveAction.Edit} a={AbilitySubject.PaymentReceive}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_payment_receive'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditPaymentReceive} text={<T id={'edit_payment_receive'} />}
/> onClick={handleEditPaymentReceive}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon={'trash-16'} iconSize={16} />} <Can I={PaymentReceiveAction.Delete} a={AbilitySubject.PaymentReceive}>
text={<T id={'delete'} />} <Button
intent={Intent.DANGER} className={Classes.MINIMAL}
onClick={handleDeletePaymentReceive} icon={<Icon icon={'trash-16'} iconSize={16} />}
/> text={<T id={'delete'} />}
<NavbarDivider /> intent={Intent.DANGER}
<MoreMenuItems onClick={handleDeletePaymentReceive}
payload={{ />
onNotifyViaSMS: handleNotifyViaSMS, <NavbarDivider />
}} </Can>
/> <Can I={PaymentReceiveAction.NotifyBySms} a={AbilitySubject.PaymentReceive}>
<MoreMenuItems
payload={{
onNotifyViaSMS: handleNotifyViaSMS,
}}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -14,8 +14,12 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T, MoreMenuItems } from 'components'; import { Can, Icon, FormattedMessage as T, MoreMenuItems } from 'components';
import { useReceiptDetailDrawerContext } from './ReceiptDetailDrawerProvider'; import { useReceiptDetailDrawerContext } from './ReceiptDetailDrawerProvider';
import {
SaleReceiptAction,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback, compose } from 'utils'; import { safeCallback, compose } from 'utils';
@@ -54,32 +58,40 @@ function ReceiptDetailActionBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={SaleReceiptAction.Edit} a={AbilitySubject.Receipt}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_receipt'} />} icon={<Icon icon="pen-18" />}
onClick={safeCallback(onEditReceipt)} text={<T id={'edit_receipt'} />}
/> onClick={safeCallback(onEditReceipt)}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon="print-16" />} <Can I={SaleReceiptAction.View} a={AbilitySubject.Receipt}>
text={<T id={'print'} />} <Button
onClick={safeCallback(onPrintReceipt)} className={Classes.MINIMAL}
/> icon={<Icon icon="print-16" />}
<Button text={<T id={'print'} />}
className={Classes.MINIMAL} onClick={safeCallback(onPrintReceipt)}
icon={<Icon icon={'trash-16'} iconSize={16} />} />
text={<T id={'delete'} />} </Can>
intent={Intent.DANGER} <Can I={SaleReceiptAction.Delete} a={AbilitySubject.Receipt}>
onClick={safeCallback(onDeleteReceipt)} <Button
/> className={Classes.MINIMAL}
<NavbarDivider /> icon={<Icon icon={'trash-16'} iconSize={16} />}
<MoreMenuItems text={<T id={'delete'} />}
payload={{ intent={Intent.DANGER}
onNotifyViaSMS: handleNotifyViaSMS, onClick={safeCallback(onDeleteReceipt)}
}} />
/> <NavbarDivider />
</Can>
<Can I={SaleReceiptAction.NotifyBySms} a={AbilitySubject.Receipt}>
<MoreMenuItems
payload={{
onNotifyViaSMS: handleNotifyViaSMS,
}}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -20,8 +20,13 @@ import { useVendorDetailsDrawerContext } from './VendorDetailsDrawerProvider';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import {
AbilitySubject,
SaleInvoiceAction,
PaymentMadeAction,
VendorAction,
} from '../../../common/abilityOption';
import { safeCallback, compose } from 'utils'; import { safeCallback, compose } from 'utils';
/** /**
@@ -64,14 +69,18 @@ function VendorDetailsActionsBar({
<Popover <Popover
content={ content={
<Menu> <Menu>
<MenuItem <Can I={SaleInvoiceAction.Create} a={AbilitySubject.Invoice}>
text={<T id={'vendor.drawer.action.new_invoice'} />} <MenuItem
onClick={handleNewInvoiceClick} text={<T id={'vendor.drawer.action.new_invoice'} />}
/> onClick={handleNewInvoiceClick}
<MenuItem />
text={<T id={'vendor.drawer.action.new_payment'} />} </Can>
onClick={handleNewPaymentClick} <Can I={PaymentMadeAction.Create} a={AbilitySubject.PaymentMade}>
/> <MenuItem
text={<T id={'vendor.drawer.action.new_payment'} />}
onClick={handleNewPaymentClick}
/>
</Can>
</Menu> </Menu>
} }
minimal={true} minimal={true}
@@ -84,23 +93,25 @@ function VendorDetailsActionsBar({
icon={<Icon icon={'plus'} />} icon={<Icon icon={'plus'} />}
/> />
</Popover> </Popover>
<NavbarDivider /> <NavbarDivider />
<Can I={VendorAction.Edit} a={AbilitySubject.Vendor}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
text={<T id={'vendor.drawer.action.edit'} />} text={<T id={'vendor.drawer.action.edit'} />}
onClick={safeCallback(onEditContact)} onClick={safeCallback(onEditContact)}
/> />
<NavbarDivider /> <NavbarDivider />
<Button </Can>
className={Classes.MINIMAL} <Can I={VendorAction.Delete} a={AbilitySubject.Vendor}>
icon={<Icon icon={'trash-16'} iconSize={16} />} <Button
text={<T id={'vendor.drawer.action.delete'} />} className={Classes.MINIMAL}
intent={Intent.DANGER} icon={<Icon icon={'trash-16'} iconSize={16} />}
onClick={safeCallback(onDeleteContact)} text={<T id={'vendor.drawer.action.delete'} />}
/> intent={Intent.DANGER}
onClick={safeCallback(onDeleteContact)}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -15,6 +15,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { import {
If, If,
Can,
DashboardRowsHeightButton, DashboardRowsHeightButton,
DashboardActionViewsList, DashboardActionViewsList,
DashboardFilterButton, DashboardFilterButton,
@@ -22,6 +23,7 @@ import {
FormattedMessage as T, FormattedMessage as T,
} from 'components'; } from 'components';
import { ExpenseAction, AbilitySubject } from '../../../common/abilityOption';
import { useRefreshExpenses } from 'hooks/query/expenses'; import { useRefreshExpenses } from 'hooks/query/expenses';
import { useExpensesListContext } from './ExpensesListProvider'; import { useExpensesListContext } from './ExpensesListProvider';
@@ -92,13 +94,14 @@ function ExpensesActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={ExpenseAction.Create} a={AbilitySubject.Expense}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="plus" />} icon={<Icon icon="plus" />}
text={<T id={'new_expense'} />} text={<T id={'new_expense'} />}
onClick={onClickNewExpense} onClick={onClickNewExpense}
/> />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: expensesFilterConditions, conditions: expensesFilterConditions,

View File

@@ -2,7 +2,8 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core'; import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components'; import { EmptyStatus } from 'components';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import { AbilitySubject, ExpenseAction } from '../../../common/abilityOption';
export default function InvoicesEmptyStatus() { export default function InvoicesEmptyStatus() {
const history = useHistory(); const history = useHistory();
@@ -17,19 +18,21 @@ export default function InvoicesEmptyStatus() {
} }
action={ action={
<> <>
<Button <Can I={ExpenseAction.Create} a={AbilitySubject.Expense}>
intent={Intent.PRIMARY} <Button
large={true} intent={Intent.PRIMARY}
onClick={() => { large={true}
history.push('/expenses/new'); onClick={() => {
}} history.push('/expenses/new');
> }}
<T id={'new_expense'} /> >
</Button> <T id={'new_expense'} />
</Button>
<Button intent={Intent.NONE} large={true}> <Button intent={Intent.NONE} large={true}>
<T id={'learn_more'} /> <T id={'learn_more'} />
</Button> </Button>
</Can>
</> </>
} }
/> />

View File

@@ -12,13 +12,14 @@ import {
MenuDivider, MenuDivider,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { ExpenseAction, AbilitySubject } from '../../../common/abilityOption';
import { import {
FormatDateCell, FormatDateCell,
FormattedMessage as T, FormattedMessage as T,
Money, Money,
Icon, Icon,
If, If,
Can,
} from 'components'; } from 'components';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
@@ -54,25 +55,31 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={ExpenseAction.Edit} a={AbilitySubject.Expense}>
<If condition={!original.is_published}> <MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />}
text={intl.get('publish_expense')}
onClick={safeCallback(onPublish, original)}
/>
</If>
</Can>
<Can I={ExpenseAction.Edit} a={AbilitySubject.Expense}>
<MenuItem <MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />} icon={<Icon icon="pen-18" />}
text={intl.get('publish_expense')} text={intl.get('edit_expense')}
onClick={safeCallback(onPublish, original)} onClick={safeCallback(onEdit, original)}
/> />
</If> </Can>
<MenuItem <Can I={ExpenseAction.Delete} a={AbilitySubject.Expense}>
icon={<Icon icon="pen-18" />} <MenuItem
text={intl.get('edit_expense')} icon={<Icon icon="trash-16" iconSize={16} />}
onClick={safeCallback(onEdit, original)} text={intl.get('delete_expense')}
/> intent={Intent.DANGER}
<MenuItem onClick={safeCallback(onDelete, original)}
icon={<Icon icon="trash-16" iconSize={16} />} />
text={intl.get('delete_expense')} </Can>
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Menu> </Menu>
); );
} }

View File

@@ -0,0 +1,23 @@
import { isEmpty } from 'lodash';
import { useAbilityContext } from '../../hooks';
function useFilterFinancialReports(financialSection) {
const ability = useAbilityContext();
const section = financialSection
.map((section) => {
const reports = section.reports.filter((report) => {
return ability.can(report.ability, report.subject);
});
return {
sectionTitle: section.sectionTitle,
reports,
};
})
.filter(({ reports }) => !isEmpty(reports));
return section;
}
export default useFilterFinancialReports;

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { For } from 'components'; import { For } from 'components';
import useFilterFinancialReports from './FilterFinancialReports';
import DashboardInsider from 'components/Dashboard/DashboardInsider'; import DashboardInsider from 'components/Dashboard/DashboardInsider';
import { import {
financialReportMenus, financialReportMenus,
@@ -37,13 +37,18 @@ function FinancialReportsSection({ sectionTitle, reports }) {
* Financial reports. * Financial reports.
*/ */
export default function FinancialReports() { export default function FinancialReports() {
const financialReportMenu = useFilterFinancialReports(financialReportMenus);
const SalesAndPurchasesReportMenu = useFilterFinancialReports(
SalesAndPurchasesReportMenus,
);
return ( return (
<DashboardInsider name={'financial-reports'}> <DashboardInsider name={'financial-reports'}>
<div class="financial-reports"> <div class="financial-reports">
<For render={FinancialReportsSection} of={financialReportMenus} /> <For render={FinancialReportsSection} of={financialReportMenu} />
<For <For
render={FinancialReportsSection} render={FinancialReportsSection}
of={SalesAndPurchasesReportMenus} of={SalesAndPurchasesReportMenu}
/> />
</div> </div>
</DashboardInsider> </DashboardInsider>

View File

@@ -1,7 +1,5 @@
import React from 'react';
import { Intent } from '@blueprintjs/core'; import { Intent } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { useHistory } from 'react-router-dom';
import AppToaster from 'components/AppToaster'; import AppToaster from 'components/AppToaster';
import withGlobalErrors from './withGlobalErrors'; import withGlobalErrors from './withGlobalErrors';
@@ -30,7 +28,6 @@ function GlobalErrors({
toastKeySessionExpired, toastKeySessionExpired,
); );
} }
if (globalErrors.session_expired) { if (globalErrors.session_expired) {
toastKeySomethingWrong = AppToaster.show( toastKeySomethingWrong = AppToaster.show(
{ {
@@ -43,6 +40,18 @@ function GlobalErrors({
toastKeySomethingWrong, toastKeySomethingWrong,
); );
} }
if (globalErrors.access_denied) {
toastKeySomethingWrong = AppToaster.show(
{
message: 'You do not have permissions to access this page.',
intent: Intent.DANGER,
onDismiss: () => {
globalErrorsSet({ access_denied: false });
},
},
toastKeySomethingWrong,
);
}
return null; return null;
} }

View File

@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom';
import { For } from 'components'; import { For } from 'components';
import 'style/pages/FinancialStatements/FinancialSheets.scss'; import 'style/pages/FinancialStatements/FinancialSheets.scss';
import { useFilterShortcutBoxesSection } from './components';
function ShortcutBox({ title, link, description }) { function ShortcutBox({ title, link, description }) {
return ( return (
@@ -27,5 +28,6 @@ function ShortcutBoxes({ sectionTitle, shortcuts }) {
} }
export default function ShortcutBoxesSection({ section }) { export default function ShortcutBoxesSection({ section }) {
return <For render={ShortcutBoxes} of={section} />; const BoxSection = useFilterShortcutBoxesSection(section);
return <For render={ShortcutBoxes} of={BoxSection} />;
} }

View File

@@ -0,0 +1,18 @@
import { isEmpty } from 'lodash';
import { useAbilityContext } from '../../hooks';
export const useFilterShortcutBoxesSection = (section) => {
const ability = useAbilityContext();
return section
.map(({ sectionTitle, shortcuts }) => {
const shortcut = shortcuts.filter((shortcuts) => {
return ability.can(shortcuts.ability, shortcuts.subject);
});
return {
sectionTitle: sectionTitle,
shortcuts: shortcut,
};
})
.filter(({ shortcuts }) => !isEmpty(shortcuts));
};

View File

@@ -12,10 +12,14 @@ import {
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import moment from 'moment'; import moment from 'moment';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T, Can } from 'components';
import { isNumber } from 'lodash'; import { isNumber } from 'lodash';
import { Icon, Money, If } from 'components'; import { Icon, Money, If } from 'components';
import { isBlank, safeCallback } from 'utils'; import { isBlank, safeCallback } from 'utils';
import {
InventoryAdjustmentAction,
AbilitySubject,
} from '../../common/abilityOption';
/** /**
* Publish accessor * Publish accessor
@@ -102,20 +106,31 @@ export const ActionsMenu = ({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider />
<If condition={!original.is_published}> <Can
I={InventoryAdjustmentAction.Create}
a={AbilitySubject.InventoryAdjustment}
>
<MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />}
text={intl.get('publish_adjustment')}
onClick={safeCallback(onPublish, original)}
/>
</If>
</Can>
<Can
I={InventoryAdjustmentAction.Delete}
a={AbilitySubject.InventoryAdjustment}
>
<MenuItem <MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />} text={intl.get('delete_adjustment')}
text={intl.get('publish_adjustment')} intent={Intent.DANGER}
onClick={safeCallback(onPublish, original)} onClick={safeCallback(onDelete, original)}
icon={<Icon icon="trash-16" iconSize={16} />}
/> />
</If> </Can>
<MenuItem
text={intl.get('delete_adjustment')}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
icon={<Icon icon="trash-16" iconSize={16} />}
/>
</Menu> </Menu>
); );
}; };

View File

@@ -14,6 +14,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import { import {
If, If,
Can,
DashboardActionViewsList, DashboardActionViewsList,
AdvancedFilterPopover, AdvancedFilterPopover,
DashboardFilterButton, DashboardFilterButton,
@@ -30,6 +31,8 @@ import withSettings from '../Settings/withSettings';
import { compose } from 'utils'; import { compose } from 'utils';
import withSettingsActions from '../Settings/withSettingsActions'; import withSettingsActions from '../Settings/withSettingsActions';
import { ItemAction, AbilitySubject } from '../../common/abilityOption';
/** /**
* Items actions bar. * Items actions bar.
*/ */
@@ -101,13 +104,14 @@ function ItemsActionsBar({
/> />
<NavbarDivider /> <NavbarDivider />
<Button <Can I={ItemAction.Create} a={AbilitySubject.Item}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="plus" />} className={Classes.MINIMAL}
text={<T id={'new_item'} />} icon={<Icon icon="plus" />}
onClick={onClickNewItem} text={<T id={'new_item'} />}
/> onClick={onClickNewItem}
/>
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: itemsFilterRoles, conditions: itemsFilterRoles,
@@ -149,11 +153,13 @@ function ItemsActionsBar({
onChange={handleTableRowSizeChange} onChange={handleTableRowSizeChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Switch <Can I={ItemAction.Edit} a={AbilitySubject.Item}>
labelElement={<T id={'inactive'} />} <Switch
defaultChecked={itemsInactiveMode} labelElement={<T id={'inactive'} />}
onChange={handleInactiveSwitchChange} defaultChecked={itemsInactiveMode}
/> onChange={handleInactiveSwitchChange}
/>
</Can>
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>

View File

@@ -2,7 +2,8 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core'; import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components'; import { EmptyStatus } from 'components';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import { ItemAction, AbilitySubject } from '../../common/abilityOption';
export default function ItemsEmptyStatus() { export default function ItemsEmptyStatus() {
const history = useHistory(); const history = useHistory();
@@ -17,19 +18,21 @@ export default function ItemsEmptyStatus() {
} }
action={ action={
<> <>
<Button <Can I={ItemAction.Create} a={AbilitySubject.Item}>
intent={Intent.PRIMARY} <Button
large={true} intent={Intent.PRIMARY}
onClick={() => { large={true}
history.push('/items/new'); onClick={() => {
}} history.push('/items/new');
> }}
<T id={'new_item'} /> >
</Button> <T id={'new_item'} />
</Button>
<Button intent={Intent.NONE} large={true}> <Button intent={Intent.NONE} large={true}>
<T id={'learn_more'} /> <T id={'learn_more'} />
</Button> </Button>
</Can>
</> </>
} }
/> />

View File

@@ -1,7 +1,10 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { RESOURCES_TYPES } from '../../common/resourcesTypes';
import withDrawerActions from '../Drawer/withDrawerActions'; import withDrawerActions from '../Drawer/withDrawerActions';
import { RESOURCES_TYPES } from '../../common/resourcesTypes';
import { AbilitySubject, ItemAction } from '../../common/abilityOption';
/** /**
* Item univrsal search item select action. * Item univrsal search item select action.
*/ */
@@ -46,4 +49,8 @@ export const universalSearchItemBind = () => ({
optionItemLabel: intl.get('items'), optionItemLabel: intl.get('items'),
selectItemAction: ItemUniversalSearchSelectAction, selectItemAction: ItemUniversalSearchSelectAction,
itemSelect: transfromItemsToSearch, itemSelect: transfromItemsToSearch,
permission: {
ability: ItemAction.View,
subject: AbilitySubject.Item,
},
}); });

View File

@@ -12,8 +12,13 @@ import {
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { isNumber } from 'lodash'; import { isNumber } from 'lodash';
import { FormattedMessage as T, Icon, Money, If } from 'components'; import { FormattedMessage as T, Icon, Money, If, Can } from 'components';
import { isBlank, safeCallback } from 'utils'; import { isBlank, safeCallback } from 'utils';
import {
AbilitySubject,
ItemAction,
InventoryAdjustmentAction,
} from '../../common/abilityOption';
/** /**
* Publish accessor * Publish accessor
@@ -90,44 +95,58 @@ export function ItemsActionMenuList({
text={<T id={'view_details'} />} text={<T id={'view_details'} />}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={ItemAction.Edit} a={AbilitySubject.Item}>
<MenuItem <MenuDivider />
icon={<Icon icon="pen-18" />}
text={intl.get('edit_item')}
onClick={safeCallback(onEditItem, original)}
/>
<MenuItem
icon={<Icon icon="duplicate-16" />}
text={intl.get('duplicate')}
onClick={safeCallback(onDuplicate, original)}
/>
<If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_item')} icon={<Icon icon="pen-18" />}
icon={<Icon icon="pause-16" iconSize={16} />} text={intl.get('edit_item')}
onClick={safeCallback(onInactivateItem, original)} onClick={safeCallback(onEditItem, original)}
/> />
</If> </Can>
<If condition={!original.active}> <Can I={ItemAction.Create} a={AbilitySubject.Item}>
<MenuItem <MenuItem
text={intl.get('activate_item')} icon={<Icon icon="duplicate-16" />}
icon={<Icon icon="play-16" iconSize={16} />} text={intl.get('duplicate')}
onClick={safeCallback(onActivateItem, original)} onClick={safeCallback(onDuplicate, original)}
/> />
</If> </Can>
<If condition={original.type === 'inventory'}> <Can I={ItemAction.Edit} a={AbilitySubject.Item}>
<If condition={original.active}>
<MenuItem
text={intl.get('inactivate_item')}
icon={<Icon icon="pause-16" iconSize={16} />}
onClick={safeCallback(onInactivateItem, original)}
/>
</If>
<If condition={!original.active}>
<MenuItem
text={intl.get('activate_item')}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={safeCallback(onActivateItem, original)}
/>
</If>
</Can>
<Can
I={InventoryAdjustmentAction.Edit}
a={AbilitySubject.InventoryAdjustment}
>
<If condition={original.type === 'inventory'}>
<MenuItem
text={intl.get('make_adjustment')}
icon={<Icon icon={'swap-vert'} iconSize={16} />}
onClick={safeCallback(onMakeAdjustment, original)}
/>
</If>
</Can>
<Can I={ItemAction.Delete} a={AbilitySubject.Item}>
<MenuItem <MenuItem
text={intl.get('make_adjustment')} text={intl.get('delete_item')}
icon={<Icon icon={'swap-vert'} iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}
onClick={safeCallback(onMakeAdjustment, original)} onClick={safeCallback(onDeleteItem, original)}
intent={Intent.DANGER}
/> />
</If> </Can>
<MenuItem
text={intl.get('delete_item')}
icon={<Icon icon="trash-16" iconSize={16} />}
onClick={safeCallback(onDeleteItem, original)}
intent={Intent.DANGER}
/>
</Menu> </Menu>
); );
} }

View File

@@ -1,14 +1,13 @@
import React, { useMemo } from 'react'; import React, { useMemo } from 'react';
import { DataTable } from 'components'; import { DataTable } from 'components';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import keyboardShortcuts from 'common/keyboardShortcutsOptions'; import { useKeywordShortcuts } from '../../hooks/dashboard';
/** /**
* keyboard shortcuts table. * keyboard shortcuts table.
*/ */
function ShortcutsTable() { export default function ShortcutsTable() {
const keywordShortcuts = useKeywordShortcuts();
const columns = useMemo( const columns = useMemo(
() => [ () => [
@@ -30,8 +29,5 @@ function ShortcutsTable() {
], ],
[], [],
); );
return <DataTable columns={columns} data={keywordShortcuts} />;
return <DataTable columns={columns} data={keyboardShortcuts} />;
} }
export default ShortcutsTable;

View File

@@ -67,7 +67,7 @@ export function useCurrenciesTableColumns() {
width: 120, width: 120,
}, },
{ {
Header: 'Currency sign', Header: intl.get('currency_sign'),
width: 120, width: 120,
accessor: 'currency_sign' accessor: 'currency_sign'
}, },

View File

@@ -0,0 +1,12 @@
import React from 'react';
const EasySMSDisconnectAlert = React.lazy(() =>
import('../../Alerts/EasySMSIntegration/EasySMSDisconnectAlert'),
);
export default [
{
name: 'easysms-disconnect',
component: EasySMSDisconnectAlert,
},
];

View File

@@ -0,0 +1,29 @@
import React from 'react';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import {
useSettingEasySMS,
useSettingEasySMSDisconnect,
useSettingEasySMSIntegrate,
} from 'hooks/query';
const EasySMSIntegrationContext = React.createContext();
/**
* Easysms integration data provider.
*/
function EasySMSIntegrationProvider({ ...props }) {
// Provider
const provider = {};
return (
<div className={classNames(CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT)}>
<EasySMSIntegrationContext.Provider value={provider} {...props} />
</div>
);
}
const useEasySMSIntegrationContext = () =>
React.useContext(EasySMSIntegrationContext);
export { EasySMSIntegrationProvider, useEasySMSIntegrationContext };

View File

@@ -0,0 +1,99 @@
import React from 'react';
import styled from 'styled-components';
import { Button, Intent } from '@blueprintjs/core';
import clsx from 'classnames';
import { FormattedMessage as T } from 'components';
import { EasySMSIntegrationProvider } from './EasySMSIntegrationProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* EasySMS integration.
*/
function EasySMSIntegrationList({
// #withDialogActions
openDialog,
// #withAlertsActions
openAlert,
}) {
// Handle EasySMS integrate.
const handleEasySMSIntegrate = () => {
openDialog('easysms-integrate', {});
};
// Handle EsaySMS disconnect
const handleEasySMSDiconnect = ({}) => {
openAlert('easysms-disconnect', {});
};
return (
<EasySMSIntegrationProvider>
<EasySMSIntegration>
<EasySMSIntegrationInner>
<EasySMSIntegrationTitle>Easysms Integration</EasySMSIntegrationTitle>
<EasySMSIntegrationParagraph>
<b>Lorem ipsum</b> dolor sit amet, consectetur adipisicing elit, sed
do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem
ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
</EasySMSIntegrationParagraph>
<Button
text={<T id={'esaysms.label.connect'} />}
onClick={handleEasySMSIntegrate}
/>
</EasySMSIntegrationInner>
<EasySMSIntegrationFooter>
<Button
onClick={handleEasySMSIntegrate}
text={<T id={'easysms.label.edit_integration_settings'} />}
/>
<Button
text={<T id={'easysms.label.disconnect'} />}
onClick={handleEasySMSDiconnect}
/>
</EasySMSIntegrationFooter>
</EasySMSIntegration>
</EasySMSIntegrationProvider>
);
}
export default compose(
withAlertsActions,
withDialogActions,
)(EasySMSIntegrationList);
const EasySMSIntegration = styled.div`
display: flex;
flex-direction: column;
padding: 14px;
`;
const EasySMSIntegrationInner = styled.div`
max-width: 45rem; // 100%
margin-bottom: 48px; // 48
`;
const EasySMSIntegrationTitle = styled.h2`
font-weight: 50px;
margin-bottom: 12px;
`;
const EasySMSIntegrationParagraph = styled.p`
font-size: 14px;
line-height: 1.75rem;
margin-bottom: 15px;
`;
const EasySMSIntegrationFooter = styled.div`
width: 100%;
/* max-width: 30rem; */
display: flex;
.bp3-button {
margin-right: 10px;
}
`;

View File

@@ -5,6 +5,7 @@ import { Tabs, Tab } from '@blueprintjs/core';
import classNames from 'classnames'; import classNames from 'classnames';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import SMSMessagesDataTable from './SMSMessagesDataTable'; import SMSMessagesDataTable from './SMSMessagesDataTable';
import EasySMSIntegration from '../EasySMSIntegration';
import '../../../style/pages/Preferences/SMSIntegration.scss'; import '../../../style/pages/Preferences/SMSIntegration.scss';
@@ -27,6 +28,7 @@ function SMSIntegrationTabs({
<Tab <Tab
id="overview" id="overview"
title={intl.get('sms_integration.label.overview')} title={intl.get('sms_integration.label.overview')}
panel={<EasySMSIntegration />}
/> />
<Tab <Tab
id="sms_messages" id="sms_messages"

View File

@@ -0,0 +1,10 @@
import React from 'react';
const RoleDeleteAlert = React.lazy(() =>
import('../../../Alerts/Roles/RoleDeleteAlert'),
);
/**
* Roles alerts
*/
export default [{ name: 'role-delete', component: RoleDeleteAlert }];

View File

@@ -0,0 +1,113 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import { isEmpty } from 'lodash';
import 'style/pages/Preferences/Roles/Form.scss';
import { Intent } from '@blueprintjs/core';
import { AppToaster, FormattedMessage as T } from 'components';
import { CreateRolesFormSchema, EditRolesFormSchema } from './RolesForm.schema';
import { useRolesFormContext } from './RolesFormProvider';
import {
getNewRoleInitialValues,
transformToArray,
transformToObject,
} from './utils';
import RolesFormContent from './RolesFormContent';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import { handleDeleteErrors } from '../utils';
import { compose, transformToForm } from 'utils';
const defaultValues = {
role_name: '',
role_description: '',
permissions: {},
};
/**
* Preferences - Roles Form.
*/
function RolesForm({
// #withDashboardActions
changePreferencesPageTitle,
}) {
// History context.
const history = useHistory();
// Role form context.
const {
isNewMode,
createRolePermissionMutate,
editRolePermissionMutate,
permissionsSchema,
role,
roleId,
} = useRolesFormContext();
// Initial values.
const initialValues = {
...defaultValues,
...(!isEmpty(role)
? transformToForm(transformToObject(role), defaultValues)
: getNewRoleInitialValues(permissionsSchema)),
};
React.useEffect(() => {
changePreferencesPageTitle(<T id={'roles.label'} />);
}, [changePreferencesPageTitle]);
// Handle the form submit.
const handleFormSubmit = (values, { setSubmitting }) => {
const permission = transformToArray(values);
const form = {
...values,
permissions: permission,
};
setSubmitting(true);
const onSuccess = () => {
AppToaster.show({
message: intl.get(
isNewMode
? 'roles.permission_schema.success_message'
: 'roles.permission_schema.upload_message',
),
intent: Intent.SUCCESS,
});
setSubmitting(false);
history.push('/preferences/users');
};
const onError = ({
response: {
data: { errors },
},
}) => {
setSubmitting(false);
handleDeleteErrors(errors);
};
if (isNewMode) {
createRolePermissionMutate(form).then(onSuccess).catch(onError);
} else {
editRolePermissionMutate([roleId, form]).then(onSuccess).catch(onError);
}
};
return (
<Formik
initialValues={initialValues}
validationSchema={isNewMode ? CreateRolesFormSchema : EditRolesFormSchema}
onSubmit={handleFormSubmit}
>
<RolesFormContent />
</Formik>
);
}
export default compose(withDashboardActions)(RolesForm);

View File

@@ -0,0 +1,17 @@
import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
role_name: Yup.string().required().label(intl.get('roles.label.role_name_')),
role_description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
permissions: Yup.object().shape({
subject: Yup.string(),
ability: Yup.string(),
value: Yup.boolean(),
}),
});
export const CreateRolesFormSchema = Schema;
export const EditRolesFormSchema = Schema;

View File

@@ -0,0 +1,76 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
import { ErrorMessage, FastField, Form, useFormikContext } from 'formik';
import {
Button,
FormGroup,
InputGroup,
Intent,
TextArea,
} from '@blueprintjs/core';
import { inputIntent } from 'utils';
import { FormattedMessage as T, FieldRequiredHint } from 'components';
import { useAutofocus } from 'hooks';
import { RolesPermissionList } from './components';
/**
* Preferences - Roles Form content.
*/
export default function RolesFormContent() {
const history = useHistory();
const { isSubmitting, values } = useFormikContext();
const roleNameFieldRef = useAutofocus();
const handleCloseClick = () => {
history.go(-1);
};
return (
<Form>
{/* ---------- name ---------- */}
<FastField name={'role_name'}>
{({ field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'name'} />}
labelInfo={<FieldRequiredHint />}
className={'form-group--name'}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="role_name" />}
inline={true}
>
<InputGroup
medium={true}
inputRef={(ref) => (roleNameFieldRef.current = ref)}
{...field}
/>
</FormGroup>
)}
</FastField>
{/* ---------- description ---------- */}
<FastField name={'role_description'}>
{({ field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'description'} />}
className={'form-group--description'}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name={'role_description'} />}
inline={true}
>
<TextArea growVertically={true} height={280} {...field} />
</FormGroup>
)}
</FastField>
<RolesPermissionList />
<div className={'card__footer'}>
<Button intent={Intent.PRIMARY} loading={isSubmitting} type="submit">
<T id={'save'} />
</Button>
<Button onClick={handleCloseClick} disabled={isSubmitting}>
<T id={'cancel'} />
</Button>
</div>
</Form>
);
}

Some files were not shown because too many files have changed in this diff Show More