Added SelectionState changes to remaining modules
This commit is contained in:
parent
c5bcb5b344
commit
200e7488b4
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:invoiceninja_flutter/data/models/group_model.dart';
|
||||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
|
|
@ -28,30 +29,36 @@ List<String> dropdownClientsSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredClientList = memo8((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredClientList = memo7((SelectionState selectionState,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltList<String> clientList,
|
||||
BuiltMap<String, GroupEntity> groupMap,
|
||||
ListUIState clientListState,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
StaticState staticState) =>
|
||||
filteredClientsSelector(filterEntityId, filterEntityType, clientMap,
|
||||
clientList, groupMap, clientListState, userMap, staticState));
|
||||
filteredClientsSelector(selectionState, clientMap, clientList, groupMap,
|
||||
clientListState, userMap, staticState));
|
||||
|
||||
List<String> filteredClientsSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltList<String> clientList,
|
||||
BuiltMap<String, GroupEntity> groupMap,
|
||||
ListUIState clientListState,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
StaticState staticState) {
|
||||
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = clientList.where((clientId) {
|
||||
final client = clientMap[clientId];
|
||||
final group = groupMap[client.groupId] ?? GroupEntity(id: client.groupId);
|
||||
|
||||
if (client.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (filterEntityType == EntityType.group && group.id != filterEntityId) {
|
||||
return false;
|
||||
} else if (filterEntityType == EntityType.user &&
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
|
|
@ -63,31 +64,36 @@ ClientEntity creditClientSelector(
|
|||
return clientMap[credit.clientId];
|
||||
}
|
||||
|
||||
var memoizedFilteredCreditList = memo8((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredCreditList = memo7((SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> creditMap,
|
||||
BuiltList<String> creditList,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
ListUIState creditListState,
|
||||
StaticState staticState,
|
||||
BuiltMap<String, UserEntity> userMap) =>
|
||||
filteredCreditsSelector(filterEntityId, filterEntityType, creditMap,
|
||||
creditList, clientMap, creditListState, staticState, userMap));
|
||||
filteredCreditsSelector(selectionState, creditMap, creditList, clientMap,
|
||||
creditListState, staticState, userMap));
|
||||
|
||||
List<String> filteredCreditsSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> creditMap,
|
||||
BuiltList<String> creditList,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
ListUIState creditListState,
|
||||
StaticState staticState,
|
||||
BuiltMap<String, UserEntity> userMap) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = creditList.where((creditId) {
|
||||
final credit = creditMap[creditId];
|
||||
final client =
|
||||
clientMap[credit.clientId] ?? ClientEntity(id: credit.clientId);
|
||||
|
||||
if (credit.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!client.isActive &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:flutter/foundation.dart';
|
||||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
|
|
@ -81,8 +82,7 @@ List<String> dropdownExpensesSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredExpenseList = memo10((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredExpenseList = memo9((SelectionState selectionState,
|
||||
BuiltMap<String, ExpenseEntity> expenseMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, VendorEntity> vendorMap,
|
||||
|
|
@ -92,8 +92,7 @@ var memoizedFilteredExpenseList = memo10((String filterEntityId,
|
|||
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
|
||||
StaticState staticState) =>
|
||||
filteredExpensesSelector(
|
||||
filterEntityId,
|
||||
filterEntityType,
|
||||
selectionState,
|
||||
expenseMap,
|
||||
clientMap,
|
||||
vendorMap,
|
||||
|
|
@ -104,8 +103,7 @@ var memoizedFilteredExpenseList = memo10((String filterEntityId,
|
|||
staticState));
|
||||
|
||||
List<String> filteredExpensesSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, ExpenseEntity> expenseMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, VendorEntity> vendorMap,
|
||||
|
|
@ -114,6 +112,9 @@ List<String> filteredExpensesSelector(
|
|||
BuiltMap<String, InvoiceEntity> invoiceMap,
|
||||
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
|
||||
StaticState staticState) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = expenseMap.keys.where((expenseId) {
|
||||
final expense = expenseMap[expenseId];
|
||||
final vendor =
|
||||
|
|
@ -121,6 +122,10 @@ List<String> filteredExpensesSelector(
|
|||
final client =
|
||||
clientMap[expense.clientId] ?? ClientEntity(id: expense.clientId);
|
||||
|
||||
if (expense.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (filterEntityType != null) {
|
||||
if (filterEntityType == EntityType.client &&
|
||||
expense.clientId != filterEntityId) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/models.dart';
|
||||
|
|
@ -65,26 +66,27 @@ List<String> dropdownPaymentsSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredPaymentList = memo8((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredPaymentList = memo7((SelectionState selectionState,
|
||||
BuiltMap<String, PaymentEntity> paymentMap,
|
||||
BuiltList<String> paymentList,
|
||||
BuiltMap<String, InvoiceEntity> invoiceMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
ListUIState paymentListState) =>
|
||||
filteredPaymentsSelector(filterEntityId, filterEntityType, paymentMap,
|
||||
paymentList, invoiceMap, clientMap, userMap, paymentListState));
|
||||
filteredPaymentsSelector(selectionState, paymentMap, paymentList,
|
||||
invoiceMap, clientMap, userMap, paymentListState));
|
||||
|
||||
List<String> filteredPaymentsSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, PaymentEntity> paymentMap,
|
||||
BuiltList<String> paymentList,
|
||||
BuiltMap<String, InvoiceEntity> invoiceMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
ListUIState paymentListState) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = paymentList.where((paymentId) {
|
||||
final payment = paymentMap[paymentId];
|
||||
if (!payment.matchesStates(paymentListState.stateFilters)) {
|
||||
|
|
@ -94,6 +96,10 @@ List<String> filteredPaymentsSelector(
|
|||
final client =
|
||||
clientMap[payment.clientId] ?? ClientEntity(id: payment.clientId);
|
||||
|
||||
if (payment.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!client.isActive &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -64,24 +64,25 @@ List<String> dropdownProjectsSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredProjectList = memo7((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredProjectList = memo6((SelectionState selectionState,
|
||||
BuiltMap<String, ProjectEntity> projectMap,
|
||||
BuiltList<String> projectList,
|
||||
ListUIState projectListState,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap) =>
|
||||
filteredProjectsSelector(filterEntityId, filterEntityType, projectMap,
|
||||
projectList, projectListState, clientMap, userMap));
|
||||
filteredProjectsSelector(selectionState, projectMap, projectList,
|
||||
projectListState, clientMap, userMap));
|
||||
|
||||
List<String> filteredProjectsSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, ProjectEntity> projectMap,
|
||||
BuiltList<String> projectList,
|
||||
ListUIState projectListState,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = projectList.where((projectId) {
|
||||
final project = projectMap[projectId];
|
||||
final client =
|
||||
|
|
@ -89,6 +90,10 @@ List<String> filteredProjectsSelector(
|
|||
final user = userMap[project.assignedUserId] ??
|
||||
UserEntity(id: project.assignedUserId);
|
||||
|
||||
if (project.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (filterEntityId != null) {
|
||||
if (filterEntityType == EntityType.client &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
|
|
@ -9,31 +10,36 @@ ClientEntity quoteClientSelector(
|
|||
return clientMap[quote.clientId];
|
||||
}
|
||||
|
||||
var memoizedFilteredQuoteList = memo8((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredQuoteList = memo7((SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> quoteMap,
|
||||
BuiltList<String> quoteList,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
ListUIState quoteListState,
|
||||
StaticState staticState,
|
||||
BuiltMap<String, UserEntity> userMap) =>
|
||||
filteredQuotesSelector(filterEntityId, filterEntityType, quoteMap,
|
||||
quoteList, clientMap, quoteListState, staticState, userMap));
|
||||
filteredQuotesSelector(selectionState, quoteMap, quoteList, clientMap,
|
||||
quoteListState, staticState, userMap));
|
||||
|
||||
List<String> filteredQuotesSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> quoteMap,
|
||||
BuiltList<String> quoteList,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
ListUIState quoteListState,
|
||||
StaticState staticState,
|
||||
BuiltMap<String, UserEntity> userMap) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = quoteList.where((quoteId) {
|
||||
final quote = quoteMap[quoteId];
|
||||
final client =
|
||||
clientMap[quote.clientId] ?? ClientEntity(id: quote.clientId);
|
||||
|
||||
if (quote.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!client.isActive &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
|
||||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/models.dart';
|
||||
import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
|
||||
|
||||
var memoizedFilteredRecurringInvoiceList = memo8((
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredRecurringInvoiceList = memo7((
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltList<String> recurringInvoiceList,
|
||||
|
|
@ -16,8 +16,7 @@ var memoizedFilteredRecurringInvoiceList = memo8((
|
|||
BuiltMap<String, UserEntity> userMap,
|
||||
) =>
|
||||
filteredRecurringInvoicesSelector(
|
||||
filterEntityId,
|
||||
filterEntityType,
|
||||
selectionState,
|
||||
recurringInvoiceMap,
|
||||
clientMap,
|
||||
recurringInvoiceList,
|
||||
|
|
@ -27,8 +26,7 @@ var memoizedFilteredRecurringInvoiceList = memo8((
|
|||
));
|
||||
|
||||
List<String> filteredRecurringInvoicesSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltList<String> recurringInvoiceList,
|
||||
|
|
@ -36,11 +34,18 @@ List<String> filteredRecurringInvoicesSelector(
|
|||
StaticState staticState,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = recurringInvoiceList.where((recurringInvoiceId) {
|
||||
final invoice = recurringInvoiceMap[recurringInvoiceId];
|
||||
final client =
|
||||
clientMap[invoice.clientId] ?? ClientEntity(id: invoice.clientId);
|
||||
|
||||
if (invoice.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!client.isActive &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -104,8 +104,7 @@ List<String> dropdownTasksSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredTaskList = memo9((String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredTaskList = memo8((SelectionState selectionState,
|
||||
BuiltMap<String, TaskEntity> taskMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
|
|
@ -113,12 +112,11 @@ var memoizedFilteredTaskList = memo9((String filterEntityId,
|
|||
BuiltMap<String, InvoiceEntity> invoiceMap,
|
||||
BuiltList<String> taskList,
|
||||
ListUIState taskListState) =>
|
||||
filteredTasksSelector(filterEntityId, filterEntityType, taskMap, clientMap,
|
||||
userMap, projectMap, invoiceMap, taskList, taskListState));
|
||||
filteredTasksSelector(selectionState, taskMap, clientMap, userMap,
|
||||
projectMap, invoiceMap, taskList, taskListState));
|
||||
|
||||
List<String> filteredTasksSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, TaskEntity> taskMap,
|
||||
BuiltMap<String, ClientEntity> clientMap,
|
||||
BuiltMap<String, UserEntity> userMap,
|
||||
|
|
@ -126,12 +124,19 @@ List<String> filteredTasksSelector(
|
|||
BuiltMap<String, InvoiceEntity> invoiceMap,
|
||||
BuiltList<String> taskList,
|
||||
ListUIState taskListState) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = taskList.where((taskId) {
|
||||
final task = taskMap[taskId];
|
||||
final client = clientMap[task.clientId] ?? ClientEntity(id: task.clientId);
|
||||
final project =
|
||||
projectMap[task.projectId] ?? ProjectEntity(id: task.projectId);
|
||||
|
||||
if (task.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!client.isActive &&
|
||||
!client.matchesEntityFilter(filterEntityType, filterEntityId)) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:invoiceninja_flutter/data/models/token_model.dart';
|
||||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/models.dart';
|
||||
|
|
@ -24,28 +25,27 @@ List<String> dropdownTokensSelector(BuiltMap<String, TokenEntity> tokenMap,
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredTokenList = memo5((
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredTokenList = memo4((
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, TokenEntity> tokenMap,
|
||||
BuiltList<String> tokenList,
|
||||
ListUIState tokenListState,
|
||||
) =>
|
||||
filteredTokensSelector(
|
||||
filterEntityId,
|
||||
filterEntityType,
|
||||
selectionState,
|
||||
tokenMap,
|
||||
tokenList,
|
||||
tokenListState,
|
||||
));
|
||||
|
||||
List<String> filteredTokensSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, TokenEntity> tokenMap,
|
||||
BuiltList<String> tokenList,
|
||||
ListUIState tokenListState,
|
||||
) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
|
||||
final list = tokenList.where((tokenId) {
|
||||
final token = tokenMap[tokenId];
|
||||
if (filterEntityId != null && token.id != filterEntityId) {
|
||||
|
|
@ -54,6 +54,10 @@ List<String> filteredTokensSelector(
|
|||
//
|
||||
}
|
||||
|
||||
if (token.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (token.isSystem) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:invoiceninja_flutter/data/models/webhook_model.dart';
|
||||
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
import 'package:built_collection/built_collection.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/models.dart';
|
||||
|
|
@ -32,34 +33,38 @@ List<String> dropdownWebhooksSelector(
|
|||
return list;
|
||||
}
|
||||
|
||||
var memoizedFilteredWebhookList = memo5((
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
var memoizedFilteredWebhookList = memo4((
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, WebhookEntity> webhookMap,
|
||||
BuiltList<String> webhookList,
|
||||
ListUIState webhookListState,
|
||||
) =>
|
||||
filteredWebhooksSelector(
|
||||
filterEntityId,
|
||||
filterEntityType,
|
||||
selectionState,
|
||||
webhookMap,
|
||||
webhookList,
|
||||
webhookListState,
|
||||
));
|
||||
|
||||
List<String> filteredWebhooksSelector(
|
||||
String filterEntityId,
|
||||
EntityType filterEntityType,
|
||||
SelectionState selectionState,
|
||||
BuiltMap<String, WebhookEntity> webhookMap,
|
||||
BuiltList<String> webhookList,
|
||||
ListUIState webhookListState,
|
||||
) {
|
||||
final filterEntityId = selectionState.filterEntityId;
|
||||
final filterEntityType = selectionState.filterEntityType;
|
||||
|
||||
final list = webhookList.where((webhookId) {
|
||||
final webhook = webhookMap[webhookId];
|
||||
if (filterEntityId != null && webhook.id != filterEntityId) {
|
||||
return false;
|
||||
} else {}
|
||||
|
||||
if (webhook.id == selectionState.selectedId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!webhook.matchesStates(webhookListState.stateFilters)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,8 +94,7 @@ class ClientListVM {
|
|||
return ClientListVM(
|
||||
state: state,
|
||||
clientList: memoizedFilteredClientList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.client),
|
||||
state.clientState.map,
|
||||
state.clientState.list,
|
||||
state.groupState.map,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class ClientScreenVM {
|
|||
return ClientScreenVM(
|
||||
clientMap: state.clientState.map,
|
||||
clientList: memoizedFilteredClientList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.client),
|
||||
state.clientState.map,
|
||||
state.clientState.list,
|
||||
state.groupState.map,
|
||||
|
|
|
|||
|
|
@ -103,8 +103,7 @@ class CreditListVM extends EntityListVM {
|
|||
return CreditListVM(
|
||||
state: state,
|
||||
invoiceList: memoizedFilteredCreditList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.credit),
|
||||
state.creditState.map,
|
||||
state.creditState.list,
|
||||
state.clientState.map,
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ class CreditScreenVM {
|
|||
return CreditScreenVM(
|
||||
creditMap: state.creditState.map,
|
||||
creditList: memoizedFilteredCreditList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.credit),
|
||||
state.creditState.map,
|
||||
state.creditState.list,
|
||||
state.clientState.map,
|
||||
|
|
|
|||
|
|
@ -81,8 +81,7 @@ class ExpenseListVM {
|
|||
user: state.user,
|
||||
listState: state.expenseListState,
|
||||
expenseList: memoizedFilteredExpenseList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.expense),
|
||||
state.expenseState.map,
|
||||
state.clientState.map,
|
||||
state.vendorState.map,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class ExpenseScreenVM {
|
|||
return ExpenseScreenVM(
|
||||
expenseMap: state.expenseState.map,
|
||||
expenseList: memoizedFilteredExpenseList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.expense),
|
||||
state.expenseState.map,
|
||||
state.clientState.map,
|
||||
state.vendorState.map,
|
||||
|
|
|
|||
|
|
@ -83,8 +83,7 @@ class PaymentListVM {
|
|||
state: state,
|
||||
user: state.user,
|
||||
paymentList: memoizedFilteredPaymentList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.payment),
|
||||
state.paymentState.map,
|
||||
state.paymentState.list,
|
||||
state.invoiceState.map,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class PaymentScreenVM {
|
|||
return PaymentScreenVM(
|
||||
paymentMap: state.paymentState.map,
|
||||
paymentList: memoizedFilteredPaymentList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.payment),
|
||||
state.paymentState.map,
|
||||
state.paymentState.list,
|
||||
state.invoiceState.map,
|
||||
|
|
|
|||
|
|
@ -86,8 +86,7 @@ class ProjectListVM {
|
|||
state: state,
|
||||
listState: state.projectListState,
|
||||
projectList: memoizedFilteredProjectList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.project),
|
||||
state.projectState.map,
|
||||
state.projectState.list,
|
||||
state.projectListState,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class ProjectScreenVM {
|
|||
return ProjectScreenVM(
|
||||
projectMap: state.projectState.map,
|
||||
projectList: memoizedFilteredProjectList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.project),
|
||||
state.projectState.map,
|
||||
state.projectState.list,
|
||||
state.projectListState,
|
||||
|
|
|
|||
|
|
@ -96,8 +96,7 @@ class QuoteListVM extends EntityListVM {
|
|||
return QuoteListVM(
|
||||
state: state,
|
||||
invoiceList: memoizedFilteredQuoteList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.quote),
|
||||
state.quoteState.map,
|
||||
state.quoteState.list,
|
||||
state.clientState.map,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class QuoteScreenVM {
|
|||
return QuoteScreenVM(
|
||||
quoteMap: state.quoteState.map,
|
||||
quoteList: memoizedFilteredQuoteList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.quote),
|
||||
state.quoteState.map,
|
||||
state.quoteState.list,
|
||||
state.clientState.map,
|
||||
|
|
|
|||
|
|
@ -84,8 +84,7 @@ class RecurringInvoiceListVM {
|
|||
userCompany: state.userCompany,
|
||||
listState: state.recurringInvoiceListState,
|
||||
recurringInvoiceList: memoizedFilteredRecurringInvoiceList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.recurringInvoice),
|
||||
state.recurringInvoiceState.map,
|
||||
state.clientState.map,
|
||||
state.recurringInvoiceState.list,
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ class RecurringInvoiceScreenVM {
|
|||
return RecurringInvoiceScreenVM(
|
||||
recurringInvoiceMap: state.recurringInvoiceState.map,
|
||||
recurringInvoiceList: memoizedFilteredRecurringInvoiceList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.recurringInvoice),
|
||||
state.recurringInvoiceState.map,
|
||||
state.clientState.map,
|
||||
state.recurringInvoiceState.list,
|
||||
|
|
|
|||
|
|
@ -83,8 +83,7 @@ class TaskListVM {
|
|||
user: state.user,
|
||||
listState: state.taskListState,
|
||||
taskList: memoizedFilteredTaskList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.task),
|
||||
state.taskState.map,
|
||||
state.clientState.map,
|
||||
state.userState.map,
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ class TaskScreenVM {
|
|||
return TaskScreenVM(
|
||||
taskMap: state.taskState.map,
|
||||
taskList: memoizedFilteredTaskList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.task),
|
||||
state.taskState.map,
|
||||
state.clientState.map,
|
||||
state.userState.map,
|
||||
|
|
|
|||
|
|
@ -88,8 +88,7 @@ class TokenListVM {
|
|||
userCompany: state.userCompany,
|
||||
listState: state.tokenListState,
|
||||
tokenList: memoizedFilteredTokenList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.token),
|
||||
state.tokenState.map,
|
||||
state.tokenState.list,
|
||||
state.tokenListState),
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ class TokenScreenVM {
|
|||
return TokenScreenVM(
|
||||
tokenMap: state.tokenState.map,
|
||||
tokenList: memoizedFilteredTokenList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.token),
|
||||
state.tokenState.map,
|
||||
state.tokenState.list,
|
||||
state.tokenListState),
|
||||
|
|
|
|||
|
|
@ -88,8 +88,7 @@ class WebhookListVM {
|
|||
userCompany: state.userCompany,
|
||||
listState: state.webhookListState,
|
||||
webhookList: memoizedFilteredWebhookList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.webhook),
|
||||
state.webhookState.map,
|
||||
state.webhookState.list,
|
||||
state.webhookListState),
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ class WebhookScreenVM {
|
|||
return WebhookScreenVM(
|
||||
webhookMap: state.webhookState.map,
|
||||
webhookList: memoizedFilteredWebhookList(
|
||||
state.uiState.filterEntityId,
|
||||
state.uiState.filterEntityType,
|
||||
state.getUISelection(EntityType.webhook),
|
||||
state.webhookState.map,
|
||||
state.webhookState.list,
|
||||
state.webhookListState),
|
||||
|
|
|
|||
Loading…
Reference in New Issue