Remove loadActivities

This commit is contained in:
Hillel Coren 2020-02-09 12:55:19 +02:00
parent e237a434bc
commit 74be9c8fa6
20 changed files with 30 additions and 48 deletions

View File

@ -18,12 +18,8 @@ class ClientRepository {
final WebClient webClient;
Future<ClientEntity> 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);

View File

@ -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 {

View File

@ -218,7 +218,7 @@ Middleware<AppState> _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));

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -69,15 +69,15 @@ class _ClientViewState extends State<ClientView>
controller: _controller,
children: <Widget>[
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),

View File

@ -15,7 +15,7 @@ class ClientViewActivity extends StatefulWidget {
class _ClientViewActivityState extends State<ClientViewActivity> {
@override
void didChangeDependencies() {
widget.viewModel.onRefreshed(context, true);
widget.viewModel.onRefreshed(context);
super.didChangeDependencies();
}

View File

@ -52,13 +52,12 @@ class ClientViewVM {
final client = state.clientState.map[state.clientUIState.selectedId] ??
ClientEntity(id: state.clientUIState.selectedId);
Future<Null> _handleRefresh(BuildContext context, bool loadActivities) {
Future<Null> _handleRefresh(BuildContext context) {
final completer = snackBarCompleter<Null>(
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;

View File

@ -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<AppState> store) {

View File

@ -46,13 +46,12 @@ class ProductViewVM {
ProductEntity(id: state.productUIState.selectedId);
/*
Future<Null> _handleRefresh(BuildContext context, bool loadActivities) {
Future<Null> _handleRefresh(BuildContext context) {
final completer = snackBarCompleter<Null>(
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),

View File

@ -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<AppState> store) {

View File

@ -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 {