@bcgov/nr-ngx-component-lib 0.0.66 → 0.0.67
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -41,17 +41,18 @@ export class RowListBase extends PaginationBase {
|
|
|
41
41
|
.then(res => {
|
|
42
42
|
inProgress.progress();
|
|
43
43
|
return this.completedRowListPage();
|
|
44
|
+
})
|
|
45
|
+
.then(() => {
|
|
46
|
+
// console.log('complete',this.isLoading)
|
|
47
|
+
inProgress.complete();
|
|
48
|
+
this.isLoading = false;
|
|
49
|
+
this.changeDetectorRef.detectChanges();
|
|
44
50
|
})
|
|
45
51
|
.catch((err) => {
|
|
46
52
|
// console.warn(err)
|
|
47
53
|
if (err instanceof Aborted)
|
|
48
54
|
return;
|
|
49
55
|
this.loadRowListPageFailed(err);
|
|
50
|
-
})
|
|
51
|
-
.finally(() => {
|
|
52
|
-
inProgress.complete();
|
|
53
|
-
this.isLoading = false;
|
|
54
|
-
this.changeDetectorRef.detectChanges();
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
58
|
loadRowList() {
|
|
@@ -79,6 +80,8 @@ export class RowListBase extends PaginationBase {
|
|
|
79
80
|
console.warn(error);
|
|
80
81
|
this._rows = [];
|
|
81
82
|
this._totalRowCount = 0;
|
|
83
|
+
this.isLoading = false;
|
|
84
|
+
this.changeDetectorRef.detectChanges();
|
|
82
85
|
}
|
|
83
86
|
refresh() {
|
|
84
87
|
return this.refreshRowList();
|
|
@@ -119,4 +122,4 @@ class InProgress {
|
|
|
119
122
|
return this._cancelled;
|
|
120
123
|
}
|
|
121
124
|
}
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"row-list.base.js","sourceRoot":"","sources":["../../../../projects/nr-ngx-component-lib/src/directives/row-list.base.ts"],"names":[],"mappings":"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","sourcesContent":["import { AfterViewInit, ChangeDetectorRef, Directive, EventEmitter, inject, Output } from \"@angular/core\";\nimport { Observable } from \"rxjs\";\nimport { PageStateService } from \"../services/page-state.service\";\nimport { Aborted, ObservableAborter } from \"../utils/row-list.util\";\nimport { PaginationBase } from \"./pagination.base\";\n\n@Directive()\nexport abstract class RowListBase<F,R,L=any> extends PaginationBase<F> {\n    pageStateService = inject( PageStateService )\n    changeDetectorRef = inject( ChangeDetectorRef )\n\n    @Output() isLoadingChange = new EventEmitter<boolean>()\n    \n    private _isLoading = false\n    get isLoading() { return this._isLoading }\n    set isLoading( v: boolean ) { \n        if ( v == this._isLoading ) return        \n        this._isLoading = v \n        this.isLoadingChange.emit( v )\n    }  \n\n    private _rows: R[] = []\n    get rows(): R[] { return this._rows }\n\n    private _loadRowListRequest?: ObservableAborter<L> \n    private _inProgress = new InProgress()\n\n    refreshRowList(): Promise<void> {\n        // console.warn('RowListBase.refreshRowList')\n        this.isLoading = true\n        this.changeDetectorRef.detectChanges()\n\n        if ( !this._inProgress.isCompleted ) this._inProgress.cancel()\n        let inProgress = this._inProgress = new InProgress()\n\n        return Promise.resolve()\n            .then( () => { \n                return this.loadRowList() \n            } )\n            .then( ( res ) => { \n                inProgress.progress()\n                if ( !res ) return\n\n                return this.parseRowList( res ) \n            } )\n            .then( res => {\n                inProgress.progress()\n                \n                return this.completedRowListPage()\n            } )\n            .catch( ( err ) => {\n                // console.warn(err)\n                if ( err instanceof Aborted ) return\n\n                this.loadRowListPageFailed( err )\n            } )\n            .finally( () => {\n                inProgress.complete()\n\n                this.isLoading = false\n                this.changeDetectorRef.detectChanges()\n            } )\n    }\n\n    loadRowList(): Promise<L> {\n        if ( this._loadRowListRequest )\n            this._loadRowListRequest.abort()\n\n        this._loadRowListRequest = new ObservableAborter<L>( () => {        \n            return this.fetchRowListPage()\n        } )\n\n        return this._loadRowListRequest.promise\n    }\n\n    abstract fetchRowListPage(): Observable<L> \n\n    parseRowList( result: L ): Promise<void> {\n        return Promise.resolve( result )\n            .then( res => {\n                this._totalRowCount = this.parseTotalRowCount( res )\n                this._rows = this.parseRows( res )\n            } )\n    }\n\n    abstract parseRows( res: L ): R[] \n    \n    parseTotalRowCount( res: L ): number {\n        if ( 'totalRowCount' in (res as any) ) return (res as any)[ 'totalRowCount' ]\n\n        throw 'Missing res.totalRowCount, might need to override RowListBase.parseTotalRowCount'\n    }\n\n    completedRowListPage() {}\n\n    loadRowListPageFailed( error: any ) {\n        console.warn( error )\n        this._rows = []\n        this._totalRowCount = 0\n    }\n\n    protected refresh(): Promise<void> {\n        return this.refreshRowList()\n    }\n}\n\nclass InProgress {\n    private _completed = false\n    private _cancelled = false\n\n    complete() {\n        if ( this.isCancelled ) return\n        this._completed = true\n    }\n\n    cancel() {\n        if ( this.isCompleted ) return\n        this._cancelled = true        \n    }\n\n    progress() {\n        if ( this.isCompleted ) return\n        if ( this.isCancelled ) throw new Aborted('InProgress cancelled')\n    }\n\n    get isCompleted() {        \n        return this._completed\n    }\n\n    get isCancelled() {\n        return this._cancelled\n    }\n}\n"]}
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"row-list.base.js","sourceRoot":"","sources":["../../../../projects/nr-ngx-component-lib/src/directives/row-list.base.ts"],"names":[],"mappings":"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","sourcesContent":["import { AfterViewInit, ChangeDetectorRef, Directive, EventEmitter, inject, Output } from \"@angular/core\";\nimport { Observable } from \"rxjs\";\nimport { PageStateService } from \"../services/page-state.service\";\nimport { Aborted, ObservableAborter } from \"../utils/row-list.util\";\nimport { PaginationBase } from \"./pagination.base\";\n\n@Directive()\nexport abstract class RowListBase<F,R,L=any> extends PaginationBase<F> {\n    pageStateService = inject( PageStateService )\n    changeDetectorRef = inject( ChangeDetectorRef )\n\n    @Output() isLoadingChange = new EventEmitter<boolean>()\n    \n    private _isLoading = false\n    get isLoading() { return this._isLoading }\n    set isLoading( v: boolean ) { \n        if ( v == this._isLoading ) return        \n        this._isLoading = v \n        this.isLoadingChange.emit( v )\n    }  \n\n    private _rows: R[] = []\n    get rows(): R[] { return this._rows }\n\n    private _loadRowListRequest?: ObservableAborter<L> \n    private _inProgress = new InProgress()\n\n    refreshRowList(): Promise<void> {\n        // console.warn('RowListBase.refreshRowList')\n        this.isLoading = true\n        this.changeDetectorRef.detectChanges()\n\n        if ( !this._inProgress.isCompleted ) this._inProgress.cancel()\n        let inProgress = this._inProgress = new InProgress()\n\n        return Promise.resolve()\n            .then( () => { \n                return this.loadRowList() \n            } )\n            .then( ( res ) => { \n                inProgress.progress()\n                if ( !res ) return\n\n                return this.parseRowList( res ) \n            } )\n            .then( res => {\n                inProgress.progress()\n                \n                return this.completedRowListPage()\n            } )\n            .then( () => {\n                // console.log('complete',this.isLoading)\n                inProgress.complete()\n\n                this.isLoading = false\n                this.changeDetectorRef.detectChanges()\n            } )\n            .catch( ( err ) => {\n                // console.warn(err)\n                if ( err instanceof Aborted ) return\n\n                this.loadRowListPageFailed( err )\n            } )\n    }\n\n    loadRowList(): Promise<L> {\n        if ( this._loadRowListRequest )\n            this._loadRowListRequest.abort()\n\n        this._loadRowListRequest = new ObservableAborter<L>( () => {        \n            return this.fetchRowListPage()\n        } )\n\n        return this._loadRowListRequest.promise\n    }\n\n    abstract fetchRowListPage(): Observable<L> \n\n    parseRowList( result: L ): Promise<void> {\n        return Promise.resolve( result )\n            .then( res => {\n                this._totalRowCount = this.parseTotalRowCount( res )\n                this._rows = this.parseRows( res )\n            } )\n    }\n\n    abstract parseRows( res: L ): R[] \n    \n    parseTotalRowCount( res: L ): number {\n        if ( 'totalRowCount' in (res as any) ) return (res as any)[ 'totalRowCount' ]\n\n        throw 'Missing res.totalRowCount, might need to override RowListBase.parseTotalRowCount'\n    }\n\n    completedRowListPage() {}\n\n    loadRowListPageFailed( error: any ) {\n        console.warn( error )\n        this._rows = []\n        this._totalRowCount = 0\n        this.isLoading = false\n        this.changeDetectorRef.detectChanges()\n    }\n\n    protected refresh(): Promise<void> {\n        return this.refreshRowList()\n    }\n}\n\nclass InProgress {\n    private _completed = false\n    private _cancelled = false\n\n    complete() {\n        if ( this.isCancelled ) return\n        this._completed = true\n    }\n\n    cancel() {\n        if ( this.isCompleted ) return\n        this._cancelled = true        \n    }\n\n    progress() {\n        if ( this.isCompleted ) return\n        if ( this.isCancelled ) throw new Aborted('InProgress cancelled')\n    }\n\n    get isCompleted() {        \n        return this._completed\n    }\n\n    get isCancelled() {\n        return this._cancelled\n    }\n}\n"]}
|
|
@@ -1514,17 +1514,18 @@ class RowListBase extends PaginationBase {
|
|
|
1514
1514
|
.then(res => {
|
|
1515
1515
|
inProgress.progress();
|
|
1516
1516
|
return this.completedRowListPage();
|
|
1517
|
+
})
|
|
1518
|
+
.then(() => {
|
|
1519
|
+
// console.log('complete',this.isLoading)
|
|
1520
|
+
inProgress.complete();
|
|
1521
|
+
this.isLoading = false;
|
|
1522
|
+
this.changeDetectorRef.detectChanges();
|
|
1517
1523
|
})
|
|
1518
1524
|
.catch((err) => {
|
|
1519
1525
|
// console.warn(err)
|
|
1520
1526
|
if (err instanceof Aborted)
|
|
1521
1527
|
return;
|
|
1522
1528
|
this.loadRowListPageFailed(err);
|
|
1523
|
-
})
|
|
1524
|
-
.finally(() => {
|
|
1525
|
-
inProgress.complete();
|
|
1526
|
-
this.isLoading = false;
|
|
1527
|
-
this.changeDetectorRef.detectChanges();
|
|
1528
1529
|
});
|
|
1529
1530
|
}
|
|
1530
1531
|
loadRowList() {
|
|
@@ -1552,6 +1553,8 @@ class RowListBase extends PaginationBase {
|
|
|
1552
1553
|
console.warn(error);
|
|
1553
1554
|
this._rows = [];
|
|
1554
1555
|
this._totalRowCount = 0;
|
|
1556
|
+
this.isLoading = false;
|
|
1557
|
+
this.changeDetectorRef.detectChanges();
|
|
1555
1558
|
}
|
|
1556
1559
|
refresh() {
|
|
1557
1560
|
return this.refreshRowList();
|