Fix for app context

This commit is contained in:
Hillel Coren 2021-04-13 05:47:51 +03:00
parent 354b0bcf4f
commit d3f7b76540
23 changed files with 25 additions and 24 deletions

View File

@ -111,7 +111,7 @@ class ClientEditVM {
showToast(client.isNew showToast(client.isNew
? localization.createdClient ? localization.createdClient
: localization.updatedClient); : localization.updatedClient);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(ClientViewScreen.route)); store.dispatch(UpdateCurrentRoute(ClientViewScreen.route));
if (client.isNew && state.clientUIState.saveCompleter == null) { if (client.isNew && state.clientUIState.saveCompleter == null) {
appContext.navigator appContext.navigator

View File

@ -85,7 +85,7 @@ class CompanyGatewayEditVM {
? localization.createdCompanyGateway ? localization.createdCompanyGateway
: localization.updatedCompanyGateway); : localization.updatedCompanyGateway);
if (isMobile(context)) { if (state.prefState.isMobile) {
store store
.dispatch(UpdateCurrentRoute(CompanyGatewayViewScreen.route)); .dispatch(UpdateCurrentRoute(CompanyGatewayViewScreen.route));
if (companyGateway.isNew) { if (companyGateway.isNew) {

View File

@ -95,7 +95,7 @@ class CreditEditVM extends EntityEditVM {
? localization.createdCredit ? localization.createdCredit
: localization.updatedCredit); : localization.updatedCredit);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(CreditViewScreen.route)); store.dispatch(UpdateCurrentRoute(CreditViewScreen.route));
if (credit.isNew) { if (credit.isNew) {
appContext.navigator appContext.navigator

View File

@ -68,7 +68,7 @@ class DocumentEditVM {
showToast(client.isNew showToast(client.isNew
? localization.createdClient ? localization.createdClient
: localization.updatedClient); : localization.updatedClient);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(DocumentViewScreen.route)); store.dispatch(UpdateCurrentRoute(DocumentViewScreen.route));
if (document.isNew) { if (document.isNew) {
appContext.navigator appContext.navigator

View File

@ -113,7 +113,7 @@ class ExpenseEditVM {
? localization.createdExpense ? localization.createdExpense
: localization.updatedExpense); : localization.updatedExpense);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(ExpenseViewScreen.route)); store.dispatch(UpdateCurrentRoute(ExpenseViewScreen.route));
if (expense.isNew) { if (expense.isNew) {
appContext.navigator appContext.navigator

View File

@ -85,7 +85,7 @@ class ExpenseCategoryEditVM {
? localization.createdExpenseCategory ? localization.createdExpenseCategory
: localization.updatedExpenseCategory); : localization.updatedExpenseCategory);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch( store.dispatch(
UpdateCurrentRoute(ExpenseCategoryViewScreen.route)); UpdateCurrentRoute(ExpenseCategoryViewScreen.route));
if (expenseCategory.isNew) { if (expenseCategory.isNew) {

View File

@ -82,7 +82,7 @@ class GroupEditVM {
? localization.createdGroup ? localization.createdGroup
: localization.updatedGroup); : localization.updatedGroup);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(GroupViewScreen.route)); store.dispatch(UpdateCurrentRoute(GroupViewScreen.route));
if (group.isNew) { if (group.isNew) {
appContext.navigator appContext.navigator

View File

@ -118,7 +118,7 @@ class InvoiceEditVM extends EntityEditVM {
? localization.createdInvoice ? localization.createdInvoice
: localization.updatedInvoice); : localization.updatedInvoice);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(InvoiceViewScreen.route)); store.dispatch(UpdateCurrentRoute(InvoiceViewScreen.route));
if (invoice.isNew) { if (invoice.isNew) {
appContext.navigator appContext.navigator

View File

@ -97,7 +97,7 @@ class PaymentEditVM {
showToast(payment.isNew showToast(payment.isNew
? localization.createdPayment ? localization.createdPayment
: localization.updatedPayment); : localization.updatedPayment);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(PaymentViewScreen.route)); store.dispatch(UpdateCurrentRoute(PaymentViewScreen.route));
if (payment.isNew) { if (payment.isNew) {
appContext.navigator appContext.navigator

View File

@ -83,7 +83,7 @@ class PaymentTermEditVM {
? localization.createdPaymentTerm ? localization.createdPaymentTerm
: localization.updatedPaymentTerm); : localization.updatedPaymentTerm);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(PaymentTermScreen.route)); store.dispatch(UpdateCurrentRoute(PaymentTermScreen.route));
if (paymentTerm.isNew) { if (paymentTerm.isNew) {
Navigator.of(context) Navigator.of(context)

View File

@ -85,7 +85,7 @@ class ProductEditVM {
? localization.createdProduct ? localization.createdProduct
: localization.updatedProduct); : localization.updatedProduct);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(ProductViewScreen.route)); store.dispatch(UpdateCurrentRoute(ProductViewScreen.route));
if (product.isNew) { if (product.isNew) {
appContext.navigator appContext.navigator

View File

@ -105,7 +105,7 @@ class ProjectEditVM {
? localization.createdProject ? localization.createdProject
: localization.updatedProject); : localization.updatedProject);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(ProjectViewScreen.route)); store.dispatch(UpdateCurrentRoute(ProjectViewScreen.route));
if (project.isNew && state.projectUIState.saveCompleter == null) { if (project.isNew && state.projectUIState.saveCompleter == null) {
appContext.navigator appContext.navigator
@ -114,7 +114,8 @@ class ProjectEditVM {
appContext.navigator.pop(savedProject); appContext.navigator.pop(savedProject);
} }
} else { } else {
viewEntity(appContext: appContext, entity: savedProject, force: true); viewEntity(
appContext: appContext, entity: savedProject, force: true);
} }
}).catchError((Object error) { }).catchError((Object error) {
showDialog<ErrorDialog>( showDialog<ErrorDialog>(

View File

@ -94,7 +94,7 @@ class QuoteEditVM extends EntityEditVM {
? localization.createdQuote ? localization.createdQuote
: localization.updatedQuote); : localization.updatedQuote);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(QuoteViewScreen.route)); store.dispatch(UpdateCurrentRoute(QuoteViewScreen.route));
if (quote.isNew) { if (quote.isNew) {
appContext.navigator appContext.navigator

View File

@ -95,7 +95,7 @@ class RecurringInvoiceEditVM extends EntityEditVM {
? localization.createdRecurringInvoice ? localization.createdRecurringInvoice
: localization.updatedRecurringInvoice); : localization.updatedRecurringInvoice);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch( store.dispatch(
UpdateCurrentRoute(RecurringInvoiceViewScreen.route)); UpdateCurrentRoute(RecurringInvoiceViewScreen.route));
if (recurringInvoice.isNew) { if (recurringInvoice.isNew) {

View File

@ -97,7 +97,7 @@ class SubscriptionEditVM {
showToast(subscription.isNew showToast(subscription.isNew
? localization.createdSubscription ? localization.createdSubscription
: localization.updatedSubscription); : localization.updatedSubscription);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(SubscriptionViewScreen.route)); store.dispatch(UpdateCurrentRoute(SubscriptionViewScreen.route));
if (subscription.isNew) { if (subscription.isNew) {
appContext.navigator appContext.navigator

View File

@ -99,7 +99,7 @@ class TaskEditVM {
? localization.createTask ? localization.createTask
: localization.updatedTask); : localization.updatedTask);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(TaskViewScreen.route)); store.dispatch(UpdateCurrentRoute(TaskViewScreen.route));
if (task.isNew) { if (task.isNew) {
appContext.navigator.pushReplacementNamed(TaskViewScreen.route); appContext.navigator.pushReplacementNamed(TaskViewScreen.route);

View File

@ -84,7 +84,7 @@ class TaskStatusEditVM {
? localization.createdTaskStatus ? localization.createdTaskStatus
: localization.updatedTaskStatus); : localization.updatedTaskStatus);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(TaskStatusViewScreen.route)); store.dispatch(UpdateCurrentRoute(TaskStatusViewScreen.route));
if (taskStatus.isNew) { if (taskStatus.isNew) {
appContext.navigator appContext.navigator

View File

@ -84,7 +84,7 @@ class TaxRateEditVM {
? localization.createdTaxRate ? localization.createdTaxRate
: localization.updatedTaxRate); : localization.updatedTaxRate);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(TaxRateViewScreen.route)); store.dispatch(UpdateCurrentRoute(TaxRateViewScreen.route));
if (taxRate.isNew) { if (taxRate.isNew) {
appContext.navigator appContext.navigator

View File

@ -95,7 +95,7 @@ class TokenEditVM {
? localization.createdToken ? localization.createdToken
: localization.updatedToken); : localization.updatedToken);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(TokenViewScreen.route)); store.dispatch(UpdateCurrentRoute(TokenViewScreen.route));
if (token.isNew) { if (token.isNew) {
appContext.navigator appContext.navigator

View File

@ -94,7 +94,7 @@ class UserEditVM {
? localization.createdUser ? localization.createdUser
: localization.updatedUser); : localization.updatedUser);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(UserViewScreen.route)); store.dispatch(UpdateCurrentRoute(UserViewScreen.route));
if (user.isNew) { if (user.isNew) {
appContext.navigator.pushReplacementNamed(UserViewScreen.route); appContext.navigator.pushReplacementNamed(UserViewScreen.route);

View File

@ -96,7 +96,7 @@ class VendorEditVM {
? localization.createdVendor ? localization.createdVendor
: localization.updatedVendor); : localization.updatedVendor);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(VendorViewScreen.route)); store.dispatch(UpdateCurrentRoute(VendorViewScreen.route));
if (vendor.isNew && state.vendorUIState.saveCompleter == null) { if (vendor.isNew && state.vendorUIState.saveCompleter == null) {
appContext.navigator appContext.navigator

View File

@ -87,7 +87,7 @@ class WebhookEditVM {
? localization.createdWebhook ? localization.createdWebhook
: localization.updatedWebhook); : localization.updatedWebhook);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(WebhookViewScreen.route)); store.dispatch(UpdateCurrentRoute(WebhookViewScreen.route));
if (webhook.isNew) { if (webhook.isNew) {
appContext.navigator appContext.navigator

View File

@ -79,7 +79,7 @@ class StubEditVM {
showToast(stub.isNew showToast(stub.isNew
? localization.createdStub ? localization.createdStub
: localization.updatedStub); : localization.updatedStub);
if (isMobile(context)) { if (state.prefState.isMobile) {
store.dispatch(UpdateCurrentRoute(StubViewScreen.route)); store.dispatch(UpdateCurrentRoute(StubViewScreen.route));
if (stub.isNew) { if (stub.isNew) {
Navigator.of(context).pushReplacementNamed(StubViewScreen.route); Navigator.of(context).pushReplacementNamed(StubViewScreen.route);