Merge branch 'develop'

invoiceninja · Jun 20, 2024 · dc39038 · dc39038
2 parents 2b2a0fd + a4a66ed
commit dc39038
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 28 deletions.
diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart
@@ -338,8 +338,8 @@ abstract class ProjectEntity extends Object
     return response;
   }
 
-  bool matchesName(String filter) =>
-      name.toLowerCase().contains(filter.toLowerCase());
+  bool matchesName(String? filter) =>
+      name.toLowerCase().contains((filter ?? '').toLowerCase());
 
   @override
   bool matchesFilter(String? filter) {

diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
@@ -810,6 +810,15 @@ abstract class TaskEntity extends Object
             .toLowerCase()
             .compareTo(userB.fullName.toLowerCase());
         break;
+      case TaskFields.isInvoiced:
+        response = taskB.isInvoiced ? 1 : -1;
+        break;
+      case TaskFields.isDeleted:
+        response = taskB.isDeleted == true ? 1 : -1;
+        break;
+      case TaskFields.isRunning:
+        response = taskB.isRunning ? 1 : -1;
+        break;
       case TaskFields.status:
         final taskAStatus = taskA.isRunning
             ? -1

diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart
@@ -562,14 +562,17 @@ void handleClientAction(BuildContext? context, List<BaseEntity> clients,
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.client,
           entityId: client.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadClient(clientId: client.id));
+      }
       break;
     default:
       print('## Error: action $action not handled in client_actions');

diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart
@@ -756,14 +756,17 @@ Future handleCreditAction(BuildContext context, List<BaseEntity> credits,
       }
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.credit,
           entityId: credit.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadCredit(creditId: credit.id));
+      }
       break;
     default:
       print('## ERROR: unhandled action $action in credit_actions');

diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart
@@ -254,8 +254,8 @@ class FilterExpensesByCustom4 implements PersistUI {
   final String value;
 }
 
-void handleExpenseAction(
-    BuildContext context, List<BaseEntity> expenses, EntityAction? action) {
+void handleExpenseAction(BuildContext context, List<BaseEntity> expenses,
+    EntityAction? action) async {
   final store = StoreProvider.of<AppState>(context);
   final state = store.state;
   final localization = AppLocalization.of(context);
@@ -398,14 +398,17 @@ void handleExpenseAction(
       }
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.expense,
           entityId: expense.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadExpense(expenseId: expense.id));
+      }
       break;
     default:
       print('## ERROR: unhandled action $action in expense_actions');

diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart
@@ -884,14 +884,17 @@ void handleInvoiceAction(BuildContext? context, List<BaseEntity> invoices,
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.invoice,
           entityId: invoice.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadInvoice(invoiceId: invoice.id));
+      }
       break;
     case EntityAction.more:
       showEntityActionsDialog(

diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart
@@ -119,12 +119,13 @@ List<String> dropdownInvoiceSelector(
   return list;
 }
 
-var memoizedFilteredInvoiceList = memo9((SelectionState selectionState,
+var memoizedFilteredInvoiceList = memo10((SelectionState selectionState,
         BuiltMap<String, InvoiceEntity> invoiceMap,
         BuiltList<String> invoiceList,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltMap<String, VendorEntity> vendorMap,
         BuiltMap<String, PaymentEntity> paymentMap,
+        BuiltMap<String, ProjectEntity> projectMap,
         ListUIState invoiceListState,
         BuiltMap<String, UserEntity> userMap,
         String? recurringPrefix) =>
@@ -135,6 +136,7 @@ var memoizedFilteredInvoiceList = memo9((SelectionState selectionState,
       clientMap,
       vendorMap,
       paymentMap,
+      projectMap,
       invoiceListState,
       userMap,
       recurringPrefix,
@@ -147,6 +149,7 @@ List<String> filteredInvoicesSelector(
   BuiltMap<String, ClientEntity> clientMap,
   BuiltMap<String, VendorEntity> vendorMap,
   BuiltMap<String, PaymentEntity> paymentMap,
+  BuiltMap<String, ProjectEntity> projectMap,
   ListUIState invoiceListState,
   BuiltMap<String, UserEntity> userMap,
   String? recurringPrefix,
@@ -170,6 +173,8 @@ List<String> filteredInvoicesSelector(
     final invoice = invoiceMap[invoiceId]!;
     final client =
         clientMap[invoice.clientId] ?? ClientEntity(id: invoice.clientId);
+    final project =
+        projectMap[invoice.projectId] ?? ProjectEntity(id: invoice.projectId);
 
     if (invoice.id == selectionState.selectedId) {
       return true;
@@ -223,7 +228,8 @@ List<String> filteredInvoicesSelector(
       return false;
     }
     if (!invoice.matchesFilter(invoiceListState.filter) &&
-        !client.matchesNameOrEmail(invoiceListState.filter)) {
+        !client.matchesNameOrEmail(invoiceListState.filter) &&
+        !project.matchesName(invoiceListState.filter)) {
       return false;
     }
     if (invoiceListState.custom1Filters.isNotEmpty &&

diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
@@ -350,8 +350,8 @@ class UpdatePaymentTab implements PersistUI {
   final int? tabIndex;
 }
 
-void handlePaymentAction(
-    BuildContext? context, List<BaseEntity> payments, EntityAction? action) {
+void handlePaymentAction(BuildContext? context, List<BaseEntity> payments,
+    EntityAction? action) async {
   if (payments.isEmpty) {
     return;
   }
@@ -471,14 +471,17 @@ void handlePaymentAction(
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.payment,
           entityId: payment.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadPayment(paymentId: payment.id));
+      }
       break;
     default:
       print('## Error: action $action not handled in client_actions');

diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart
@@ -252,8 +252,8 @@ class FilterProjectsByCustom4 implements PersistUI {
   final String value;
 }
 
-void handleProjectAction(
-    BuildContext? context, List<BaseEntity> projects, EntityAction? action) {
+void handleProjectAction(BuildContext? context, List<BaseEntity> projects,
+    EntityAction? action) async {
   if (projects.isEmpty) {
     return;
   }
@@ -401,14 +401,17 @@ void handleProjectAction(
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.project,
           entityId: project.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadProject(projectId: project.id));
+      }
       break;
     default:
       print('## Error: action $action not handled in project_actions');

diff --git a/lib/redux/purchase_order/purchase_order_actions.dart b/lib/redux/purchase_order/purchase_order_actions.dart
@@ -880,14 +880,17 @@ void handlePurchaseOrderAction(BuildContext? context,
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.purchaseOrder,
           entityId: purchaseOrder.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadPurchaseOrder(purchaseOrderId: purchaseOrder.id));
+      }
       break;
     default:
       print('## ERROR: unhandled action $action in purchase_order_actions');

diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart
@@ -810,14 +810,18 @@ Future handleQuoteAction(
       }
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.quote,
           entityId: quote.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadQuote(quoteId: quote.id));
+      }
+
       break;
     default:
       print('## ERROR: unhandled action $action in quote_actions');

diff --git a/lib/redux/recurring_expense/recurring_expense_actions.dart b/lib/redux/recurring_expense/recurring_expense_actions.dart
@@ -357,7 +357,7 @@ class SaveRecurringExpenseDocumentFailure implements StopSaving {
 }
 
 void handleRecurringExpenseAction(BuildContext? context,
-    List<BaseEntity> recurringExpenses, EntityAction? action) {
+    List<BaseEntity> recurringExpenses, EntityAction? action) async {
   if (recurringExpenses.isEmpty) {
     return;
   }
@@ -461,14 +461,19 @@ void handleRecurringExpenseAction(BuildContext? context,
       }
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.recurringExpense,
           entityId: recurringExpense.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(
+            LoadRecurringExpense(recurringExpenseId: recurringExpense.id));
+      }
+
       break;
     default:
       print('## ERROR: unhandled action $action in recurring_expense_actions');

diff --git a/lib/redux/recurring_invoice/recurring_invoice_actions.dart b/lib/redux/recurring_invoice/recurring_invoice_actions.dart
@@ -728,14 +728,18 @@ void handleRecurringInvoiceAction(BuildContext? context,
       ));
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.recurringInvoice,
           entityId: recurringInvoice.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(
+            LoadRecurringInvoice(recurringInvoiceId: recurringInvoice.id));
+      }
       break;
     default:
       print(

diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart
@@ -353,7 +353,7 @@ class FilterTasksByCustom4 implements PersistUI {
 class UpdateKanban {}
 
 void handleTaskAction(
-    BuildContext? context, List<BaseEntity> tasks, EntityAction? action) {
+    BuildContext? context, List<BaseEntity> tasks, EntityAction? action) async {
   if (tasks.isEmpty) {
     return;
   }
@@ -555,14 +555,17 @@ void handleTaskAction(
       );
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.task,
           entityId: task.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadTask(taskId: task.id));
+      }
       break;
     default:
       print('## ERROR: unhandled action $action in task_actions');

diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart
@@ -283,8 +283,8 @@ class FilterVendorsByCustom4 implements PersistUI {
   final String value;
 }
 
-void handleVendorAction(
-    BuildContext? context, List<BaseEntity> vendors, EntityAction? action) {
+void handleVendorAction(BuildContext? context, List<BaseEntity> vendors,
+    EntityAction? action) async {
   if (vendors.isEmpty) {
     return;
   }
@@ -397,14 +397,17 @@ void handleVendorAction(
       }
       break;
     case EntityAction.addComment:
-      showDialog<void>(
+      final addedComment = await showDialog<bool>(
         context: navigatorKey.currentContext!,
         barrierDismissible: false,
         builder: (context) => AddCommentDialog(
           entityType: EntityType.vendor,
           entityId: vendor.id,
         ),
       );
+      if (addedComment == true) {
+        store.dispatch(LoadVendor(vendorId: vendor.id));
+      }
       break;
     default:
       print('## ERROR: unhandled action $action in vendor_actions');

diff --git a/lib/ui/client/client_presenter.dart b/lib/ui/client/client_presenter.dart
@@ -31,6 +31,8 @@ class ClientPresenter extends EntityPresenter {
     return [
       ...getDefaultTableFields(userCompany),
       ...EntityPresenter.getBaseFields(),
+      ClientFields.city,
+      ClientFields.postalCode,
       ClientFields.address1,
       ClientFields.address2,
       ClientFields.country,
@@ -93,6 +95,10 @@ class ClientPresenter extends EntityPresenter {
         return Text(client!.number);
       case ClientFields.idNumber:
         return Text(client!.idNumber);
+      case ClientFields.city:
+        return Text(client!.city);
+      case ClientFields.postalCode:
+        return Text(client!.postalCode);
       case ClientFields.lastLoginAt:
         return Text(client!.lastLogin == 0
             ? ''

diff --git a/lib/ui/invoice/invoice_list_vm.dart b/lib/ui/invoice/invoice_list_vm.dart
@@ -137,6 +137,7 @@ class InvoiceListVM extends EntityListVM {
         state.clientState.map,
         state.vendorState.map,
         state.paymentState.map,
+        state.projectState.map,
         state.invoiceListState,
         state.userState.map,
         state.company.settings.recurringNumberPrefix,