From 74be9c8fa66caadc8e59e0e150da653f4522f335 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 9 Feb 2020 12:55:19 +0200 Subject: [PATCH] Remove loadActivities --- lib/data/repositories/client_repository.dart | 8 ++------ lib/redux/client/client_actions.dart | 3 +-- lib/redux/client/client_middleware.dart | 2 +- .../company_gateway/company_gateway_actions.dart | 3 +-- lib/redux/document/document_actions.dart | 3 +-- lib/redux/expense/expense_actions.dart | 3 +-- lib/redux/group/group_actions.dart | 3 +-- lib/redux/payment/payment_actions.dart | 3 +-- lib/redux/project/project_actions.dart | 3 +-- lib/redux/task/task_actions.dart | 3 +-- lib/redux/tax_rate/tax_rate_actions.dart | 3 +-- lib/redux/user/user_actions.dart | 3 +-- lib/redux/vendor/vendor_actions.dart | 3 +-- lib/ui/client/view/client_view.dart | 6 +++--- lib/ui/client/view/client_view_activity.dart | 2 +- lib/ui/client/view/client_view_vm.dart | 11 +++++------ lib/ui/invoice/invoice_email_vm.dart | 2 +- lib/ui/product/view/product_view_vm.dart | 9 ++++----- lib/ui/quote/quote_email_vm.dart | 2 +- stubs/redux/stub/stub_actions | 3 +-- 20 files changed, 30 insertions(+), 48 deletions(-) diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index 2601f7d5d..7e233f4e7 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -18,12 +18,8 @@ class ClientRepository { final WebClient webClient; Future loadItem( - Credentials credentials, String entityId, bool loadActivities) async { - String url = '${credentials.url}/clients/$entityId?include=gateway_tokens'; - - if (loadActivities) { - url += ',activities'; - } + Credentials credentials, String entityId) async { + final String url = '${credentials.url}/clients/$entityId?include=gateway_tokens,activities'; final dynamic response = await webClient.get(url, credentials.token); diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index d2e26f469..911cc7843 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -63,11 +63,10 @@ class UpdateClient implements PersistUI { } class LoadClient { - LoadClient({this.completer, this.clientId, this.loadActivities = false}); + LoadClient({this.completer, this.clientId}); final Completer completer; final String clientId; - final bool loadActivities; } class LoadClientActivity { diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart index 1a6005903..a8f1a0aba 100644 --- a/lib/redux/client/client_middleware.dart +++ b/lib/redux/client/client_middleware.dart @@ -218,7 +218,7 @@ Middleware _loadClient(ClientRepository repository) { store.dispatch(LoadClientRequest()); repository .loadItem( - store.state.credentials, action.clientId, action.loadActivities) + store.state.credentials, action.clientId) .then((client) { store.dispatch(LoadClientSuccess(client)); diff --git a/lib/redux/company_gateway/company_gateway_actions.dart b/lib/redux/company_gateway/company_gateway_actions.dart index 641559a6a..35b36a78a 100644 --- a/lib/redux/company_gateway/company_gateway_actions.dart +++ b/lib/redux/company_gateway/company_gateway_actions.dart @@ -53,11 +53,10 @@ class UpdateCompanyGateway implements PersistUI { class LoadCompanyGateway { LoadCompanyGateway( - {this.completer, this.companyGatewayId, this.loadActivities = false}); + {this.completer, this.companyGatewayId}); final Completer completer; final String companyGatewayId; - final bool loadActivities; } class LoadCompanyGatewayActivity { diff --git a/lib/redux/document/document_actions.dart b/lib/redux/document/document_actions.dart index 05afc1ca4..12b1b27ce 100644 --- a/lib/redux/document/document_actions.dart +++ b/lib/redux/document/document_actions.dart @@ -43,11 +43,10 @@ class UpdateDocument implements PersistUI { } class LoadDocument { - LoadDocument({this.completer, this.documentId, this.loadActivities = false}); + LoadDocument({this.completer, this.documentId}); final Completer completer; final String documentId; - final bool loadActivities; } class LoadDocumentActivity { diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 36fb20943..1f3583aa5 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -51,11 +51,10 @@ class UpdateExpense implements PersistUI { } class LoadExpense { - LoadExpense({this.completer, this.expenseId, this.loadActivities = false}); + LoadExpense({this.completer, this.expenseId}); final Completer completer; final String expenseId; - final bool loadActivities; } class LoadExpenseActivity { diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart index 2d4b26127..8e3024c4b 100644 --- a/lib/redux/group/group_actions.dart +++ b/lib/redux/group/group_actions.dart @@ -52,11 +52,10 @@ class UpdateGroup implements PersistUI { } class LoadGroup { - LoadGroup({this.completer, this.groupId, this.loadActivities = false}); + LoadGroup({this.completer, this.groupId}); final Completer completer; final String groupId; - final bool loadActivities; } class LoadGroupActivity { diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart index 8e4ce11f6..bb3218ea2 100644 --- a/lib/redux/payment/payment_actions.dart +++ b/lib/redux/payment/payment_actions.dart @@ -64,11 +64,10 @@ class UpdatePayment implements PersistUI { } class LoadPayment { - LoadPayment({this.completer, this.paymentId, this.loadActivities = false}); + LoadPayment({this.completer, this.paymentId}); final Completer completer; final String paymentId; - final bool loadActivities; } class LoadPaymentActivity { diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart index d27b9f2ea..e8a3da226 100644 --- a/lib/redux/project/project_actions.dart +++ b/lib/redux/project/project_actions.dart @@ -53,11 +53,10 @@ class UpdateProject implements PersistUI { } class LoadProject { - LoadProject({this.completer, this.projectId, this.loadActivities = false}); + LoadProject({this.completer, this.projectId}); final Completer completer; final String projectId; - final bool loadActivities; } class LoadProjectActivity { diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index a4a12940d..bf65531b0 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -57,11 +57,10 @@ class UpdateTask implements PersistUI { } class LoadTask { - LoadTask({this.completer, this.taskId, this.loadActivities = false}); + LoadTask({this.completer, this.taskId}); final Completer completer; final String taskId; - final bool loadActivities; } class LoadTaskActivity { diff --git a/lib/redux/tax_rate/tax_rate_actions.dart b/lib/redux/tax_rate/tax_rate_actions.dart index 2e14c672d..7406eee41 100644 --- a/lib/redux/tax_rate/tax_rate_actions.dart +++ b/lib/redux/tax_rate/tax_rate_actions.dart @@ -47,11 +47,10 @@ class UpdateTaxRate implements PersistUI { } class LoadTaxRate { - LoadTaxRate({this.completer, this.taxRateId, this.loadActivities = false}); + LoadTaxRate({this.completer, this.taxRateId}); final Completer completer; final String taxRateId; - final bool loadActivities; } class LoadTaxRateActivity { diff --git a/lib/redux/user/user_actions.dart b/lib/redux/user/user_actions.dart index 95e9158d6..9fcb3d1ae 100644 --- a/lib/redux/user/user_actions.dart +++ b/lib/redux/user/user_actions.dart @@ -56,11 +56,10 @@ class UpdateUserCompany implements PersistUI { } class LoadUser { - LoadUser({this.completer, this.userId, this.loadActivities = false}); + LoadUser({this.completer, this.userId}); final Completer completer; final String userId; - final bool loadActivities; } class LoadUserActivity { diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart index 2043a63a9..73378e9cb 100644 --- a/lib/redux/vendor/vendor_actions.dart +++ b/lib/redux/vendor/vendor_actions.dart @@ -54,11 +54,10 @@ class UpdateVendor implements PersistUI { } class LoadVendor { - LoadVendor({this.completer, this.vendorId, this.loadActivities = false}); + LoadVendor({this.completer, this.vendorId}); final Completer completer; final String vendorId; - final bool loadActivities; } class LoadVendorActivity { diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart index 93df2977a..ec1c0ac47 100644 --- a/lib/ui/client/view/client_view.dart +++ b/lib/ui/client/view/client_view.dart @@ -69,15 +69,15 @@ class _ClientViewState extends State controller: _controller, children: [ RefreshIndicator( - onRefresh: () => viewModel.onRefreshed(context, false), + onRefresh: () => viewModel.onRefreshed(context), child: ClientOverview(viewModel: viewModel), ), RefreshIndicator( - onRefresh: () => viewModel.onRefreshed(context, false), + onRefresh: () => viewModel.onRefreshed(context), child: ClientViewDetails(client: viewModel.client), ), RefreshIndicator( - onRefresh: () => viewModel.onRefreshed(context, true), + onRefresh: () => viewModel.onRefreshed(context), child: ClientViewActivity( viewModel: viewModel, key: ValueKey(viewModel.client.id), diff --git a/lib/ui/client/view/client_view_activity.dart b/lib/ui/client/view/client_view_activity.dart index 84be8c6fa..fac4e38c0 100644 --- a/lib/ui/client/view/client_view_activity.dart +++ b/lib/ui/client/view/client_view_activity.dart @@ -15,7 +15,7 @@ class ClientViewActivity extends StatefulWidget { class _ClientViewActivityState extends State { @override void didChangeDependencies() { - widget.viewModel.onRefreshed(context, true); + widget.viewModel.onRefreshed(context); super.didChangeDependencies(); } diff --git a/lib/ui/client/view/client_view_vm.dart b/lib/ui/client/view/client_view_vm.dart index 60d460c97..3abebe99e 100644 --- a/lib/ui/client/view/client_view_vm.dart +++ b/lib/ui/client/view/client_view_vm.dart @@ -52,13 +52,12 @@ class ClientViewVM { final client = state.clientState.map[state.clientUIState.selectedId] ?? ClientEntity(id: state.clientUIState.selectedId); - Future _handleRefresh(BuildContext context, bool loadActivities) { + Future _handleRefresh(BuildContext context) { final completer = snackBarCompleter( context, AppLocalization.of(context).refreshComplete); store.dispatch(LoadClient( completer: completer, - clientId: client.id, - loadActivities: loadActivities)); + clientId: client.id,)); return completer.future; } @@ -134,8 +133,8 @@ class ClientViewVM { break; } }, - onRefreshed: (context, loadActivities) => - _handleRefresh(context, loadActivities), + onRefreshed: (context) => + _handleRefresh(context), onGroupPressed: (context) { viewEntityById( context: context, @@ -153,7 +152,7 @@ class ClientViewVM { final Function(BuildContext, EntityAction) onEntityAction; final Function(BuildContext) onGroupPressed; final Function(BuildContext, EntityType, [bool]) onEntityPressed; - final Function(BuildContext, bool) onRefreshed; + final Function(BuildContext) onRefreshed; final bool isSaving; final bool isLoading; final bool isDirty; diff --git a/lib/ui/invoice/invoice_email_vm.dart b/lib/ui/invoice/invoice_email_vm.dart index 3ddd9ec11..076da727a 100644 --- a/lib/ui/invoice/invoice_email_vm.dart +++ b/lib/ui/invoice/invoice_email_vm.dart @@ -23,7 +23,7 @@ class InvoiceEmailScreen extends StatelessWidget { final invoice = state.invoiceState.map[invoiceId]; final client = state.clientState.get(invoice.clientId); if (client.areActivitiesStale) { - store.dispatch(LoadClient(clientId: client.id, loadActivities: true)); + store.dispatch(LoadClient(clientId: client.id)); } }, converter: (Store store) { diff --git a/lib/ui/product/view/product_view_vm.dart b/lib/ui/product/view/product_view_vm.dart index 4c9445dcf..7950ec398 100644 --- a/lib/ui/product/view/product_view_vm.dart +++ b/lib/ui/product/view/product_view_vm.dart @@ -46,13 +46,12 @@ class ProductViewVM { ProductEntity(id: state.productUIState.selectedId); /* - Future _handleRefresh(BuildContext context, bool loadActivities) { + Future _handleRefresh(BuildContext context) { final completer = snackBarCompleter( context, AppLocalization.of(context).refreshComplete); store.dispatch(LoadProduct( completer: completer, - productId: product.id, - loadActivities: loadActivities)); + productId: product.id,)); return completer.future; } */ @@ -66,8 +65,8 @@ class ProductViewVM { company: state.company, onRefreshed: null, /* - onRefreshed: (context, loadActivities) => - _handleRefresh(context, loadActivities), + onRefreshed: (context) => + _handleRefresh(context), */ onEntityAction: (BuildContext context, EntityAction action) => handleProductAction(context, [product], action), diff --git a/lib/ui/quote/quote_email_vm.dart b/lib/ui/quote/quote_email_vm.dart index f5541408a..2536805c6 100644 --- a/lib/ui/quote/quote_email_vm.dart +++ b/lib/ui/quote/quote_email_vm.dart @@ -24,7 +24,7 @@ class QuoteEmailScreen extends StatelessWidget { final quote = state.quoteState.map[quoteId]; final client = state.clientState.map[quote.clientId]; if (client.areActivitiesStale) { - store.dispatch(LoadClient(clientId: client.id, loadActivities: true)); + store.dispatch(LoadClient(clientId: client.id)); } }, converter: (Store store) { diff --git a/stubs/redux/stub/stub_actions b/stubs/redux/stub/stub_actions index 00aa26f20..6725f7c1a 100644 --- a/stubs/redux/stub/stub_actions +++ b/stubs/redux/stub/stub_actions @@ -48,11 +48,10 @@ class UpdateStub implements PersistUI { } class LoadStub { - LoadStub({this.completer, this.stubId, this.loadActivities = false}); + LoadStub({this.completer, this.stubId}); final Completer completer; final String stubId; - final bool loadActivities; } class LoadStubActivity {