Skip to content

Commit f331eab

Browse files
committed
Add requestParam input property to simplify adding params to table requests
1 parent fd41e7c commit f331eab

File tree

7 files changed

+7
-23
lines changed

7 files changed

+7
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private requestData() {
6767
this.requestSubscription.unsubscribe();
6868
}
6969

70-
this.requestSubscription = this.tableService.requestData(this.remoteAPI, {query: rqlStringTemp})
70+
this.requestSubscription = this.tableService.requestData(this.remoteAPI, {...this.requestParams, query: rqlStringTemp})
7171
.pipe(
7272
tap((response: Response<Entity>) => {
7373
this.updateHighlightString();

libs/schematic/generators/ng-generate/components/table/generators/components/table/files/__name@dasherize__.component.scss.template

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ $gray-300: #e0e0e0;
2929
height: 90%;
3030
overflow-y: auto;
3131

32-
.table-header-icon {
33-
margin-left: 0.5rem;
34-
cursor: default;
35-
font-size: 20px;
36-
min-width: 20px;
37-
width: 20px;
38-
height: 20px;
39-
color: $gray-100;
40-
}
41-
4232
.full-width-table {
4333
min-width: 100%;
4434

libs/schematic/generators/ng-generate/components/table/generators/components/table/files/__name@dasherize__.component.ts.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
182182
@Input() customFilterExtension: CustomRQLFilterExtension | undefined;
183183
@Input() customOptionsExtension: CustomRQLOptionExtension | undefined;
184184
@Input() extendedCsvExporter: ExtendedCsvExporter | undefined;
185+
@Input() requestParams: Record<string, string> = {};
185186
@Input() remoteAPI = '';
186187
<% } else { %>
187188
@Input() maxExportRows = 0;

libs/schematic/generators/ng-generate/prompter/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ async function registerFuzzyPathPrompt(): Promise<any> {
4444
const inquirerSearchList = await import('inquirer-search-list');
4545
const inquirer = await loadInquirer();
4646

47-
inquirer.registerPrompt('fuzzypath', inquirerFuzzyPath);
48-
inquirer.registerPrompt('suggest', inquirerPromptSuggest);
49-
inquirer.registerPrompt('search-list', inquirerSearchList);
47+
(inquirer as any).registerPrompt('fuzzypath', inquirerFuzzyPath);
48+
(inquirer as any).registerPrompt('suggest', inquirerPromptSuggest);
49+
(inquirer as any).registerPrompt('search-list', inquirerSearchList);
5050

5151
return inquirer;
5252
} catch (err) {

libs/schematic/generators/ng-generate/types/aspect-model-type-generator-visitor.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export class AspectModelTypeGeneratorVisitor extends DefaultAspectModelVisitor<B
8484

8585
getGeneratedTypeDefinitions(): string {
8686
let typeDefinitionsAsString = '';
87-
// @ts-expect-error The this.typeDefinitions.values() return type is incorrectly identified
8887
for (const lines of this.typeDefinitions.values()) {
8988
typeDefinitionsAsString = typeDefinitionsAsString.concat(...lines);
9089
}

libs/schematic/src/lib/components/table-cell/table-cell.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
white-space: nowrap;
99
overflow: hidden;
1010
text-overflow: ellipsis;
11+
display: flex;
1112
}
1213

1314
mat-icon {

libs/schematic/src/lib/services/remote-table.service.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ export class EsmfRemoteTableService<T> {
2020
private http = inject(HttpClient);
2121

2222
requestData(remoteAPI: string, body: Payload) {
23-
const strippedUrlParts: string[] = remoteAPI.split('?');
24-
if (strippedUrlParts && strippedUrlParts.length === 2) {
25-
const queryParams = new URLSearchParams(strippedUrlParts[1]);
26-
queryParams.forEach((value, key) => {
27-
body[key] = value;
28-
});
29-
}
30-
return this.http.post<Response<T>>(strippedUrlParts[0], body);
23+
return this.http.post<Response<T>>(remoteAPI, body);
3124
}
3225
}

0 commit comments

Comments
 (0)