Skip to content

Commit 5def8ec

Browse files
ChronosSFChronosSF
committed
Merge remote-tracking branch 'origin/master' into sstoychev/fixing-matrix-strategy
2 parents 1fd1f52 + 4d5b972 commit 5def8ec

921 files changed

Lines changed: 10041 additions & 4352 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.

‎.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 install
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 install
5858

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

‎.github/workflows/deploy-trigger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ jobs:
8585
unit: false,
8686
integration: true
8787
}
88-
});
88+
});

‎azure-devops/app-cd.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ steps:
2828
inputs:
2929
versionSpec: 22.x
3030

31+
# - task: Npm@1
32+
# inputs:
33+
# command: custom
34+
# customCommand: 'install -g npm@latest'
35+
# displayName: 'Upgrade npm to latest version'
36+
3137
- task: PowerShell@2
3238
displayName: 'Replace with licensed angular-extras'
3339
inputs:

‎live-editing/Routes.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as TreeGridDvRoutingModule from '../projects/app-lob/src/app/tree-grid/
99
import * as DataDisplayRouting from '../src/app/data-display/data-display.routes';
1010
import * as DataEntriesRouting from '../src/app/data-entries/data-entries.routes';
1111
import * as GridRouting from '../src/app/grid/grids.routes';
12+
import * as GridLiteRouting from '../src/app/grid-lite/grid-lite.routes';
1213
import * as PivotGridRouting from '../src/app/pivot-grid/pivot-grids.routes';
1314
import * as HierarchicalGridRouting from '../src/app/hierarchical-grid/hierarchical-grid.routes';
1415
import * as InteractionsRouting from '../src/app/interactions/interactions.routes';
@@ -68,6 +69,10 @@ export const MODULE_ROUTES = [
6869
path: 'grid',
6970
routes: GridRouting.GridsRoutes
7071
},
72+
{
73+
path: 'grid-lite',
74+
routes: GridLiteRouting.GridLiteRoutes
75+
},
7176
{
7277
path: 'pivot-grid',
7378
routes: PivotGridRouting.PivotGridsRoutes

‎live-editing/configs/AccordionConfigGenerator.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import {
2-
IgxAccordionModule,
3-
IgxRadioModule,
4-
IgxTimePickerModule,
5-
IgxSliderModule,
6-
IgxCheckboxModule,
7-
IgxSwitchModule,
8-
IgxIconModule
9-
} from 'igniteui-angular';
1+
import { IgxAccordionModule } from 'igniteui-angular/accordion';
2+
import { IgxRadioModule } from 'igniteui-angular/radio';
3+
import { IgxTimePickerModule } from 'igniteui-angular/time-picker';
4+
import { IgxSliderModule } from 'igniteui-angular/slider';
5+
import { IgxCheckboxModule } from 'igniteui-angular/checkbox';
6+
import { IgxSwitchModule } from 'igniteui-angular/switch';
7+
import { IgxIconModule } from 'igniteui-angular/icon';
108
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing'
119
import { BaseAppConfig } from './BaseConfig';
1210

‎live-editing/configs/ActionStripConfigGenerator.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
/* eslint-disable max-len */
2-
import {
3-
IgxActionStripModule,
4-
IgxRippleModule,
5-
IgxButtonModule,
6-
IgxIconModule,
7-
IgxButtonGroupModule
8-
} from 'igniteui-angular';
2+
import { IgxActionStripModule } from 'igniteui-angular/action-strip';
3+
import { IgxButtonModule, IgxRippleModule } from 'igniteui-angular/directives';
4+
import { IgxIconModule } from 'igniteui-angular/icon';
5+
import { IgxButtonGroupModule } from 'igniteui-angular/button-group';
96
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing'
107
import { BaseAppConfig } from './BaseConfig';
118
export class ActionStripConfigGenerator implements IConfigGenerator {

‎live-editing/configs/AutocompleteConfigGenerator.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import {
2-
IgxAutocompleteModule,
3-
IgxDropDownModule,
4-
IgxInputGroupModule
5-
} from 'igniteui-angular';
1+
import { IgxAutocompleteModule, IgxDropDownModule } from 'igniteui-angular/drop-down';
2+
import { IgxInputGroupModule } from 'igniteui-angular/input-group';
63

74
import { Config, IConfigGenerator, AppModuleConfig } from 'igniteui-live-editing'
85
import { BaseAppConfig } from './BaseConfig';

‎live-editing/configs/AvatarConfigGenerator.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IgxAvatarModule } from 'igniteui-angular';
1+
import { IgxAvatarModule } from 'igniteui-angular/avatar';
22
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing'
33
import { BaseAppConfig } from './BaseConfig';
44
export class AvatarConfigGenerator implements IConfigGenerator {

‎live-editing/configs/BadgeConfigGenerator.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import {
2-
IgxAvatarModule,
3-
IgxBadgeModule,
4-
IgxListModule
5-
} from 'igniteui-angular';
1+
import { IgxAvatarModule } from 'igniteui-angular/avatar';
2+
import { IgxBadgeModule } from 'igniteui-angular/badge';
3+
import { IgxListModule } from 'igniteui-angular/list';
64
import { Config, IConfigGenerator, AppModuleConfig } from 'igniteui-live-editing'
75
import { BaseAppConfig } from './BaseConfig';
86
export class BadgeConfigGenerator implements IConfigGenerator {

0 commit comments

Comments
 (0)