diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index fb44bc7b5..f4f28e52d 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -591,14 +591,14 @@ abstract class ClientEntity extends Object List getActions( {UserCompanyEntity userCompany, ClientEntity client, - bool includeView = false, + bool includePreview = false, bool includeEdit = false, bool multiselect = false}) { final actions = []; if (!isDeleted && !multiselect) { - if (includeView) { - actions.add(EntityAction.view); + if (includePreview) { + actions.add(EntityAction.preview); } if (includeEdit && userCompany.canEditEntity(this)) { diff --git a/lib/data/models/company_gateway_model.dart b/lib/data/models/company_gateway_model.dart index 2e8a0fd06..4fb1ec71e 100644 --- a/lib/data/models/company_gateway_model.dart +++ b/lib/data/models/company_gateway_model.dart @@ -254,7 +254,7 @@ abstract class CompanyGatewayEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart index 8d5cb5710..3ac5ccd38 100644 --- a/lib/data/models/design_model.dart +++ b/lib/data/models/design_model.dart @@ -141,7 +141,7 @@ abstract class DesignEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart index b565a4859..cda45d34f 100644 --- a/lib/data/models/document_model.dart +++ b/lib/data/models/document_model.dart @@ -200,7 +200,7 @@ abstract class DocumentEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index bfbf9dfea..3d8419a06 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -399,7 +399,7 @@ abstract class BaseEntity implements SelectableEntity { {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/expense_category_model.dart b/lib/data/models/expense_category_model.dart index 36aae817f..9d574a483 100644 --- a/lib/data/models/expense_category_model.dart +++ b/lib/data/models/expense_category_model.dart @@ -84,7 +84,7 @@ abstract class ExpenseCategoryEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index 4a86c5cf7..c7d4cf524 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -315,7 +315,7 @@ abstract class ExpenseEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/gateway_token_model.dart b/lib/data/models/gateway_token_model.dart index 3bd9d0cf3..4eb2dd77e 100644 --- a/lib/data/models/gateway_token_model.dart +++ b/lib/data/models/gateway_token_model.dart @@ -151,7 +151,7 @@ abstract class GatewayTokenEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/group_model.dart b/lib/data/models/group_model.dart index 0835adef1..f4aa2bb61 100644 --- a/lib/data/models/group_model.dart +++ b/lib/data/models/group_model.dart @@ -142,7 +142,7 @@ abstract class GroupEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index a5cfa3c10..c71e3f139 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -754,7 +754,7 @@ abstract class InvoiceEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index 2e3765c15..36ae93423 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -43,7 +43,7 @@ class EntityAction extends EnumClass { static Serializer get serializer => _$entityActionSerializer; - static const EntityAction view = _$view; + static const EntityAction preview = _$preview; static const EntityAction edit = _$edit; static const EntityAction archive = _$archive; static const EntityAction delete = _$delete; diff --git a/lib/data/models/models.g.dart b/lib/data/models/models.g.dart index 31490e2b3..656e3a53f 100644 --- a/lib/data/models/models.g.dart +++ b/lib/data/models/models.g.dart @@ -6,7 +6,7 @@ part of 'models.dart'; // BuiltValueGenerator // ************************************************************************** -const EntityAction _$view = const EntityAction._('view'); +const EntityAction _$preview = const EntityAction._('preview'); const EntityAction _$edit = const EntityAction._('edit'); const EntityAction _$archive = const EntityAction._('archive'); const EntityAction _$delete = const EntityAction._('delete'); @@ -70,8 +70,8 @@ const EntityAction _$resendInvite = const EntityAction._('resendInvite'); EntityAction _$valueOf(String name) { switch (name) { - case 'view': - return _$view; + case 'preview': + return _$preview; case 'edit': return _$edit; case 'archive': @@ -185,7 +185,7 @@ EntityAction _$valueOf(String name) { final BuiltSet _$values = new BuiltSet(const [ - _$view, + _$preview, _$edit, _$archive, _$delete, diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart index c45f09149..53ea68e52 100644 --- a/lib/data/models/payment_model.dart +++ b/lib/data/models/payment_model.dart @@ -380,7 +380,7 @@ abstract class PaymentEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart index 0405847aa..64682c60b 100644 --- a/lib/data/models/product_model.dart +++ b/lib/data/models/product_model.dart @@ -299,7 +299,7 @@ abstract class ProductEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart index ab17d7f8e..e56fc4ad5 100644 --- a/lib/data/models/project_model.dart +++ b/lib/data/models/project_model.dart @@ -162,7 +162,7 @@ abstract class ProjectEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/subscription_model.dart b/lib/data/models/subscription_model.dart index 00730eae9..ba99b138d 100644 --- a/lib/data/models/subscription_model.dart +++ b/lib/data/models/subscription_model.dart @@ -164,7 +164,7 @@ abstract class SubscriptionEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart index 68c551dba..04012cd8b 100644 --- a/lib/data/models/task_model.dart +++ b/lib/data/models/task_model.dart @@ -542,7 +542,7 @@ abstract class TaskEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/task_status_model.dart b/lib/data/models/task_status_model.dart index 01c7181b7..2aee060ca 100644 --- a/lib/data/models/task_status_model.dart +++ b/lib/data/models/task_status_model.dart @@ -96,7 +96,7 @@ abstract class TaskStatusEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/tax_rate_model.dart b/lib/data/models/tax_rate_model.dart index cdf596509..c0c8950ba 100644 --- a/lib/data/models/tax_rate_model.dart +++ b/lib/data/models/tax_rate_model.dart @@ -134,7 +134,7 @@ abstract class TaxRateEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/token_model.dart b/lib/data/models/token_model.dart index 76581be78..94a020a83 100644 --- a/lib/data/models/token_model.dart +++ b/lib/data/models/token_model.dart @@ -149,7 +149,7 @@ abstract class TokenEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart index 61d3697ff..b73b452d1 100644 --- a/lib/data/models/user_model.dart +++ b/lib/data/models/user_model.dart @@ -278,7 +278,7 @@ abstract class UserEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart index 416701e45..026262deb 100644 --- a/lib/data/models/vendor_model.dart +++ b/lib/data/models/vendor_model.dart @@ -190,7 +190,7 @@ abstract class VendorEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/data/models/webhook_model.dart b/lib/data/models/webhook_model.dart index 24843fa4c..91893159c 100644 --- a/lib/data/models/webhook_model.dart +++ b/lib/data/models/webhook_model.dart @@ -224,7 +224,7 @@ abstract class WebhookEntity extends Object {UserCompanyEntity userCompany, ClientEntity client, bool includeEdit = false, - bool includeView = false, + bool includePreview = false, bool multiselect = false}) { final actions = []; diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index 6cf4f8fef..636b20d1b 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -285,7 +285,7 @@ void handleClientAction( case EntityAction.edit: editEntity(context: context, entity: client); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: client); break; diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart index ac33b0bf8..b39f19953 100644 --- a/lib/redux/credit/credit_actions.dart +++ b/lib/redux/credit/credit_actions.dart @@ -431,7 +431,7 @@ Future handleCreditAction( case EntityAction.edit: editEntity(context: context, entity: credit); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: credit); break; diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 9066d2922..936df33cd 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -255,7 +255,7 @@ void handleExpenseAction( case EntityAction.edit: editEntity(context: context, entity: expense); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: expense); break; diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart index 876302008..a7b5e5e61 100644 --- a/lib/redux/invoice/invoice_actions.dart +++ b/lib/redux/invoice/invoice_actions.dart @@ -520,7 +520,7 @@ void handleInvoiceAction(BuildContext context, List invoices, case EntityAction.edit: editEntity(context: context, entity: invoice); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: invoice); break; diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart index fa08ac847..75835942d 100644 --- a/lib/redux/payment/payment_actions.dart +++ b/lib/redux/payment/payment_actions.dart @@ -320,7 +320,7 @@ void handlePaymentAction( case EntityAction.edit: editEntity(context: context, entity: payment); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: payment); break; diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart index e0d995ac3..e21548ec9 100644 --- a/lib/redux/product/product_actions.dart +++ b/lib/redux/product/product_actions.dart @@ -265,7 +265,7 @@ void handleProductAction( case EntityAction.edit: editEntity(context: context, entity: product); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: product); break; diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart index 1188714e6..74366fb11 100644 --- a/lib/redux/project/project_actions.dart +++ b/lib/redux/project/project_actions.dart @@ -267,7 +267,7 @@ void handleProjectAction( case EntityAction.edit: editEntity(context: context, entity: project); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: project); break; diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart index 5c449a965..ef807da1b 100644 --- a/lib/redux/quote/quote_actions.dart +++ b/lib/redux/quote/quote_actions.dart @@ -450,7 +450,7 @@ Future handleQuoteAction( case EntityAction.edit: editEntity(context: context, entity: quote); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: quote); break; diff --git a/lib/redux/recurring_expense/recurring_expense_actions.dart b/lib/redux/recurring_expense/recurring_expense_actions.dart index 5e397dac5..ba46777a3 100644 --- a/lib/redux/recurring_expense/recurring_expense_actions.dart +++ b/lib/redux/recurring_expense/recurring_expense_actions.dart @@ -347,7 +347,7 @@ void handleRecurringExpenseAction(BuildContext context, case EntityAction.edit: editEntity(context: context, entity: recurringExpense); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: recurringExpense); break; diff --git a/lib/redux/recurring_invoice/recurring_invoice_actions.dart b/lib/redux/recurring_invoice/recurring_invoice_actions.dart index a65192e42..6c538bbd1 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_actions.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_actions.dart @@ -438,7 +438,7 @@ void handleRecurringInvoiceAction(BuildContext context, case EntityAction.edit: editEntity(context: context, entity: recurringInvoice); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: recurringInvoice); break; diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index 76ac8b67c..24e31e34f 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -317,7 +317,7 @@ void handleTaskAction( case EntityAction.edit: editEntity(context: context, entity: task); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: task); break; diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart index ae9f23f60..6924d5f5c 100644 --- a/lib/redux/vendor/vendor_actions.dart +++ b/lib/redux/vendor/vendor_actions.dart @@ -291,7 +291,7 @@ void handleVendorAction( case EntityAction.edit: editEntity(context: context, entity: vendor); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: vendor); break; diff --git a/lib/ui/app/tables/entity_datatable.dart b/lib/ui/app/tables/entity_datatable.dart index 8a80e1346..74cb68bc4 100644 --- a/lib/ui/app/tables/entity_datatable.dart +++ b/lib/ui/app/tables/entity_datatable.dart @@ -99,7 +99,7 @@ class EntityDataTableSource extends AppDataTableSource { entityActions: entity.getActions( userCompany: state.userCompany, includeEdit: true, - includeView: !state.prefState.isPreviewEnabled, + includePreview: !state.prefState.isPreviewEnabled, client: entity is BelongsToClient ? state.clientState .map[(entity as BelongsToClient)?.clientId] diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index 732474620..dd40c5d28 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -6,7 +6,7 @@ import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; IconData getEntityActionIcon(EntityAction entityAction) { switch (entityAction) { - case EntityAction.view: + case EntityAction.preview: return Icons.chrome_reader_mode; case EntityAction.edit: return Icons.edit; diff --git a/stubs/redux/stub/stub_actions b/stubs/redux/stub/stub_actions index b9e5ab5e4..a87669e3b 100644 --- a/stubs/redux/stub/stub_actions +++ b/stubs/redux/stub/stub_actions @@ -285,7 +285,7 @@ void handleStubAction( case EntityAction.edit: editEntity(context: context, entity: stub); break; - case EntityAction.view: + case EntityAction.preview: store.dispatch(UpdateUserPreferences(isPreviewEnabled: true)); viewEntity(entity: stub); break;