Skip to content

Commit 254e429

Browse files
committed
Merge branch 'vnext' of https://github.com/IgniteUI/igniteui-angular-samples into vnext
2 parents 6a162a4 + 572fb82 commit 254e429

157 files changed

Lines changed: 7190 additions & 4633 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
],
1616
"createDefaultProgram": true
1717
},
18+
"plugins": [
19+
"@typescript-eslint"
20+
],
1821
"extends": [
1922
"plugin:@angular-eslint/recommended",
2023
"plugin:@angular-eslint/template/process-inline-templates"

.github/workflows/build-app-crm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
5050

5151
- name: Install dependencies
52-
run: npm ci
52+
run: npm ci --legacy-peer-deps
5353

5454
- name: Run lint
5555
run: npm run lint

.github/workflows/build-app-lob.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
5555

5656
- name: Install dependencies
57-
run: npm ci
57+
run: npm ci --legacy-peer-deps
5858

5959
- name: Run lint
6060
run: npm run lint

azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ steps:
1616

1717
- task: Npm@1
1818
inputs:
19-
command: 'ci'
19+
command: 'custom'
20+
customCommand: 'install --legacy-peer-deps'
2021
customEndpoint: 'public proget'
2122
env:
2223
AZURE_PIPELINES: "true"

live-editing/configs/ComboConfigGenerator.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,18 @@ export class ComboConfigGenerator implements IConfigGenerator {
138138
component: 'SimpleComboCascadingComponent'
139139
}));
140140

141+
configs.push(new Config({
142+
additionalFiles: ['/src/app/services/remoteNwind.service.ts'],
143+
appModuleConfig: new AppModuleConfig({
144+
imports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule',
145+
'HttpClientModule', 'RemoteNWindService', 'SimpleComboRemoteComponent'],
146+
ngDeclarations: ['SimpleComboRemoteComponent'],
147+
ngImports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule', 'HttpClientModule'],
148+
ngProviders: ['RemoteNWindService']
149+
}),
150+
component: 'SimpleComboRemoteComponent'
151+
}));
152+
141153
configs.push(new Config({
142154
additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
143155
appModuleConfig: new AppModuleConfig({

live-editing/configs/ExportCsvConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class ExportCsvConfigGenerator implements IConfigGenerator {
3131

3232
configs.push(new Config({
3333
component: 'TreeGridCsvExportSample1Component',
34-
additionalFiles: ["/src/app/tree-grid/data/foods.ts"],
34+
additionalFiles: ["/src/app/tree-grid/data/orders.ts"],
3535
appModuleConfig: new AppModuleConfig({
3636
imports: ['IgxTreeGridModule', 'IgxCsvExporterService', 'TreeGridCsvExportSample1Component'],
3737
ngDeclarations: ['TreeGridCsvExportSample1Component'],

live-editing/configs/ExportExcelConfigGenerator.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import {
1010
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
1111
export class ExportExcelConfigGenerator implements IConfigGenerator {
1212
public additionalImports = {
13-
PasteHandler: '../../src/app/grid/grid-paste/paste-handler.directive'
13+
PasteHandler: '../../src/app/grid/grid-paste/paste-handler.directive',
14+
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive'
1415
};
1516
public generateConfigs(): Config[] {
1617
const configs = new Array<Config>();
@@ -53,12 +54,12 @@ export class ExportExcelConfigGenerator implements IConfigGenerator {
5354

5455
configs.push(new Config({
5556
component: 'TreeGridExcelExportSample1Component',
56-
additionalFiles: ['/src/app/tree-grid/data/foods.ts'],
57+
additionalFiles: ['/src/app/tree-grid/data/orders.ts', '/src/app/directives/prevent-scroll.directive.ts',],
5758
appModuleConfig: new AppModuleConfig({
5859
imports: ['IgxTreeGridModule', 'IgxExcelExporterService', 'TreeGridExcelExportSample1Component',
59-
'IgxButtonModule'],
60+
'IgxButtonModule', 'IgxPreventDocumentScrollModule'],
6061
ngDeclarations: ['TreeGridExcelExportSample1Component'],
61-
ngImports: ['IgxTreeGridModule', 'IgxButtonModule'],
62+
ngImports: ['IgxTreeGridModule', 'IgxButtonModule', 'IgxPreventDocumentScrollModule'],
6263
ngProviders: ['IgxExcelExporterService']
6364
})
6465
}));

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 33 additions & 36 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)