Skip to content

Commit e9afe8a

Browse files
authored
Merge pull request #3568 from IgniteUI/sstoychev/app-crm-fix
fix(crm-app): moving to new routing
2 parents e161e56 + 4904e52 commit e9afe8a

9 files changed

Lines changed: 18 additions & 11 deletions

azure-devops/templates/cd-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ steps:
112112
- task: CopyFiles@2
113113
displayName: Copy web.config
114114
inputs:
115-
SourceFolder: $(Build.SourcesDirectory)
115+
SourceFolder: $(Build.SourcesDirectory)/projects/app-crm/
116116
Contents: web.config
117117
TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser
118118

live-editing/configs/ExportCsvConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
55
import { BaseAppConfig } from './BaseConfig';
66
export class ExportCsvConfigGenerator implements IConfigGenerator {
77
public additionalImports = {
8-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive'
8+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive'
99
};
1010

1111
public generateConfigs(): Config[] {

live-editing/configs/ExportExcelConfigGenerator.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { BaseAppConfig } from './BaseConfig';;
1313
export class ExportExcelConfigGenerator implements IConfigGenerator {
1414
public additionalImports = {
1515
PasteHandler: '../../src/app/grid/grid-paste/paste-handler.directive',
16-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive'
16+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive'
1717
};
1818
public generateConfigs(): Config[] {
1919
const configs = new Array<Config>();
@@ -32,15 +32,21 @@ export class ExportExcelConfigGenerator implements IConfigGenerator {
3232

3333
configs.push(new Config({
3434
component: 'GridPasteSampleComponent',
35-
additionalFiles: ['/src/app/grid/grid-paste/data.ts',
36-
'/src/app/grid/grid-paste/paste-handler.directive.ts'],
35+
additionalFiles: [
36+
'/src/app/grid/grid-paste/data.ts',
37+
'/src/app/grid/grid-paste/paste-handler.directive.ts',
38+
'/src/app/directives/prevent-scroll.directive.ts'
39+
],
3740
appConfig: BaseAppConfig,
3841
shortenComponentPathBy: '/grid-paste/'
3942
}));
4043

4144
configs.push(new Config({
4245
component: 'TreeGridExcelExportSample1Component',
43-
additionalFiles: ['/src/app/tree-grid/data/orders.ts', '/src/app/directives/prevent-scroll.directive.ts',],
46+
additionalFiles: [
47+
'/src/app/tree-grid/data/orders.ts',
48+
'/src/app/directives/prevent-scroll.directive.ts'
49+
],
4450
appConfig: BaseAppConfig
4551
}));
4652

live-editing/configs/GridCRMConfigGenerator.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { Config, IConfigGenerator, AppModuleConfig } from 'igniteui-live-editing'
44
import { BaseAppConfig } from './BaseConfig';;
55
import { FormsModule } from '@angular/forms';
6+
import { IgxPreventDocumentScrollDirective } from '../../src/app/directives/prevent-scroll.directive';
67

78
export class GridCRMConfigGenerator implements IConfigGenerator {
89
public generateConfigs(): Config[] {

live-editing/configs/GridConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { Config, IConfigGenerator } from 'igniteui-live-editing'
4747
import { BaseAppConfig } from './BaseConfig';;
4848
export class GridConfigGenerator implements IConfigGenerator {
4949
public additionalImports = {
50-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
50+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
5151
ContextmenuComponent: '../../src/app/grid/grid-contextmenu-sample/contextmenu/contextmenu.component',
5252
RemoteValuesService: '../../src/app/grid/grid-excel-style-filtering-load-on-demand/remoteValues.service',
5353
PlanetComponent: '../../src/app/grid/grid-row-drag/planet/planet.component',

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { BaseAppConfig } from './BaseConfig';;
3131
import { Router, RouterModule } from '@angular/router';
3232
export class HierarchicalGridConfigGenerator implements IConfigGenerator {
3333
public additionalImports = {
34-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
34+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
3535
RemoteValuesService: '../../src/app/services/remoteValues.service',
3636
HGridContextmenuComponent: '../../src/app/hierarchical-grid/hierarchical-grid-sorting/hgrid-contextmenu/hgrid-contextmenu.component',
3737
RemoteLoDService: '../../src/app/services/remote-lod.service'

live-editing/configs/PivotGridConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing
1717
import { BaseAppConfig } from './BaseConfig';;
1818
export class PivotGridConfigGenerator implements IConfigGenerator {
1919
public additionalImports = {
20-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
20+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
2121
PivotDataService: '../../src/app/services/pivotRemoteData.service'
2222
};
2323
public generateConfigs(): Config[] {

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing
3939
import { BaseAppConfig } from './BaseConfig';;
4040
export class TreeGridConfigGenerator implements IConfigGenerator {
4141
public additionalImports = {
42-
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
42+
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
4343
RemoteValuesService: '../../src/app/tree-grid/tree-grid-excel-style-filtering-load-on-demand/remoteValues.service',
4444
TreeGridContextmenuComponent: '../../src/app/tree-grid/tree-grid-sorting-sample/tree-grid-contextmenu/tree-grid-contextmenu.component'
4545
};

live-editing/configs/app-dv-configs/DVHierarchicalGridConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { BaseAppConfig } from '../BaseConfig';
1010

1111
export class DVHierarchicalGridConfigGenerator implements IConfigGenerator {
1212
public additionalImports = {
13-
IgxPreventDocumentScrollModule: '../../../src/app/directives/prevent-scroll.directive',
13+
IgxPreventDocumentScrollDirective: '../../../src/app/directives/prevent-scroll.directive',
1414
RemoteValuesService: '../../../projects/app-lob/src/app/services/remoteValues.service'
1515
};
1616

0 commit comments

Comments
 (0)