Skip to content

Commit 59755f3

Browse files
authored
Add generic Static and Remote table data source implementation
Add generic Static and Remote table data source implementation Improved table generation script
2 parents 8115d2c + 38b8c80 commit 59755f3

File tree

15 files changed

+235
-448
lines changed

15 files changed

+235
-448
lines changed

libs/schematic/generators/ng-generate/components/shared/generators/directives/horizontal-overflow/files/__name@dasherize__.directive.ts.template

Lines changed: 0 additions & 84 deletions
This file was deleted.

libs/schematic/generators/ng-generate/components/shared/generators/directives/horizontal-overflow/index.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

libs/schematic/generators/ng-generate/components/shared/generators/directives/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
* SPDX-License-Identifier: MPL-2.0
1212
*/
1313

14-
export * from './horizontal-overflow/index';
1514
export * from './validate-input/index';

libs/schematic/generators/ng-generate/components/shared/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
generateCustomService,
3232
generateFilterService,
3333
generateGeneralStyle,
34-
generateHorizontalOverflowDirective,
3534
generateShowDescriptionPipe,
3635
generateValidateInputDirective,
3736
} from './generators/index';
@@ -241,7 +240,6 @@ export function generateGeneralFilesRules(): Array<Rule> {
241240
wrapBuildComponentExecution(options),
242241
generateCustomService(options),
243242
generateValidateInputDirective(options),
244-
generateHorizontalOverflowDirective(options),
245243
generateShowDescriptionPipe(options),
246244
generateSemanticExplanation(options as Values),
247245
];
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<% if (options.customRemoteService) { %>
22
import {Custom<%= classify(name) %>Service} from './custom-<%= dasherize(name) %>.service';
3+
import {Response} from '@esmf/semantic-ui-schematic';
34
<% } else { %>
4-
import {EsmfRemoteTableService} from '@esmf/semantic-ui-schematic';
5+
import {Response, EsmfRemoteTableService} from '@esmf/semantic-ui-schematic';
56
<% } %>
67

7-
import {<%= options.aspectModel.name %>Response} from './<%= dasherize(options.name) %>.service';
88
import {AbstractArrayNode, AbstractNode, And, Eq, Limit, Query, QueryStringifier, Sort} from 'rollun-ts-rql';
9-
import {SortOptions} from "rollun-ts-rql/dist/nodes/Sort";
9+
// TODO check on working example
10+
// import {SortOptions} from "rollun-ts-rql/dist/nodes/Sort";

libs/schematic/generators/ng-generate/components/shared/methods/remote-handling/requestData.ts.template

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ private requestData() {
8686

8787
this.requestSubscription = this.tableService.requestData(this.remoteAPI, {query: rqlStringTemp})
8888
.pipe(
89-
tap((movementResponse: <%= classify(options.aspectModel.name) %>Response) => {
89+
tap((response: Response<Entity>) => {
9090
this.dataLoadError = false;
9191
this.totalItems =
92-
movementResponse.totalItems !== null && movementResponse.totalItems !== undefined
93-
? movementResponse.totalItems
94-
: movementResponse.items.length;
92+
response.totalItems !== null && response.totalItems !== undefined
93+
? response.totalItems
94+
: response.items.length;
9595
this.maxExportRows = this.totalItems;
9696

9797
<% if (options.componentType === 'card') { %>
98-
this.dataToShow = movementResponse.items;
98+
this.dataToShow = response.items;
9999
this.dataSource.data = this.dataToShow;
100100
this.paginator.length = this.dataToShow.length;
101101
<% } else { %>
102-
const dataToShow = movementResponse.items;
102+
const dataToShow = response.items;
103103
this.dataSource.setData(dataToShow);
104104
<% } %>
105105

0 commit comments

Comments
 (0)