Skip to content

Commit

Permalink
Merge pull request #3095 from IgniteUI/vNext
Browse files Browse the repository at this point in the history
updating master with vNext
  • Loading branch information
ChronosSF authored Sep 13, 2022
2 parents ed2fc3b + 4b7761f commit 3dac621
Show file tree
Hide file tree
Showing 126 changed files with 8,262 additions and 8,048 deletions.
708 changes: 354 additions & 354 deletions angular.json

Large diffs are not rendered by default.

168 changes: 122 additions & 46 deletions live-editing/configs/GridConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
/* eslint-disable max-len */
/* eslint-disable @typescript-eslint/naming-convention */
import {CommonModule} from '@angular/common';
import {HttpClientModule} from '@angular/common/http';
import {Router,
RouterModule} from '@angular/router';
import {IgxActionStripModule,
IgxAvatarModule,
IgxBadgeModule,
IgxButtonGroupModule,
IgxButtonModule,
IgxCheckboxModule,
IgxChipsModule,
IgxComboModule,
IgxCsvExporterService,
IgxDatePickerModule,
IgxDialogModule,
IgxDividerModule,
IgxDragDropModule,
IgxExcelExporterService,
IgxExpansionPanelModule,
IgxFocusModule,
IgxGridModule,
IgxIconModule,
IgxInputGroupModule,
IgxListModule,
IgxOverlayService,
IgxProgressBarModule,
IgxRadioModule,
IgxRippleModule,
IgxSelectModule,
IgxSnackbarModule,
IgxSwitchModule,
IgxTabsModule,
IgxToastModule,
IgxTooltipModule,
IgxToggleModule} from 'igniteui-angular';
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
import { CommonModule } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import {
Router,
RouterModule
} from '@angular/router';
import {
IgxActionStripModule,
IgxAvatarModule,
IgxBadgeModule,
IgxButtonGroupModule,
IgxButtonModule,
IgxCheckboxModule,
IgxChipsModule,
IgxComboModule,
IgxCsvExporterService,
IgxDatePickerModule,
IgxDialogModule,
IgxDividerModule,
IgxDragDropModule,
IgxExcelExporterService,
IgxExpansionPanelModule,
IgxFocusModule,
IgxGridModule,
IgxIconModule,
IgxInputGroupModule,
IgxListModule,
IgxOverlayService,
IgxProgressBarModule,
IgxRadioModule,
IgxRippleModule,
IgxSelectModule,
IgxSnackbarModule,
IgxSwitchModule,
IgxTabsModule,
IgxToastModule,
IgxTooltipModule,
IgxToggleModule
} from 'igniteui-angular';
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
export class GridConfigGenerator implements IConfigGenerator {
public additionalImports = {
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
Expand All @@ -49,7 +53,7 @@ export class GridConfigGenerator implements IConfigGenerator {
RemoteServiceVirt: '../../src/app/services/remoteVirtualization.service',
FinancialDataService: '../../src/app/services/financial.service',
CRUDService: '../../src/app/services/crud.service'
};
};
public generateConfigs(): Config[] {
const configs = new Array<Config>();

Expand Down Expand Up @@ -196,7 +200,7 @@ export class GridConfigGenerator implements IConfigGenerator {
appModuleConfig: new AppModuleConfig({
imports: ['HttpClientModule', 'IgxAvatarModule', 'IgxBadgeModule', 'IgxButtonModule', 'IgxSnackbarModule',
'IgxGridModule', 'IgxIconModule', 'IgxInputGroupModule', 'IgxSwitchModule', 'GridSelectionSampleComponent', 'IgxPreventDocumentScrollModule',
'FinancialDataService'],
'FinancialDataService'],
ngDeclarations: ['GridSelectionSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxAvatarModule', 'IgxBadgeModule', 'IgxButtonModule', 'IgxGridModule', 'IgxSnackbarModule',
'IgxIconModule', 'IgxInputGroupModule', 'IgxSwitchModule', 'HttpClientModule'],
Expand Down Expand Up @@ -473,6 +477,16 @@ export class GridConfigGenerator implements IConfigGenerator {
})
}));

configs.push(new Config({
component: 'GridExcelStyleEditingComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['GridExcelStyleEditingComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridExcelStyleEditingComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
})
}));

configs.push(new Config({
component: 'GridEditingStyleSampleComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
Expand Down Expand Up @@ -785,7 +799,7 @@ export class GridConfigGenerator implements IConfigGenerator {

configs.push(new Config({
component: 'GridNestedDataBindComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nested-employee-data.ts'],
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nested-employee-data.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
appModuleConfig: new AppModuleConfig({
imports: ['GridNestedDataBindComponent', 'IgxGridModule', 'IgxInputGroupModule', 'IgxExpansionPanelModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridNestedDataBindComponent'],
Expand All @@ -795,7 +809,7 @@ export class GridConfigGenerator implements IConfigGenerator {

configs.push(new Config({
component: 'GridNestedDataBindAminoacidComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/amino-data.ts'],
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/amino-data.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
appModuleConfig: new AppModuleConfig({
imports: ['GridNestedDataBindAminoacidComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridNestedDataBindAminoacidComponent'],
Expand All @@ -805,7 +819,7 @@ export class GridConfigGenerator implements IConfigGenerator {

configs.push(new Config({
component: 'GridCompositeDataComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
appModuleConfig: new AppModuleConfig({
imports: ['GridCompositeDataComponent', 'IgxGridModule', 'IgxInputGroupModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridCompositeDataComponent'],
Expand Down Expand Up @@ -1256,7 +1270,7 @@ export class GridConfigGenerator implements IConfigGenerator {
appModuleConfig: new AppModuleConfig({
imports: ['GridAddRowSampleComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule'],
ngDeclarations: ['GridAddRowSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule','IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule']
})
}));

Expand All @@ -1275,7 +1289,7 @@ export class GridConfigGenerator implements IConfigGenerator {
component: 'GridSelectComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/grid/grid-select/data.ts', '/src/app/grid/grid-select/characters.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule', 'GridSelectComponent' ],
imports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule', 'GridSelectComponent'],
ngDeclarations: ['GridSelectComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule']
})
Expand Down Expand Up @@ -1317,23 +1331,85 @@ export class GridConfigGenerator implements IConfigGenerator {
component: 'GridRowClassesComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
appModuleConfig: new AppModuleConfig({
imports: [ 'IgxGridModule', 'GridRowClassesComponent', 'IgxPreventDocumentScrollModule'],
imports: ['IgxGridModule', 'GridRowClassesComponent', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridRowClassesComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
})
}));

configs.push(new Config({
component: 'GridRowStylesComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts', '/src/app/data/financialData.ts'],
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts', '/src/app/data/financialData.ts'],
appModuleConfig: new AppModuleConfig({
imports: [ 'IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
imports: ['IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
ngDeclarations: ['GridRowStylesComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
ngProviders: ['FinancialDataService']
})
}));

configs.push(new Config({
component: 'GridValidatorServiceComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/employeesData.ts'

],
appModuleConfig: new AppModuleConfig({
imports: ['GridValidatorServiceComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridValidatorServiceComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule']
})
}));

configs.push(new Config({
component: 'GridColumnAutosizingComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxGridModule', 'GridColumnAutosizingComponent', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridColumnAutosizingComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
})
}));

configs.push(new Config({
component: 'GridValidatorServiceCrossFieldComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/employeesData.ts'

],
appModuleConfig: new AppModuleConfig({
imports: ['GridValidatorServiceCrossFieldComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridValidatorServiceCrossFieldComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule', 'IgxTooltipModule']
})
}));

configs.push(new Config({
component: 'GridValidationStyleComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxGridModule', 'GridValidationStyleComponent', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridValidationStyleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
})
}));

configs.push(new Config({
component: 'GridValidatorServiceExtendedComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/employeesData.ts'

],
appModuleConfig: new AppModuleConfig({
imports: ['GridValidatorServiceExtendedComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['GridValidatorServiceExtendedComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule']
})
}));

return configs;
}
}
65 changes: 65 additions & 0 deletions live-editing/configs/HierarchicalGridConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
/* eslint-disable max-len */
import {ReactiveFormsModule} from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import {
IgxActionStripModule,
Expand Down Expand Up @@ -934,6 +935,70 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
})
}));

configs.push(new Config({
component: 'HierarchicalGridValidatorServiceComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/hierarchical-data.ts'
],
appModuleConfig: new AppModuleConfig({
imports: ['HierarchicalGridValidatorServiceComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['HierarchicalGridValidatorServiceComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
})
}));


configs.push(new Config({
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent'],
ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
}),
component: 'HGridColumnAutoSizingSampleComponent'
}));


configs.push(new Config({
component: 'HierarchicalGridValidatorServiceCrossCellComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/hierarchical-data.ts'

],
appModuleConfig: new AppModuleConfig({
imports: ['HierarchicalGridValidatorServiceCrossCellComponent', 'IgxHierarchicalGridModule', 'IgxTooltipModule', 'ReactiveFormsModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['HierarchicalGridValidatorServiceCrossCellComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxTooltipModule', 'ReactiveFormsModule']
})
}));

configs.push(new Config({
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
'/src/app/hierarchical-grid/models.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxHierarchicalGridModule', 'HGridValidationStyleComponent', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['HGridValidationStyleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
}),
component: 'HGridValidationStyleComponent'
}));

configs.push(new Config({
component: 'HierarchicalGridValidatorServiceExtendedComponent',
additionalFiles: [
'/src/app/directives/prevent-scroll.directive.ts',
'/src/app/data/hierarchical-data.ts'

],
appModuleConfig: new AppModuleConfig({
imports: ['HierarchicalGridValidatorServiceExtendedComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule'],
ngDeclarations: ['HierarchicalGridValidatorServiceExtendedComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
})
}));

return configs;
}
}
13 changes: 13 additions & 0 deletions live-editing/configs/ListConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,19 @@ export class ListConfigGenerator implements IConfigGenerator {
shortenComponentPathBy: "/lists/list/"
}));

// list item selection
configs.push(new Config({
component: 'ListItemSelectionComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxAvatarModule', 'IgxFilterModule', 'IgxIconModule', 'IgxListModule',
'IgxInputGroupModule', 'ListItemSelectionComponent'],
ngDeclarations: ['ListItemSelectionComponent'],
ngImports: ['IgxAvatarModule', 'IgxFilterModule', 'IgxIconModule', 'IgxListModule',
'IgxInputGroupModule']
}),
shortenComponentPathBy: "/lists/list/"
}));

return configs;
}
}
Loading

0 comments on commit 3dac621

Please sign in to comment.