@rxap/schematic-angular 21.0.1-dev.0 → 21.0.1
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.
- package/CHANGELOG.md +47 -0
- package/package.json +7 -7
- package/src/lib/coerce-minimum-table-component.js +12 -7
- package/src/lib/coerce-minimum-table-component.js.map +1 -1
- package/src/lib/form/control/table-select-form-control.js +4 -4
- package/src/lib/form/control/table-select-form-control.js.map +1 -1
- package/src/lib/rules/table-cell-component-rule.js +2 -3
- package/src/lib/rules/table-cell-component-rule.js.map +1 -1
- package/src/schematics/accordion/accordion-component/files/component/__componentName__.component.html.hbs +10 -7
- package/src/schematics/accordion/accordion-item-component/files/component/__componentName__.component.html.template +3 -1
- package/src/schematics/accordion/item/accordion-item-data-grid-component/files/data-grid-collection/__componentName__.component.html.template +6 -5
- package/src/schematics/accordion/templates/switch-accordion-item.hbs +10 -10
- package/src/schematics/data-grid-component/__snapshots__/index.spec.ts.snap +2 -2
- package/src/schematics/data-grid-component/component-rule.js +14 -6
- package/src/schematics/data-grid-component/component-rule.js.map +1 -1
- package/src/schematics/data-grid-component/files/component/__componentName__.component.html.hbs +1 -1
- package/src/schematics/dialog-component/__snapshots__/index.spec.ts.snap +16 -14
- package/src/schematics/dialog-component/files/component/__componentName__.component.html.template +3 -1
- package/src/schematics/form/control/autocomplete-table-select-form-control/__snapshots__/normalize-table-select-form-control-options.spec.ts.snap +36 -4
- package/src/schematics/form/control/table-select-form-control/__snapshots__/normalize-table-select-form-control-options.spec.ts.snap +36 -4
- package/src/schematics/form/form-component/__snapshots__/index.spec.ts.snap +3 -2
- package/src/schematics/form/form-component/coerce-form-component.js +1 -1
- package/src/schematics/form/form-component/coerce-form-component.js.map +1 -1
- package/src/schematics/form/form-component/files/window/open-__componentName__-window.method.ts.template +26 -16
- package/src/schematics/form/form-definition/__snapshots__/index.spec.ts.snap +1 -0
- package/src/schematics/table/table-component/__snapshots__/index.spec.ts.snap +21 -21
- package/src/schematics/table/table-component/files/component/__componentName__.component.html.hbs +14 -11
- package/src/schematics/table/table-component/select-column-rule.js +3 -1
- package/src/schematics/table/table-component/select-column-rule.js.map +1 -1
- package/src/schematics/table/templates/spinner-table-column.hbs +5 -7
- package/src/schematics/table/tree-table-component/__snapshots__/index.spec.ts.snap +15 -17
- package/src/schematics/table/tree-table-component/files/component/__componentName__.component.html.hbs +14 -11
|
@@ -63,7 +63,7 @@ exports[`NormalizeTableSelectFormControlOptions should normalize complex table s
|
|
|
63
63
|
"isTypeOnly": false,
|
|
64
64
|
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
65
65
|
"name": "rxapTableSelectControl",
|
|
66
|
-
"namedImport": "
|
|
66
|
+
"namedImport": "TableSelectControlDirective",
|
|
67
67
|
"namespaceImport": null,
|
|
68
68
|
},
|
|
69
69
|
],
|
|
@@ -128,7 +128,23 @@ exports[`NormalizeTableSelectFormControlOptions should normalize complex table s
|
|
|
128
128
|
"defaultImport": null,
|
|
129
129
|
"isTypeOnly": false,
|
|
130
130
|
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
131
|
-
"name": "
|
|
131
|
+
"name": "TableSelectControlDirective",
|
|
132
|
+
"namedImport": null,
|
|
133
|
+
"namespaceImport": null,
|
|
134
|
+
},
|
|
135
|
+
{
|
|
136
|
+
"defaultImport": null,
|
|
137
|
+
"isTypeOnly": false,
|
|
138
|
+
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
139
|
+
"name": "TableSelectInputComponent",
|
|
140
|
+
"namedImport": null,
|
|
141
|
+
"namespaceImport": null,
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"defaultImport": null,
|
|
145
|
+
"isTypeOnly": false,
|
|
146
|
+
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
147
|
+
"name": "OpenTableSelectWindowDirective",
|
|
132
148
|
"namedImport": null,
|
|
133
149
|
"namespaceImport": null,
|
|
134
150
|
},
|
|
@@ -314,7 +330,7 @@ exports[`NormalizeTableSelectFormControlOptions should normalize minimal table s
|
|
|
314
330
|
"isTypeOnly": false,
|
|
315
331
|
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
316
332
|
"name": "rxapTableSelectControl",
|
|
317
|
-
"namedImport": "
|
|
333
|
+
"namedImport": "TableSelectControlDirective",
|
|
318
334
|
"namespaceImport": null,
|
|
319
335
|
},
|
|
320
336
|
],
|
|
@@ -379,7 +395,23 @@ exports[`NormalizeTableSelectFormControlOptions should normalize minimal table s
|
|
|
379
395
|
"defaultImport": null,
|
|
380
396
|
"isTypeOnly": false,
|
|
381
397
|
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
382
|
-
"name": "
|
|
398
|
+
"name": "TableSelectControlDirective",
|
|
399
|
+
"namedImport": null,
|
|
400
|
+
"namespaceImport": null,
|
|
401
|
+
},
|
|
402
|
+
{
|
|
403
|
+
"defaultImport": null,
|
|
404
|
+
"isTypeOnly": false,
|
|
405
|
+
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
406
|
+
"name": "TableSelectInputComponent",
|
|
407
|
+
"namedImport": null,
|
|
408
|
+
"namespaceImport": null,
|
|
409
|
+
},
|
|
410
|
+
{
|
|
411
|
+
"defaultImport": null,
|
|
412
|
+
"isTypeOnly": false,
|
|
413
|
+
"moduleSpecifier": "@rxap/ngx-material-table-select",
|
|
414
|
+
"name": "OpenTableSelectWindowDirective",
|
|
383
415
|
"namedImport": null,
|
|
384
416
|
"namespaceImport": null,
|
|
385
417
|
},
|
|
@@ -41,6 +41,7 @@ exports[`form-component minimal: generated 1`] = `
|
|
|
41
41
|
import { TestForm, ITestForm } from './test-form.form';
|
|
42
42
|
import { RxapFormBuilder, RXAP_FORM_DEFINITION_BUILDER, RXAP_FORM_DEFINITION, RXAP_FORM_INITIAL_STATE } from '@rxap/forms';
|
|
43
43
|
|
|
44
|
+
// rxap-no-index-export
|
|
44
45
|
export const FormProviders: Provider[] = [TestForm];
|
|
45
46
|
export const FormComponentProviders: Provider[] = [{
|
|
46
47
|
provide: RXAP_FORM_DEFINITION,
|
|
@@ -69,7 +70,7 @@ function FormBuilderFactory(injector: Injector): RxapFormBuilder<ITestForm> {
|
|
|
69
70
|
"/ui/lib/src/lib/test-form/test-form.component.ts": "import { Component, ChangeDetectionStrategy } from '@angular/core';
|
|
70
71
|
import { ReactiveFormsModule } from '@angular/forms';
|
|
71
72
|
import { FormControlsComponent } from '@rxap/material-form-system';
|
|
72
|
-
import {
|
|
73
|
+
import { FormDirective } from '@rxap/forms';
|
|
73
74
|
import { FormProviders, FormComponentProviders } from './form.providers';
|
|
74
75
|
|
|
75
76
|
@Component({
|
|
@@ -78,7 +79,7 @@ import { FormProviders, FormComponentProviders } from './form.providers';
|
|
|
78
79
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
79
80
|
templateUrl: './test-form.component.html',
|
|
80
81
|
styleUrls: ['./test-form.component.scss'],
|
|
81
|
-
imports: [ReactiveFormsModule, FormControlsComponent,
|
|
82
|
+
imports: [ReactiveFormsModule, FormControlsComponent, FormDirective],
|
|
82
83
|
providers: [FormProviders, FormComponentProviders],
|
|
83
84
|
})
|
|
84
85
|
export class TestFormComponent {
|
|
@@ -24,7 +24,7 @@ function CoerceFormComponentRule(options) {
|
|
|
24
24
|
moduleSpecifier: '@rxap/material-form-system',
|
|
25
25
|
});
|
|
26
26
|
(0, ts_morph_1.CoerceComponentImport)(classDeclaration, {
|
|
27
|
-
name: '
|
|
27
|
+
name: 'FormDirective',
|
|
28
28
|
moduleSpecifier: '@rxap/forms',
|
|
29
29
|
});
|
|
30
30
|
if (window) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-component.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-component/coerce-form-component.ts"],"names":[],"mappings":";;AA+BA,0DA0GC;AAzID,mEAImC;AACnC,6CAIwB;AACxB,+CAGyB;AACzB,uCAGkB;AAGlB,yGAAmG;AACnG,oFAI+C;AAM/C,SAAgB,uBAAuB,CAAC,OAAmC;;IAEzE,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,IAAI,EAAE,EACJ,MAAM,EACN,IAAI,EACJ,0BAA0B,EAC1B,WAAW,GACZ,EACD,UAAU,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,EAAE,GACnC,GAAG,OAAO,CAAC;IAEZ,MAAA,QAAQ,CAAC,cAAc,qCAAvB,QAAQ,CAAC,cAAc,IAAM,IAAA,6DAAkC,GAAE,EAAC;IAClE,MAAA,QAAQ,CAAC,MAAM,qCAAf,QAAQ,CAAC,MAAM,IAAM,IAAA,qDAA0B,GAAE,EAAC;IAClD,MAAA,QAAQ,CAAC,UAAU,qCAAnB,QAAQ,CAAC,UAAU,IAAM,IAAA,yDAA8B,GAAE,EAAC;IAE1D,OAAO,IAAA,yCAAmB,kCACrB,OAAO,KACV,UAAU,kCAAO,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,KAAE,QAAQ,KACnD,gBAAgB,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,CAAE,gBAAgB,CAAE,EAAE,EAAE;YAElE,yBAAyB;YACzB,IAAA,gCAAqB,EACnB,gBAAgB,EAAE;gBAChB,IAAI,EAAE,qBAAqB;gBAC3B,eAAe,EAAE,gBAAgB;aAClC,CAAC,CAAC;YACL,IAAA,gCAAqB,EACnB,gBAAgB,EAAE;gBAChB,IAAI,EAAE,uBAAuB;gBAC7B,eAAe,EAAE,4BAA4B;aAC9C,CAAC,CAAC;YACL,IAAA,gCAAqB,EACnB,gBAAgB,EAAE;gBAChB,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"coerce-form-component.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-component/coerce-form-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,39 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { inject, Injectable, Injector, INJECTOR } from '@angular/core';
|
|
2
|
+
import { FormDefinition } from '@rxap/forms';
|
|
2
3
|
import {
|
|
3
4
|
FormWindowOptions,
|
|
4
5
|
FormWindowService,
|
|
5
|
-
OpenFormWindowMethod,
|
|
6
6
|
RXAP_FORM_WINDOW_SYSTEM_OPEN_FORM_DEFAULT_OPTIONS,
|
|
7
7
|
} from '@rxap/form-window-system';
|
|
8
|
+
import { Method } from '@rxap/pattern';
|
|
9
|
+
import { WindowRef } from '@rxap/window-system';
|
|
8
10
|
import { <%= classify(name) %>FormComponent } from './<%= name %>-form.component';
|
|
9
11
|
import { <%= classify(name) %>Form, I<%= classify(name) %>Form } from './<%= name %>.form';
|
|
10
12
|
|
|
11
13
|
@Injectable()
|
|
12
|
-
export class Open<%= classify(name) %>FormWindowMethod
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
)
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
export class Open<%= classify(name) %>FormWindowMethod
|
|
15
|
+
implements Method<WindowRef<FormDefinition, I<%= classify(name) %>Form>, Partial<I<%= classify(name) %>Form>> {
|
|
16
|
+
|
|
17
|
+
private readonly formWindowService = inject(FormWindowService);
|
|
18
|
+
private readonly injector = inject<Injector>(INJECTOR);
|
|
19
|
+
private readonly defaultOptions = inject<FormWindowOptions<I<%= classify(name) %>Form> | null>(
|
|
20
|
+
RXAP_FORM_WINDOW_SYSTEM_OPEN_FORM_DEFAULT_OPTIONS,
|
|
21
|
+
{ optional: true },
|
|
22
|
+
);
|
|
23
|
+
|
|
24
|
+
public call(
|
|
25
|
+
initial?: Partial<I<%= classify(name) %>Form>,
|
|
26
|
+
options?: Partial<FormWindowOptions<I<%= classify(name) %>Form>>,
|
|
27
|
+
): WindowRef<FormDefinition, I<%= classify(name) %>Form> {
|
|
28
|
+
return this.formWindowService.open<I<%= classify(name) %>Form>(
|
|
23
29
|
<%= classify(name) %>Form,
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
30
|
+
{
|
|
31
|
+
...(this.defaultOptions ?? {}),
|
|
32
|
+
injector: this.injector,
|
|
33
|
+
...(options ?? {}),
|
|
34
|
+
initial: initial ?? this.defaultOptions?.initial,
|
|
35
|
+
component: this.defaultOptions?.component ?? <%= classify(name) %>FormComponent,
|
|
36
|
+
},
|
|
27
37
|
);
|
|
28
38
|
}
|
|
29
39
|
}
|
|
@@ -38,6 +38,7 @@ exports[`form-definition minimal: generated 1`] = `
|
|
|
38
38
|
import { TestDefForm, ITestDefForm } from './test-def.form';
|
|
39
39
|
import { RxapFormBuilder, RXAP_FORM_DEFINITION_BUILDER, RXAP_FORM_DEFINITION, RXAP_FORM_INITIAL_STATE } from '@rxap/forms';
|
|
40
40
|
|
|
41
|
+
// rxap-no-index-export
|
|
41
42
|
export const FormProviders: Provider[] = [TestDefForm];
|
|
42
43
|
export const FormComponentProviders: Provider[] = [{
|
|
43
44
|
provide: RXAP_FORM_DEFINITION,
|
|
@@ -75,17 +75,18 @@ exports[`table-component minimal: generated 1`] = `
|
|
|
75
75
|
</mat-card-header>
|
|
76
76
|
|
|
77
77
|
<mat-card-content>
|
|
78
|
+
@if (tableDataSourceDirective.hasError$ | async) {
|
|
78
79
|
<rxap-data-source-error
|
|
79
|
-
*ngIf="tableDataSourceDirective.hasError$ | async"
|
|
80
80
|
[dataSourceLike]="tableDataSourceDirective">
|
|
81
81
|
</rxap-data-source-error>
|
|
82
|
+
}
|
|
82
83
|
<div class="table-scroll-container mt-4 overflow-x-auto overscroll-auto">
|
|
83
84
|
<table
|
|
84
|
-
[
|
|
85
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
85
86
|
mat-table
|
|
86
87
|
#tableDataSourceDirective="rxapTableDataSource"
|
|
87
88
|
rxapTableDataSource
|
|
88
|
-
[parameters]="parameters"
|
|
89
|
+
[parameters]="parameters()"
|
|
89
90
|
id="test-table"
|
|
90
91
|
[paginator]="paginator"
|
|
91
92
|
>
|
|
@@ -103,7 +104,7 @@ exports[`table-component minimal: generated 1`] = `
|
|
|
103
104
|
class="hover:!bg-neutral-400 dark:hover:!bg-neutral-800"
|
|
104
105
|
*matRowDef="
|
|
105
106
|
let element;
|
|
106
|
-
columns: rxapTableColumns.displayColumns;
|
|
107
|
+
columns: rxapTableColumns.displayColumns();
|
|
107
108
|
let odd = odd;
|
|
108
109
|
let even = even
|
|
109
110
|
"
|
|
@@ -113,7 +114,7 @@ exports[`table-component minimal: generated 1`] = `
|
|
|
113
114
|
</mat-card-content>
|
|
114
115
|
<mat-card-footer>
|
|
115
116
|
<mat-paginator
|
|
116
|
-
[
|
|
117
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
117
118
|
class="m-4"
|
|
118
119
|
rxapPersistent
|
|
119
120
|
[pageSizeOptions]="[5,10,25,50,100]"
|
|
@@ -126,8 +127,8 @@ exports[`table-component minimal: generated 1`] = `
|
|
|
126
127
|
</div>
|
|
127
128
|
",
|
|
128
129
|
"/ui/lib/src/lib/test-table/test-table.component.scss": "",
|
|
129
|
-
"/ui/lib/src/lib/test-table/test-table.component.ts": "import { Component, ChangeDetectionStrategy,
|
|
130
|
-
import { RowAnimation,
|
|
130
|
+
"/ui/lib/src/lib/test-table/test-table.component.ts": "import { Component, ChangeDetectionStrategy, input } from '@angular/core';
|
|
131
|
+
import { RowAnimation, TableColumnMenuComponent, TableColumnOptionComponent, PersistentPaginatorDirective, TableDataSourceDirective } from '@rxap/material-table-system';
|
|
131
132
|
import { Observable } from 'rxjs';
|
|
132
133
|
import { MatPaginatorModule } from '@angular/material/paginator';
|
|
133
134
|
import { DataSourceErrorComponent } from '@rxap/data-source';
|
|
@@ -145,11 +146,10 @@ import { AsyncPipe, NgIf, NgClass } from '@angular/common';
|
|
|
145
146
|
templateUrl: './test-table.component.html',
|
|
146
147
|
styleUrls: ['./test-table.component.scss'],
|
|
147
148
|
animations: [RowAnimation],
|
|
148
|
-
imports: [
|
|
149
|
+
imports: [TableColumnMenuComponent, TableColumnOptionComponent, MatPaginatorModule, PersistentPaginatorDirective, DataSourceErrorComponent, MatDividerModule, TableDataSourceDirective, MatTableModule, CardProgressBarDirective, MatProgressBarModule, MatCardModule, AsyncPipe, NgIf, NgClass],
|
|
149
150
|
})
|
|
150
151
|
export class TestTableComponent {
|
|
151
|
-
|
|
152
|
-
public parameters?: Observable<Record<string, unknown>>;
|
|
152
|
+
public readonly parameters = input<Observable<Record<string, unknown>>>();
|
|
153
153
|
}
|
|
154
154
|
",
|
|
155
155
|
"/ui/lib/src/lib/test-table/test-table.ts": "import { TableRowMetadata } from '@rxap/material-table-system';
|
|
@@ -375,17 +375,18 @@ type RawRowData = any;
|
|
|
375
375
|
</mat-card-header>
|
|
376
376
|
|
|
377
377
|
<mat-card-content>
|
|
378
|
+
@if (tableDataSourceDirective.hasError$ | async) {
|
|
378
379
|
<rxap-data-source-error
|
|
379
|
-
*ngIf="tableDataSourceDirective.hasError$ | async"
|
|
380
380
|
[dataSourceLike]="tableDataSourceDirective">
|
|
381
381
|
</rxap-data-source-error>
|
|
382
|
+
}
|
|
382
383
|
<div class="table-scroll-container mt-4 overflow-x-auto overscroll-auto">
|
|
383
384
|
<table
|
|
384
|
-
[
|
|
385
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
385
386
|
mat-table
|
|
386
387
|
#tableDataSourceDirective="rxapTableDataSource"
|
|
387
388
|
rxapTableDataSource
|
|
388
|
-
[parameters]="parameters"
|
|
389
|
+
[parameters]="parameters()"
|
|
389
390
|
id="test-table"
|
|
390
391
|
[paginator]="paginator"
|
|
391
392
|
>
|
|
@@ -410,7 +411,7 @@ type RawRowData = any;
|
|
|
410
411
|
|
|
411
412
|
<tr
|
|
412
413
|
mat-header-row
|
|
413
|
-
*matHeaderRowDef="rxapTableColumns.displayColumns"
|
|
414
|
+
*matHeaderRowDef="rxapTableColumns.displayColumns()"
|
|
414
415
|
></tr>
|
|
415
416
|
|
|
416
417
|
<tr
|
|
@@ -420,7 +421,7 @@ type RawRowData = any;
|
|
|
420
421
|
class="hover:!bg-neutral-400 dark:hover:!bg-neutral-800"
|
|
421
422
|
*matRowDef="
|
|
422
423
|
let element;
|
|
423
|
-
columns: rxapTableColumns.displayColumns;
|
|
424
|
+
columns: rxapTableColumns.displayColumns();
|
|
424
425
|
let odd = odd;
|
|
425
426
|
let even = even
|
|
426
427
|
"
|
|
@@ -430,7 +431,7 @@ type RawRowData = any;
|
|
|
430
431
|
</mat-card-content>
|
|
431
432
|
<mat-card-footer>
|
|
432
433
|
<mat-paginator
|
|
433
|
-
[
|
|
434
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
434
435
|
class="m-4"
|
|
435
436
|
rxapPersistent
|
|
436
437
|
[pageSizeOptions]="[5,10,25,50,100]"
|
|
@@ -443,8 +444,8 @@ type RawRowData = any;
|
|
|
443
444
|
</div>
|
|
444
445
|
",
|
|
445
446
|
"/ui/lib/src/lib/test-table/test-table.component.scss": "",
|
|
446
|
-
"/ui/lib/src/lib/test-table/test-table.component.ts": "import { Component, ChangeDetectionStrategy,
|
|
447
|
-
import { RowAnimation,
|
|
447
|
+
"/ui/lib/src/lib/test-table/test-table.component.ts": "import { Component, ChangeDetectionStrategy, input } from '@angular/core';
|
|
448
|
+
import { RowAnimation, TableColumnMenuComponent, TableColumnOptionComponent, PersistentPaginatorDirective, TableDataSourceDirective, TABLE_REMOTE_METHOD_ADAPTER_FACTORY, RXAP_TABLE_METHOD } from '@rxap/material-table-system';
|
|
448
449
|
import { Observable } from 'rxjs';
|
|
449
450
|
import { MatPaginatorModule } from '@angular/material/paginator';
|
|
450
451
|
import { DataSourceErrorComponent } from '@rxap/data-source';
|
|
@@ -464,7 +465,7 @@ import { TestTableControllerGetPageRemoteMethod } from 'open-api-api-lib/src/lib
|
|
|
464
465
|
templateUrl: './test-table.component.html',
|
|
465
466
|
styleUrls: ['./test-table.component.scss'],
|
|
466
467
|
animations: [RowAnimation],
|
|
467
|
-
imports: [
|
|
468
|
+
imports: [TableColumnMenuComponent, TableColumnOptionComponent, MatPaginatorModule, PersistentPaginatorDirective, DataSourceErrorComponent, MatDividerModule, TableDataSourceDirective, MatTableModule, CardProgressBarDirective, MatProgressBarModule, MatCardModule, AsyncPipe, NgIf, NgClass],
|
|
468
469
|
providers: [{
|
|
469
470
|
provide: TABLE_REMOTE_METHOD_ADAPTER_FACTORY,
|
|
470
471
|
useValue: GetPageAdapterFactory
|
|
@@ -476,8 +477,7 @@ import { TestTableControllerGetPageRemoteMethod } from 'open-api-api-lib/src/lib
|
|
|
476
477
|
],
|
|
477
478
|
})
|
|
478
479
|
export class TestTableComponent {
|
|
479
|
-
|
|
480
|
-
public parameters?: Observable<Record<string, unknown>>;
|
|
480
|
+
public readonly parameters = input<Observable<Record<string, unknown>>>();
|
|
481
481
|
}
|
|
482
482
|
",
|
|
483
483
|
"/ui/lib/src/lib/test-table/test-table.ts": "import { TableRowMetadata } from '@rxap/material-table-system';
|
package/src/schematics/table/table-component/files/component/__componentName__.component.html.hbs
CHANGED
|
@@ -81,20 +81,21 @@
|
|
|
81
81
|
</mat-card-header>
|
|
82
82
|
|
|
83
83
|
<mat-card-content>
|
|
84
|
+
@if (tableDataSourceDirective.hasError$ | async) {
|
|
84
85
|
<rxap-data-source-error
|
|
85
|
-
*ngIf="tableDataSourceDirective.hasError$ | async"
|
|
86
86
|
[dataSourceLike]="tableDataSourceDirective">
|
|
87
87
|
</rxap-data-source-error>
|
|
88
|
+
}
|
|
88
89
|
<div class="table-scroll-container mt-4 overflow-x-auto overscroll-auto">
|
|
89
90
|
<table
|
|
90
|
-
[
|
|
91
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
91
92
|
mat-table
|
|
92
93
|
#tableDataSourceDirective="rxapTableDataSource"
|
|
93
94
|
{{#ifeq backend "data-source"}}
|
|
94
|
-
[dataSource]="dataSource"
|
|
95
|
+
[dataSource]="dataSource()"
|
|
95
96
|
{{/ifeq}}
|
|
96
97
|
rxapTableDataSource
|
|
97
|
-
[parameters]="parameters"
|
|
98
|
+
[parameters]="parameters()"
|
|
98
99
|
id="{{name}}"
|
|
99
100
|
{{#if cssClass}}
|
|
100
101
|
{{> cssClass cssClass=cssClass}}
|
|
@@ -144,6 +145,7 @@
|
|
|
144
145
|
<div class="flex flex-row" *rxapSelectedRows="let selected">
|
|
145
146
|
{{#each actionList}}
|
|
146
147
|
{{#if this.inHeader}}
|
|
148
|
+
@if (selected | rxapRowActionCheck:'{{this.type}}') {
|
|
147
149
|
<button
|
|
148
150
|
rxapTableRowHeaderAction="{{this.type}}"
|
|
149
151
|
mat-icon-button
|
|
@@ -153,7 +155,6 @@
|
|
|
153
155
|
{{#if this.cssClass}}
|
|
154
156
|
{{> cssClass cssClass=this.cssClass}}
|
|
155
157
|
{{/if}}
|
|
156
|
-
*ngIf="selected | rxapRowActionCheck:'{{this.type}}'"
|
|
157
158
|
{{#if this.permission}}
|
|
158
159
|
rxapHasEnablePermission="{{this.permission}}"
|
|
159
160
|
{{/if}}
|
|
@@ -171,6 +172,7 @@
|
|
|
171
172
|
mode="indeterminate"
|
|
172
173
|
></mat-progress-bar>
|
|
173
174
|
</button>
|
|
175
|
+
}
|
|
174
176
|
{{/if}}
|
|
175
177
|
{{/each}}
|
|
176
178
|
</div>
|
|
@@ -182,6 +184,7 @@
|
|
|
182
184
|
<td class="drop-shadow-2xl" mat-cell *matCellDef="let element">
|
|
183
185
|
<div class="flex flex-row">
|
|
184
186
|
{{#each actionList}}
|
|
187
|
+
@if (element | rxapRowActionCheck:'{{this.type}}') {
|
|
185
188
|
<button
|
|
186
189
|
rxapTableRowAction="{{this.type}}"
|
|
187
190
|
[element]="element"
|
|
@@ -192,7 +195,6 @@
|
|
|
192
195
|
{{> cssClass cssClass=this.cssClass}}
|
|
193
196
|
{{/if}}
|
|
194
197
|
mat-icon-button
|
|
195
|
-
*ngIf="element | rxapRowActionCheck:'{{this.type}}'"
|
|
196
198
|
{{#if this.permission}}
|
|
197
199
|
rxapHasEnablePermission="{{this.permission}}"
|
|
198
200
|
{{/if}}
|
|
@@ -210,6 +212,7 @@
|
|
|
210
212
|
mode="indeterminate"
|
|
211
213
|
></mat-progress-bar>
|
|
212
214
|
</button>
|
|
215
|
+
}
|
|
213
216
|
{{/each}}
|
|
214
217
|
</div>
|
|
215
218
|
</td>
|
|
@@ -224,7 +227,7 @@
|
|
|
224
227
|
<!-- endregion -->
|
|
225
228
|
{{#if hasCustomFilter}}
|
|
226
229
|
<ng-container matColumnDef="custom_filter">
|
|
227
|
-
<th *matHeaderCellDef [colSpan]="rxapTableColumns.displayColumns.length" mat-header-cell>
|
|
230
|
+
<th *matHeaderCellDef [colSpan]="rxapTableColumns.displayColumns().length" mat-header-cell>
|
|
228
231
|
<div class="flex flex-row gap-6">
|
|
229
232
|
{{#each filterList}}
|
|
230
233
|
{{ indent (compile this.handlebars control=this prefix=../prefix) 16 }}
|
|
@@ -271,14 +274,14 @@
|
|
|
271
274
|
<tr
|
|
272
275
|
class="rxap-filter-header"
|
|
273
276
|
mat-header-row
|
|
274
|
-
*matHeaderRowDef="rxapTableColumns.displayColumns | toFilterColumnNames"
|
|
277
|
+
*matHeaderRowDef="rxapTableColumns.displayColumns() | toFilterColumnNames"
|
|
275
278
|
></tr>
|
|
276
279
|
{{/if}}
|
|
277
280
|
|
|
278
281
|
{{#if withHeader}}
|
|
279
282
|
<tr
|
|
280
283
|
mat-header-row
|
|
281
|
-
*matHeaderRowDef="rxapTableColumns.displayColumns"
|
|
284
|
+
*matHeaderRowDef="rxapTableColumns.displayColumns()"
|
|
282
285
|
></tr>
|
|
283
286
|
{{/if}}
|
|
284
287
|
|
|
@@ -289,7 +292,7 @@
|
|
|
289
292
|
class="hover:!bg-neutral-400 dark:hover:!bg-neutral-800"
|
|
290
293
|
*matRowDef="
|
|
291
294
|
let element;
|
|
292
|
-
columns: rxapTableColumns.displayColumns;
|
|
295
|
+
columns: rxapTableColumns.displayColumns();
|
|
293
296
|
let odd = odd;
|
|
294
297
|
let even = even
|
|
295
298
|
"
|
|
@@ -300,7 +303,7 @@
|
|
|
300
303
|
{{#if hasPaginator}}
|
|
301
304
|
<mat-card-footer>
|
|
302
305
|
<mat-paginator
|
|
303
|
-
[
|
|
306
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
304
307
|
class="m-4"
|
|
305
308
|
rxapPersistent
|
|
306
309
|
[pageSizeOptions]="[5,10,25,50,100]"
|
|
@@ -33,7 +33,9 @@ function selectColumnRule(normalizedOptions) {
|
|
|
33
33
|
namedImports: ['RXAP_MATERIAL_TABLE_SYSTEM_SELECT_ROW_OPTIONS'],
|
|
34
34
|
},
|
|
35
35
|
]);
|
|
36
|
-
(
|
|
36
|
+
for (const name of ['CheckboxCellComponent', 'CheckboxHeaderCellComponent', 'SelectedRowsDirective']) {
|
|
37
|
+
(0, schematics_ts_morph_1.AddComponentImport)(sourceFile, name, '@rxap/material-table-system');
|
|
38
|
+
}
|
|
37
39
|
},
|
|
38
40
|
}),
|
|
39
41
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-column-rule.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/table/table-component/select-column-rule.ts"],"names":[],"mappings":";;AAiBA,
|
|
1
|
+
{"version":3,"file":"select-column-rule.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/table/table-component/select-column-rule.ts"],"names":[],"mappings":";;AAiBA,4CA4DC;AA7ED,2DAIoC;AACpC,mEAImC;AACnC,uCAIkB;AAGlB,SAAgB,gBAAgB,CAAC,iBAAkD;IAEjF,MAAM,EACJ,YAAY,EACZ,OAAO,EACP,OAAO,EACP,MAAM,EACN,aAAa,EACb,SAAS,EACT,SAAS,GACV,GAAG,iBAAiB,CAAC;IAEtB,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,yCAAmB,EAAC;gBAClB,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,IAAI,EAAE,aAAa;gBACnB,SAAS;gBACT,SAAS;gBACT,gBAAgB,EAAE,CAChB,OAAgB,EAChB,CAAE,UAAU,CAAkB,EAC9B,EAAE;oBACF,IAAA,0CAAoB,EAClB,UAAU,EACV,kBAAkB,EAClB;wBACE;4BACE,eAAe,EAAE,6BAA6B;4BAC9C,YAAY,EAAE,CAAE,kBAAkB,CAAE;yBACrC;qBACF,CACF,CAAC;oBACF,IAAA,0CAAoB,EAClB,UAAU,EACV;wBACE,OAAO,EAAE,+CAA+C;wBACxD,QAAQ,EAAE,kBAAO,CAAC,MAAM,CAAC;4BACvB,QAAQ,EAAE,MAAM;yBACjB,CAAC;qBACH,EACD;wBACE;4BACE,eAAe,EAAE,6BAA6B;4BAC9C,YAAY,EAAE,CAAE,+CAA+C,CAAE;yBAClE;qBACF,CACF,CAAC;oBACF,KAAK,MAAM,IAAI,IAAI,CAAE,uBAAuB,EAAE,6BAA6B,EAAE,uBAAuB,CAAE,EAAE,CAAC;wBACvG,IAAA,wCAAkB,EAAC,UAAU,EAAE,IAAI,EAAE,6BAA6B,CAAC,CAAC;oBACtE,CAAC;gBACH,CAAC;aACF,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAEhB,CAAC"}
|
|
@@ -16,12 +16,10 @@
|
|
|
16
16
|
{{> cssClass cssClass=column.cssClass}}
|
|
17
17
|
{{/if}}
|
|
18
18
|
>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
></
|
|
23
|
-
|
|
24
|
-
<div class="w-[15px] h-[15px]"></div>
|
|
25
|
-
</ng-template>
|
|
19
|
+
@if (element.__metadata__?.loading$ | async) {
|
|
20
|
+
<mat-spinner diameter="15"></mat-spinner>
|
|
21
|
+
} @else {
|
|
22
|
+
<div class="w-[15px] h-[15px]"></div>
|
|
23
|
+
}
|
|
26
24
|
</td>
|
|
27
25
|
{{/matColumnDef}}
|
|
@@ -64,17 +64,18 @@ exports[`tree-table-component minimal: generated 1`] = `
|
|
|
64
64
|
</mat-card-header>
|
|
65
65
|
|
|
66
66
|
<mat-card-content>
|
|
67
|
+
@if (tableDataSourceDirective.hasError$ | async) {
|
|
67
68
|
<rxap-data-source-error
|
|
68
|
-
*ngIf="tableDataSourceDirective.hasError$ | async"
|
|
69
69
|
[dataSourceLike]="tableDataSourceDirective">
|
|
70
70
|
</rxap-data-source-error>
|
|
71
|
+
}
|
|
71
72
|
<div class="table-scroll-container mt-4 overflow-x-auto overscroll-auto">
|
|
72
73
|
<table
|
|
73
|
-
[
|
|
74
|
+
[class.hidden]="tableDataSourceDirective.hasError$ | async"
|
|
74
75
|
mat-table
|
|
75
76
|
#tableDataSourceDirective="rxapTableDataSource"
|
|
76
77
|
rxapTableDataSource
|
|
77
|
-
[parameters]="parameters"
|
|
78
|
+
[parameters]="parameters()"
|
|
78
79
|
id="test-tree-table"
|
|
79
80
|
>
|
|
80
81
|
<!-- region columns -->
|
|
@@ -99,13 +100,11 @@ exports[`tree-table-component minimal: generated 1`] = `
|
|
|
99
100
|
mat-cell
|
|
100
101
|
class="w-[15px] min-w-[15px]"
|
|
101
102
|
>
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
></
|
|
106
|
-
|
|
107
|
-
<div class="w-[15px] h-[15px]"></div>
|
|
108
|
-
</ng-template>
|
|
103
|
+
@if (element.__metadata__?.loading$ | async) {
|
|
104
|
+
<mat-spinner diameter="15"></mat-spinner>
|
|
105
|
+
} @else {
|
|
106
|
+
<div class="w-[15px] h-[15px]"></div>
|
|
107
|
+
}
|
|
109
108
|
</td>
|
|
110
109
|
</ng-container>
|
|
111
110
|
|
|
@@ -116,7 +115,7 @@ exports[`tree-table-component minimal: generated 1`] = `
|
|
|
116
115
|
|
|
117
116
|
<tr
|
|
118
117
|
mat-header-row
|
|
119
|
-
*matHeaderRowDef="rxapTableColumns.displayColumns"
|
|
118
|
+
*matHeaderRowDef="rxapTableColumns.displayColumns()"
|
|
120
119
|
></tr>
|
|
121
120
|
|
|
122
121
|
<tr
|
|
@@ -126,7 +125,7 @@ exports[`tree-table-component minimal: generated 1`] = `
|
|
|
126
125
|
class="hover:!bg-neutral-400 dark:hover:!bg-neutral-800"
|
|
127
126
|
*matRowDef="
|
|
128
127
|
let element;
|
|
129
|
-
columns: rxapTableColumns.displayColumns;
|
|
128
|
+
columns: rxapTableColumns.displayColumns();
|
|
130
129
|
let odd = odd;
|
|
131
130
|
let even = even
|
|
132
131
|
"
|
|
@@ -139,8 +138,8 @@ exports[`tree-table-component minimal: generated 1`] = `
|
|
|
139
138
|
</div>
|
|
140
139
|
",
|
|
141
140
|
"/ui/lib/src/lib/test-tree-table/test-tree-table.component.scss": "",
|
|
142
|
-
"/ui/lib/src/lib/test-tree-table/test-tree-table.component.ts": "import { Component, ChangeDetectionStrategy,
|
|
143
|
-
import { RowAnimation,
|
|
141
|
+
"/ui/lib/src/lib/test-tree-table/test-tree-table.component.ts": "import { Component, ChangeDetectionStrategy, input } from '@angular/core';
|
|
142
|
+
import { RowAnimation, TableColumnMenuComponent, TableColumnOptionComponent, PersistentPaginatorDirective, TableDataSourceDirective, TreeControlCellComponent, TABLE_DATA_SOURCE } from '@rxap/material-table-system';
|
|
144
143
|
import { Observable } from 'rxjs';
|
|
145
144
|
import { DataSourceErrorComponent } from '@rxap/data-source';
|
|
146
145
|
import { MatDividerModule } from '@angular/material/divider';
|
|
@@ -159,15 +158,14 @@ import { TreeTableDataSource } from '@rxap/data-source/table/tree';
|
|
|
159
158
|
templateUrl: './test-tree-table.component.html',
|
|
160
159
|
styleUrls: ['./test-tree-table.component.scss'],
|
|
161
160
|
animations: [RowAnimation],
|
|
162
|
-
imports: [
|
|
161
|
+
imports: [TableColumnMenuComponent, TableColumnOptionComponent, PersistentPaginatorDirective, DataSourceErrorComponent, MatDividerModule, TableDataSourceDirective, MatTableModule, CardProgressBarDirective, MatProgressBarModule, MatCardModule, AsyncPipe, NgIf, NgClass, TreeControlCellComponent, MatProgressSpinnerModule],
|
|
163
162
|
providers: [{
|
|
164
163
|
provide: TABLE_DATA_SOURCE,
|
|
165
164
|
useClass: TreeTableDataSource
|
|
166
165
|
}],
|
|
167
166
|
})
|
|
168
167
|
export class TestTreeTableComponent {
|
|
169
|
-
|
|
170
|
-
public parameters?: Observable<Record<string, unknown>>;
|
|
168
|
+
public readonly parameters = input<Observable<Record<string, unknown>>>();
|
|
171
169
|
}
|
|
172
170
|
",
|
|
173
171
|
"/ui/lib/src/lib/test-tree-table/test-tree-table.ts": "import { IconConfig } from '@rxap/utilities';
|