-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: added dbxFirebaseModelLoaderModule
- added FirestoreItemPageLimit - can now configure maxPageLoadLimit on a per-instance basis, instead of only at the factory level - added DbxListViewWrapper abstract class, as AbstractDbxListWrapperDirective does not implement dbxListView, and we need a way to pass the values through
- Loading branch information
Showing
30 changed files
with
442 additions
and
134 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
apps/demo/src/app/modules/demo/modules/app/modules/guestbook/container/list.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<dbx-two-column> | ||
<dbx-two-column dbxTwoColumnContext> | ||
<dbx-two-block left> | ||
<dbx-two-column-head top></dbx-two-column-head> | ||
<demo-guestbook-list></demo-guestbook-list> | ||
<demo-guestbook-list dbxFirebaseModelLoaderList demoGuestbookLoader></demo-guestbook-list> | ||
</dbx-two-block> | ||
<ui-view right></ui-view> | ||
</dbx-two-column> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
...src/app/modules/demo/modules/shared/guestbook/component/guestbook.entry.list.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
.../demo/src/app/modules/demo/modules/shared/guestbook/component/guestbook.list.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...emo/src/app/modules/demo/modules/shared/guestbook/component/guestbook.loader.directive.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import { Directive } from "@angular/core"; | ||
import { AbstractDbxFirebaseModelLoaderDirective, ProvideDbxFirebaseModelLoader } from "@dereekb/dbx-firebase"; | ||
import { DemoFirestoreCollections, Guestbook, GuestbookDocument } from "@dereekb/demo-firebase"; | ||
|
||
@Directive({ | ||
selector: '[demoGuestbookLoader]', | ||
providers: ProvideDbxFirebaseModelLoader(DemoGuestbookLoaderDirective) | ||
}) | ||
export class DemoGuestbookLoaderDirective extends AbstractDbxFirebaseModelLoaderDirective<Guestbook, GuestbookDocument> { | ||
|
||
constructor(collections: DemoFirestoreCollections) { | ||
super(collections.guestbookFirestoreCollection); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
export * from './list'; | ||
// export * from './model.module'; | ||
export * from './loader'; | ||
export * from './model.module'; |
This file was deleted.
Oops, something went wrong.
74 changes: 0 additions & 74 deletions
74
packages/dbx-firebase/src/lib/model/list/model.list.directive.ts
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
packages/dbx-firebase/src/lib/model/list/model.list.module.ts
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export * from './model.loader.directive'; | ||
export * from './model.loader.instance'; | ||
export * from './model.loader.list.directive'; | ||
export * from './model.loader.module'; | ||
export * from './model.loader'; |
106 changes: 106 additions & 0 deletions
106
packages/dbx-firebase/src/lib/model/loader/model.loader.directive.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
import { collection } from 'firebase/firestore'; | ||
import { Observable } from 'rxjs'; | ||
import { FirestoreCollection, FirestoreDocument, FirestoreQueryConstraint } from '@dereekb/firebase'; | ||
import { Directive, Input, OnDestroy, OnInit } from "@angular/core"; | ||
import { ArrayOrValue, Maybe } from '@dereekb/util'; | ||
import { DbxFirebaseModelLoader } from './model.loader'; | ||
import { dbxFirebaseModelLoaderInstance, DbxFirebaseModelLoaderInstance } from './model.loader.instance'; | ||
import { SubscriptionObject } from '@dereekb/rxjs'; | ||
|
||
/** | ||
* Abstract directive DbxFirebaseModelLoader implementation that wraps a DbxFirebaseModelLoaderInstance. | ||
*/ | ||
@Directive() | ||
export abstract class AbstractDbxFirebaseModelLoaderInstanceDirective<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> implements DbxFirebaseModelLoader<T>, OnInit, OnDestroy { | ||
|
||
readonly constraints$ = this.instance.constraints$;; | ||
readonly firestoreIteration$ = this.instance.firestoreIteration$; | ||
readonly pageLoadingState$ = this.instance.pageLoadingState$; | ||
|
||
ngOnInit(): void { | ||
this.instance.init(); | ||
} | ||
|
||
ngOnDestroy(): void { | ||
this.instance.destroy(); | ||
} | ||
|
||
constructor(readonly instance: DbxFirebaseModelLoaderInstance<T, D>) { } | ||
|
||
// MARK: Inputs | ||
@Input() | ||
get maxPages(): Maybe<number> { | ||
return this.instance.maxPages; | ||
} | ||
|
||
set maxPages(maxPages: Maybe<number>) { | ||
this.instance.maxPages = maxPages; | ||
} | ||
|
||
@Input() | ||
get itemsPerPage(): Maybe<number> { | ||
return this.instance.itemsPerPage; | ||
} | ||
|
||
set itemsPerPage(itemsPerPage: Maybe<number>) { | ||
this.instance.itemsPerPage = itemsPerPage; | ||
} | ||
|
||
@Input() | ||
set constraints(constraints: Maybe<ArrayOrValue<FirestoreQueryConstraint>>) { | ||
this.instance.setConstraints(constraints); | ||
} | ||
|
||
// MARK: DbxFirebaseModelList | ||
next() { | ||
this.instance.next(); | ||
} | ||
|
||
reset() { | ||
this.instance.reset(); | ||
} | ||
|
||
setConstraints(constraints: Maybe<ArrayOrValue<FirestoreQueryConstraint>>) { | ||
this.instance.setConstraints(constraints); | ||
} | ||
|
||
} | ||
|
||
/** | ||
* AbstractDbxFirebaseModelLoaderInstanceDirective extension with a constructor that is more simple to use. | ||
*/ | ||
@Directive() | ||
export abstract class AbstractDbxFirebaseModelLoaderDirective<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends AbstractDbxFirebaseModelLoaderInstanceDirective<T, D>{ | ||
|
||
constructor(collection: FirestoreCollection<T, D>) { | ||
super(dbxFirebaseModelLoaderInstance(collection)); | ||
} | ||
|
||
} | ||
|
||
/** | ||
* AbstractDbxFirebaseModelLoaderInstanceDirective extension with a constructor that is more simple to use. | ||
*/ | ||
@Directive() | ||
export abstract class AbstractDbxFirebaseAsyncModelLoaderInstanceDirective<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends AbstractDbxFirebaseModelLoaderInstanceDirective<T, D>{ | ||
|
||
abstract readonly collection$: Observable<FirestoreCollection<T, D>>; | ||
private readonly _collectionSub = new SubscriptionObject(); | ||
|
||
constructor() { | ||
super(dbxFirebaseModelLoaderInstance(undefined)); | ||
} | ||
|
||
override ngOnInit(): void { | ||
super.ngOnInit(); | ||
this._collectionSub.subscription = this.collection$.subscribe((collection) => { | ||
this.instance.setCollection(collection); | ||
}); | ||
} | ||
|
||
override ngOnDestroy(): void { | ||
super.ngOnDestroy(); | ||
this._collectionSub.destroy(); | ||
} | ||
|
||
} |
Oops, something went wrong.