Persist table sorting

This commit is contained in:
Hillel Coren 2021-06-29 20:34:02 +03:00
parent 14f55b0bbb
commit 24f6487555
24 changed files with 26 additions and 25 deletions

View File

@ -56,7 +56,7 @@ abstract class ClientUIState extends Object
implements Built<ClientUIState, ClientUIStateBuilder> {
factory ClientUIState(PrefStateSortField sortField) {
return _$ClientUIState._(
listUIState: ListUIState(sortField.field ?? ClientFields.name,
listUIState: ListUIState(sortField?.field ?? ClientFields.name,
sortAscending: sortField?.ascending),
editing: ClientEntity(),
editingContact: ContactEntity(),

View File

@ -46,7 +46,7 @@ abstract class CompanyGatewayUIState extends Object
implements Built<CompanyGatewayUIState, CompanyGatewayUIStateBuilder> {
factory CompanyGatewayUIState(PrefStateSortField sortField) {
return _$CompanyGatewayUIState._(
listUIState: ListUIState(sortField.field ?? CompanyGatewayFields.name,
listUIState: ListUIState(sortField?.field ?? CompanyGatewayFields.name,
sortAscending: sortField?.ascending),
editing: CompanyGatewayEntity(),
selectedId: '',

View File

@ -56,7 +56,7 @@ abstract class CreditUIState extends Object
implements Built<CreditUIState, CreditUIStateBuilder> {
factory CreditUIState(PrefStateSortField sortField) {
return _$CreditUIState._(
listUIState: ListUIState(sortField.field ?? CreditFields.number,
listUIState: ListUIState(sortField?.field ?? CreditFields.number,
sortAscending: sortField?.ascending ?? false),
editing: InvoiceEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class DesignUIState extends Object
implements Built<DesignUIState, DesignUIStateBuilder> {
factory DesignUIState(PrefStateSortField sortField) {
return _$DesignUIState._(
listUIState: ListUIState(sortField.field ?? DesignFields.name,
listUIState: ListUIState(sortField?.field ?? DesignFields.name,
sortAscending: sortField?.ascending),
editing: DesignEntity(),
selectedId: '',

View File

@ -38,7 +38,7 @@ abstract class DocumentUIState extends Object
implements Built<DocumentUIState, DocumentUIStateBuilder> {
factory DocumentUIState(PrefStateSortField sortField) {
return _$DocumentUIState._(
listUIState: ListUIState(sortField.field ?? DocumentFields.name,
listUIState: ListUIState(sortField?.field ?? DocumentFields.name,
sortAscending: sortField?.ascending),
editing: DocumentEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class ExpenseUIState extends Object
implements Built<ExpenseUIState, ExpenseUIStateBuilder> {
factory ExpenseUIState(PrefStateSortField sortField) {
return _$ExpenseUIState._(
listUIState: ListUIState(sortField.field ?? ExpenseFields.number,
listUIState: ListUIState(sortField?.field ?? ExpenseFields.number,
sortAscending: sortField?.ascending ?? false),
editing: ExpenseEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class ExpenseCategoryUIState extends Object
implements Built<ExpenseCategoryUIState, ExpenseCategoryUIStateBuilder> {
factory ExpenseCategoryUIState(PrefStateSortField sortField) {
return _$ExpenseCategoryUIState._(
listUIState: ListUIState(sortField.field ?? ExpenseCategoryFields.name,
listUIState: ListUIState(sortField?.field ?? ExpenseCategoryFields.name,
sortAscending: sortField?.ascending),
editing: ExpenseCategoryEntity(),
selectedId: '',

View File

@ -44,7 +44,7 @@ abstract class GroupUIState extends Object
implements Built<GroupUIState, GroupUIStateBuilder> {
factory GroupUIState(PrefStateSortField sortField) {
return _$GroupUIState._(
listUIState: ListUIState(sortField.field ?? GroupFields.name,
listUIState: ListUIState(sortField?.field ?? GroupFields.name,
sortAscending: sortField?.ascending),
editing: GroupEntity(),
selectedId: '',

View File

@ -57,7 +57,7 @@ abstract class InvoiceUIState extends Object
implements Built<InvoiceUIState, InvoiceUIStateBuilder> {
factory InvoiceUIState(PrefStateSortField sortField) {
return _$InvoiceUIState._(
listUIState: ListUIState(sortField.field ?? InvoiceFields.number,
listUIState: ListUIState(sortField?.field ?? InvoiceFields.number,
sortAscending: sortField?.ascending ?? false),
editing: InvoiceEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class PaymentUIState extends Object
implements Built<PaymentUIState, PaymentUIStateBuilder> {
factory PaymentUIState(PrefStateSortField sortField) {
return _$PaymentUIState._(
listUIState: ListUIState(sortField.field ?? PaymentFields.number,
listUIState: ListUIState(sortField?.field ?? PaymentFields.number,
sortAscending: sortField?.ascending ?? false),
editing: PaymentEntity(),
selectedId: '',

View File

@ -50,7 +50,7 @@ abstract class PaymentTermUIState extends Object
implements Built<PaymentTermUIState, PaymentTermUIStateBuilder> {
factory PaymentTermUIState(PrefStateSortField sortField) {
return _$PaymentTermUIState._(
listUIState: ListUIState(sortField.field ?? PaymentTermFields.name,
listUIState: ListUIState(sortField?.field ?? PaymentTermFields.name,
sortAscending: sortField?.ascending),
editing: PaymentTermEntity(),
selectedId: '',

View File

@ -57,7 +57,7 @@ abstract class ProductUIState extends Object
implements Built<ProductUIState, ProductUIStateBuilder> {
factory ProductUIState(PrefStateSortField sortField) {
return _$ProductUIState._(
listUIState: ListUIState(sortField.field ?? ProductFields.productKey,
listUIState: ListUIState(sortField?.field ?? ProductFields.productKey,
sortAscending: sortField?.ascending),
editing: ProductEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class ProjectUIState extends Object
implements Built<ProjectUIState, ProjectUIStateBuilder> {
factory ProjectUIState(PrefStateSortField sortField) {
return _$ProjectUIState._(
listUIState: ListUIState(sortField.field ?? ProjectFields.number,
listUIState: ListUIState(sortField?.field ?? ProjectFields.number,
sortAscending: sortField?.ascending ?? false),
editing: ProjectEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class QuoteUIState extends Object
implements Built<QuoteUIState, QuoteUIStateBuilder> {
factory QuoteUIState(PrefStateSortField sortField) {
return _$QuoteUIState._(
listUIState: ListUIState(sortField.field ?? QuoteFields.number,
listUIState: ListUIState(sortField?.field ?? QuoteFields.number,
sortAscending: sortField?.ascending ?? false),
editing: InvoiceEntity(),
selectedId: '',

View File

@ -60,7 +60,8 @@ abstract class RecurringInvoiceUIState extends Object
implements Built<RecurringInvoiceUIState, RecurringInvoiceUIStateBuilder> {
factory RecurringInvoiceUIState(PrefStateSortField sortField) {
return _$RecurringInvoiceUIState._(
listUIState: ListUIState(sortField.field ?? RecurringInvoiceFields.number,
listUIState: ListUIState(
sortField?.field ?? RecurringInvoiceFields.number,
sortAscending: sortField?.ascending ?? false),
editing: InvoiceEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class SubscriptionUIState extends Object
implements Built<SubscriptionUIState, SubscriptionUIStateBuilder> {
factory SubscriptionUIState(PrefStateSortField sortField) {
return _$SubscriptionUIState._(
listUIState: ListUIState(sortField.field ?? SubscriptionFields.createdAt,
listUIState: ListUIState(sortField?.field ?? SubscriptionFields.createdAt,
sortAscending: sortField?.ascending),
editing: SubscriptionEntity(),
selectedId: '',

View File

@ -57,7 +57,7 @@ abstract class TaskUIState extends Object
implements Built<TaskUIState, TaskUIStateBuilder> {
factory TaskUIState(PrefStateSortField sortField) {
return _$TaskUIState._(
listUIState: ListUIState(sortField.field ?? TaskFields.number,
listUIState: ListUIState(sortField?.field ?? TaskFields.number,
sortAscending: sortField?.ascending ?? false),
editing: TaskEntity(),
selectedId: '',

View File

@ -58,7 +58,7 @@ abstract class TaskStatusUIState extends Object
implements Built<TaskStatusUIState, TaskStatusUIStateBuilder> {
factory TaskStatusUIState(PrefStateSortField sortField) {
return _$TaskStatusUIState._(
listUIState: ListUIState(sortField.field ?? TaskStatusFields.order,
listUIState: ListUIState(sortField?.field ?? TaskStatusFields.order,
sortAscending: sortField?.ascending),
editing: TaskStatusEntity(),
selectedId: '',

View File

@ -37,7 +37,7 @@ abstract class TaxRateUIState extends Object
implements Built<TaxRateUIState, TaxRateUIStateBuilder> {
factory TaxRateUIState(PrefStateSortField sortField) {
return _$TaxRateUIState._(
listUIState: ListUIState(sortField.field ?? TaxRateFields.name,
listUIState: ListUIState(sortField?.field ?? TaxRateFields.name,
sortAscending: sortField?.ascending),
editing: TaxRateEntity(),
selectedId: '',

View File

@ -48,7 +48,7 @@ abstract class TokenUIState extends Object
implements Built<TokenUIState, TokenUIStateBuilder> {
factory TokenUIState(PrefStateSortField sortField) {
return _$TokenUIState._(
listUIState: ListUIState(sortField.field ?? TokenFields.name,
listUIState: ListUIState(sortField?.field ?? TokenFields.name,
sortAscending: sortField?.ascending),
editing: TokenEntity(),
selectedId: '',

View File

@ -6,11 +6,11 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
part 'list_ui_state.g.dart';
abstract class ListUIState implements Built<ListUIState, ListUIStateBuilder> {
factory ListUIState(String sortField, {bool sortAscending = true}) {
factory ListUIState(String sortField, {bool sortAscending}) {
return _$ListUIState._(
filterClearedAt: 0,
sortField: sortField,
sortAscending: sortAscending,
sortAscending: sortAscending ?? true,
stateFilters: BuiltList<EntityState>(<EntityState>[
EntityState.active,
]),

View File

@ -44,7 +44,7 @@ abstract class UserUIState extends Object
implements Built<UserUIState, UserUIStateBuilder> {
factory UserUIState(PrefStateSortField sortField) {
return _$UserUIState._(
listUIState: ListUIState(sortField.field ?? UserFields.firstName,
listUIState: ListUIState(sortField?.field ?? UserFields.firstName,
sortAscending: sortField?.ascending),
editing: UserEntity(),
selectedId: '',

View File

@ -57,7 +57,7 @@ abstract class VendorUIState extends Object
implements Built<VendorUIState, VendorUIStateBuilder> {
factory VendorUIState(PrefStateSortField sortField) {
return _$VendorUIState._(
listUIState: ListUIState(sortField.field ?? VendorFields.name,
listUIState: ListUIState(sortField?.field ?? VendorFields.name,
sortAscending: sortField?.ascending),
editing: VendorEntity(),
editingContact: VendorContactEntity(),

View File

@ -49,7 +49,7 @@ abstract class WebhookUIState extends Object
implements Built<WebhookUIState, WebhookUIStateBuilder> {
factory WebhookUIState(PrefStateSortField sortField) {
return _$WebhookUIState._(
listUIState: ListUIState(sortField.field ?? WebhookFields.targetUrl,
listUIState: ListUIState(sortField?.field ?? WebhookFields.targetUrl,
sortAscending: sortField?.ascending),
editing: WebhookEntity(),
selectedId: '',