Skip to content

Commit

Permalink
Merge pull request #3445 from IgniteUI/vnext
Browse files Browse the repository at this point in the history
Merging vnext to master
  • Loading branch information
ChronosSF committed Feb 27, 2024
2 parents 08123f4 + 1b6bc0c commit dc7a116
Show file tree
Hide file tree
Showing 246 changed files with 9,266 additions and 9,421 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-app-crm.yml
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
node-version: [18.x, 20.5.x]
node-version: [18.x, 20.x]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-app-lob.yml
Expand Up @@ -34,7 +34,7 @@ jobs:

strategy:
matrix:
node-version: [18.x, 20.5.x]
node-version: [18.x, 20.x]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
4 changes: 2 additions & 2 deletions ignite-ui-cli.json
Expand Up @@ -3,7 +3,7 @@
"project": {
"defaultPort": 4200,
"framework": "angular",
"projectType": "igx-ts",
"projectType": "igx-ts-legacy",
"projectTemplate": "side-nav",
"theme": "Custom",
"isBundle": false,
Expand All @@ -16,4 +16,4 @@
},
"build": {},
"packagesInstalled": true
}
}
8 changes: 4 additions & 4 deletions live-editing/configs/GridConfigGenerator.ts
Expand Up @@ -585,9 +585,9 @@ export class GridConfigGenerator implements IConfigGenerator {
component: 'GridConditionalCellStyle2Component',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/athletesData.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxGridModule', 'GridConditionalCellStyle2Component', 'IgxPreventDocumentScrollModule'],
imports: ['IgxGridModule', 'GridConditionalCellStyle2Component', 'IgxPreventDocumentScrollModule', 'IgxButtonModule', 'IgxInputGroupModule'],
ngDeclarations: ['GridConditionalCellStyle2Component'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxButtonModule', 'IgxInputGroupModule']
})
}));

Expand Down Expand Up @@ -1345,9 +1345,9 @@ export class GridConfigGenerator implements IConfigGenerator {
component: 'GridRowStylesComponent',
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', 'IgxBadgeModule', 'FinancialDataService'],
ngDeclarations: ['GridRowStylesComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxBadgeModule'],
ngProviders: ['FinancialDataService']
})
}));
Expand Down
8 changes: 4 additions & 4 deletions live-editing/configs/HierarchicalGridConfigGenerator.ts
Expand Up @@ -907,9 +907,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
'/src/app/hierarchical-grid/models.ts'],
component: 'HGridRowClassesSampleComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowClassesSampleComponent'],
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule', 'HGridRowClassesSampleComponent'],
ngDeclarations: ['HGridRowClassesSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule']
})
}));

Expand All @@ -918,9 +918,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
'/src/app/hierarchical-grid/models.ts'],
component: 'HGridRowStylesSampleComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowStylesSampleComponent'],
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule', 'HGridRowStylesSampleComponent'],
ngDeclarations: ['HGridRowStylesSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule']
})
}));

Expand Down
101 changes: 101 additions & 0 deletions live-editing/configs/IconButtonConfigGenerator.ts
@@ -0,0 +1,101 @@
import {IgxButtonGroupModule,
IgxButtonModule,
IgxIconButtonDirective,
IgxIconModule,
IgxRippleModule} from 'igniteui-angular';
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
export class IconButtonConfigGenerator implements IConfigGenerator {
public generateConfigs(): Config[] {
const configs = new Array<Config>();

// icon button overview
configs.push(new Config({
component: 'IconButtonOverviewComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonOverviewComponent'],
ngDeclarations: ['IconButtonOverviewComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// flat icon button
configs.push(new Config({
component: 'FlatIconButtonComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'FlatIconButtonComponent'],
ngDeclarations: ['FlatIconButtonComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// contained icon button
configs.push(new Config({
component: 'ContainedIconButtonComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'ContainedIconButtonComponent'],
ngDeclarations: ['ContainedIconButtonComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// outlined icon button
configs.push(new Config({
component: 'OutlinedIconButtonComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'OutlinedIconButtonComponent'],
ngDeclarations: ['OutlinedIconButtonComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// disabled icon button
configs.push(new Config({
component: 'DisabledIconButtonComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'DisabledIconButtonComponent'],
ngDeclarations: ['DisabledIconButtonComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// SVG icon button
configs.push(new Config({
component: 'SVGIconButtonComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'SVGIconButtonComponent'],
ngDeclarations: ['SVGIconButtonComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// icon button styling
configs.push(new Config({
component: 'IconButtonStylingComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonStylingComponent'],
ngDeclarations: ['IconButtonStylingComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

// icon button size
configs.push(new Config({
component: 'IconButtonSizeComponent',
appModuleConfig: new AppModuleConfig({
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonSizeComponent'],
ngDeclarations: ['IconButtonSizeComponent'],
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
}),
shortenComponentPathBy: "/data-entries/icon-button/"
}));

return configs;
}
}
10 changes: 4 additions & 6 deletions live-editing/configs/TreeGridConfigGenerator.ts
Expand Up @@ -866,9 +866,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
component: 'TreeGridConditionalCellStyle2Component',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/orders.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridConditionalCellStyle2Component'],
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxInputGroupModule', 'TreeGridConditionalCellStyle2Component'],
ngDeclarations: ['TreeGridConditionalCellStyle2Component'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxInputGroupModule']
})
}));

Expand Down Expand Up @@ -1072,11 +1072,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
configs.push(new Config({
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat.ts', '/src/app/tree-grid/tree-grid-add-row-sample/employee.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridAddRowSampleComponent', 'IgxButtonModule', 'IgxDialogModule',
'IgxInputGroupModule', 'IgxCheckboxModule', 'IgxDatePickerModule', 'IgxActionStripModule'],
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridAddRowSampleComponent', 'IgxIconModule', 'IgxActionStripModule'],
ngDeclarations: ['TreeGridAddRowSampleComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxDialogModule',
'IgxInputGroupModule', 'IgxCheckboxModule', 'IgxDatePickerModule', 'IgxActionStripModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxIconModule', 'IgxActionStripModule']
}),
component: 'TreeGridAddRowSampleComponent',
shortenComponentPathBy: '/tree-grid/'
Expand Down
2 changes: 2 additions & 0 deletions live-editing/generators/ConfigGenerators.ts
Expand Up @@ -28,6 +28,7 @@ import { ForConfigGenerator } from '../configs/ForConfigGenerator';
import { GridConfigGenerator } from '../configs/GridConfigGenerator';
import { HierarchicalGridConfigGenerator } from '../configs/HierarchicalGridConfigGenerator';
import { IconConfigGenerator } from '../configs/IconConfigGenerator';
import { IconButtonConfigGenerator } from '../configs/IconButtonConfigGenerator';
import { InputGroupConfigGenerator } from '../configs/InputGroupConfigGenerator';
import { LayoutConfigGenerator } from '../configs/LayoutConfigGenerator';
import { LinearProgressbarConfigGenerator } from '../configs/LinearProgressbarConfigGenerator';
Expand Down Expand Up @@ -99,6 +100,7 @@ export const CONFIG_GENERATORS =
DateRangePickerConfigGenerator,
DateTimeEditorConfigGenerator,
DropDownConfigGenerator,
IconButtonConfigGenerator,
InputGroupConfigGenerator,
MaskConfigGenerator,
MonthPickerConfigGenerator,
Expand Down

0 comments on commit dc7a116

Please sign in to comment.