Skip to content

Commit 8115d2c

Browse files
authored
feat: Move ConfigMenuComponent to general components (#20)
* Add config-menu.component.ts Signed-off-by: Pavel Shalamkov <[email protected]> * Update schematic lib entities to have "Esmf" prefix JSSdkLocalStorageService => EsmfLocalStorageService Signed-off-by: Pavel Shalamkov <[email protected]> * Remove ConfigMenuComponent legacy code Signed-off-by: Pavel Shalamkov <[email protected]> * Remove EsmfPaginatorSelectConfigProvider from Table Module template Signed-off-by: Pavel Shalamkov <[email protected]> --------- Signed-off-by: Pavel Shalamkov <[email protected]>
1 parent 91efbb6 commit 8115d2c

File tree

39 files changed

+958
-283
lines changed

39 files changed

+958
-283
lines changed

libs/schematic/generators/ng-generate/components/shared/generators/modules/translation/module-files/__name@dasherize__.module.ts.template

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@ import {isDevMode, NgModule} from '@angular/core';
44
import {environment} from "../../environments/environment";
55
import {provideTransloco, TranslocoModule} from '@jsverse/transloco';
66
import {TransLocoHttpLoader} from './trans-loco-http-loader';
7-
import {PaginatorSelectConfigProvider} from './services/paginator-select-config.provider';
7+
import {EsmfPaginatorSelectConfigProvider} from './services/paginator-select-config.provider';
88

99
export const baseUrl = (environment as any).baseUrl || '';
1010

1111
@NgModule({
1212
imports: [TranslocoModule],
1313
exports: [TranslocoModule],
14-
providers: [
15-
<%= providerInfo %>
16-
<% if (options.componentType !== 'form') { %>
17-
, PaginatorSelectConfigProvider
18-
<% } %>
19-
],
20-
})
14+
providers: [<%= providerInfo %>],
15+
})
2116
export class <%= classify(name) %>Module {}

libs/schematic/generators/ng-generate/components/shared/generators/services/custom/files/custom-__name@dasherize__.service.ts.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** <%= options.generationDisclaimerText %> **/
22
<%
3-
var serviceName = options.enableRemoteDataHandling ? 'RemoteTableService' : 'StaticTableService';
3+
var serviceName = options.enableRemoteDataHandling ? 'EsmfRemoteTableService' : 'EsmfStaticTableService';
44
%>
55
import {Injectable} from '@angular/core';
66
import {<%= serviceName %>} from '@esmf/semantic-ui-schematic';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<% if (options.customRemoteService) { %>
22
import {Custom<%= classify(name) %>Service} from './custom-<%= dasherize(name) %>.service';
33
<% } else { %>
4-
import {RemoteTableService} from '@esmf/semantic-ui-schematic';
4+
import {EsmfRemoteTableService} from '@esmf/semantic-ui-schematic';
55
<% } %>
66

77
import {<%= options.aspectModel.name %>Response} from './<%= dasherize(options.name) %>.service';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import {Component, EventEmitter, Output} from '@angular/core';
33
import {Column} from './<%= dasherize(name) %>.component';
44
import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop';
5-
import {JSSdkLocalStorageService} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/storage.service";
5+
import {EsmfLocalStorageService} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/storage.service";
66

77
@Component({
88
selector: '<%= dasherize(name) %>-column-menu',
@@ -19,7 +19,7 @@ export class <%= classify(name) %>ColumnMenuComponent {
1919
closeColumnMenu: boolean = false;
2020
keyLocalStorage: string = '';
2121

22-
constructor(private storageService: JSSdkLocalStorageService) {}
22+
constructor(private storageService: EsmfLocalStorageService) {}
2323

2424
closeMenu(): void {
2525
this.resetStoredColumns();

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

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

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

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

libs/schematic/generators/ng-generate/components/table/generators/components/config-menu/index.ts

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var cmpFileName = dasherize(name);
55
var hasCustomRowActions = options.customRowActions.length > 0;
66
var customRowActionNames = options.customRowActions.map(action => `'${action.replace(/\.[^/.]+$/, '')}'`);
7-
var tableServiceName = options.enableRemoteDataHandling ? (options.customRemoteService ? `Custom${classify(name)}Service` : 'RemoteTableService') : 'StaticTableService';
7+
var tableServiceName = options.enableRemoteDataHandling ? (options.customRemoteService ? `Custom${classify(name)}Service` : 'EsmfRemoteTableService') : 'EsmfStaticTableService';
88
%>
99
import {
1010
AfterViewInit,
@@ -63,8 +63,8 @@ import {<%= classify(name) %>DataSource} from './<%= cmpFileName %>-datasource';
6363
import {DomSanitizer} from '@angular/platform-browser';
6464
import {SelectionModel} from '@angular/cdk/collections';
6565
import { TranslocoService } from '@jsverse/transloco';
66-
import {PaginatorSelectConfigInjector} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/paginator-select-config.provider";
67-
import {JSSdkLocalStorageService} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/storage.service";
66+
import {EsmfPaginatorSelectConfigInjector} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/paginator-select-config.provider";
67+
import {EsmfLocalStorageService} from "<% if (options.enableVersionSupport) { %>../<% } %>../../services/storage.service";
6868
import {<%= classify(name) %>CommandBarComponent} from "./<%= cmpFileName %>-command-bar.component";
6969
import {<%= classify(name) %>ColumnMenuComponent} from './<%= cmpFileName %>-column-menu.component';
7070

@@ -88,7 +88,7 @@ import {<% if (options.enableRemoteDataHandling) { %>catchError, finalize, tap,
8888
<% } else { %>
8989
// TODO remove the commented line bellow
9090
// import {<%= classify(name) %>Service, <%= classify(aspectModelName) %>Response} from './<%= cmpFileName %>.service';
91-
import {StaticTableService} from '@esmf/semantic-ui-schematic';
91+
import {EsmfStaticTableService} from '@esmf/semantic-ui-schematic';
9292
<% } %>
9393

9494
<% if (options.hasSearchBar) { %>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ function commonImports(): string {
147147
private sanitizer: DomSanitizer,
148148
private translateService: TranslocoService,
149149
public dialog: MatDialog,
150-
private storageService: JSSdkLocalStorageService,
151-
@Inject(PaginatorSelectConfigInjector) public paginatorSelectConfig: MatPaginatorSelectConfig,
150+
private storageService: EsmfLocalStorageService,
151+
@Inject(EsmfPaginatorSelectConfigInjector) public paginatorSelectConfig: MatPaginatorSelectConfig,
152152
${sharedOptions.hasFilters ? `public filterService: ${sharedOptions.filterServiceName},` : ''}
153153
${
154154
sharedOptions.isDateQuickFilter

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
import {ComponentType} from '../shared/schema';
3131
import {generateStorageService} from './generators/services/storage/index';
3232
import {generateColumnMenu} from './generators/components/column-menu/index';
33-
import {generateConfigMenu} from './generators/components/config-menu/index';
3433
import {generateTableComponent} from './generators/components/table/index';
3534
import {generateDataSource} from './generators/data-source/index';
3635
import {TableSchema} from './schema';
@@ -68,6 +67,5 @@ function tableSpecificGeneration(): Array<Rule> {
6867
generateDataSource(options),
6968
generateStorageService(options), // General
7069
generateColumnMenu(options), // General
71-
generateConfigMenu(options), // General
7270
];
7371
}

0 commit comments

Comments
 (0)