Skip to content

Commit 68e12a3

Browse files
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into vNext
2 parents a2c8a0e + f90a7a0 commit 68e12a3

80 files changed

Lines changed: 6556 additions & 5905 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: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# This is a basic workflow to help you get started with Actions
22

3-
name: CI
3+
name: App CRM CI
44

55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ master, vNext]
9+
branches: [ master, vNext ]
1010
paths:
1111
- '**'
1212
- '!src/**'
1313
- '!live-editing/**'
1414
- '!projects/app-lob/**'
1515
pull_request:
16-
branches: [ master, vNext]
16+
branches: [ master, vNext ]
1717
paths:
1818
- '**'
1919
- '!src/**'
@@ -27,13 +27,23 @@ jobs:
2727
# The type of runner that the job will run on
2828
runs-on: ubuntu-latest
2929

30+
strategy:
31+
matrix:
32+
node-version: [16.x, 18.x]
33+
3034
# Steps represent a sequence of tasks that will be executed as part of the job
3135
steps:
3236
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3337
- uses: actions/checkout@v2
3438

39+
- name: Use Node.js ${{ matrix.node-version }}
40+
uses: actions/setup-node@v2
41+
with:
42+
node-version: ${{ matrix.node-version }}
43+
cache: 'npm'
44+
3545
- name: Install dependencies
36-
run: npm ci
46+
run: npm ci --force
3747

3848
- name: Run lint
3949
run: npm run lint

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# This is a basic workflow to help you get started with Actions
22

3-
name: CI
3+
name: App LOB CI
44

55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ master, vNext]
9+
branches: [ master, vNext ]
1010
paths:
1111
- '**'
1212
- '!src/**'
@@ -16,7 +16,7 @@ on:
1616
- 'live-editing/generators/AppDVConfigGenerators.ts'
1717
- '!projects/app-crm/**'
1818
pull_request:
19-
branches: [ master, vNext]
19+
branches: [ master, vNext ]
2020
paths:
2121
- '**'
2222
- '!src/**'
@@ -32,13 +32,23 @@ jobs:
3232
# The type of runner that the job will run on
3333
runs-on: ubuntu-latest
3434

35+
strategy:
36+
matrix:
37+
node-version: [16.x, 18.x]
38+
3539
# Steps represent a sequence of tasks that will be executed as part of the job
3640
steps:
3741
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3842
- uses: actions/checkout@v2
3943

44+
- name: Use Node.js ${{ matrix.node-version }}
45+
uses: actions/setup-node@v2
46+
with:
47+
node-version: ${{ matrix.node-version }}
48+
cache: 'npm'
49+
4050
- name: Install dependencies
41-
run: npm ci
51+
run: npm ci --force
4252

4353
- name: Run lint
4454
run: npm run lint

.github/workflows/codeql.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "master", "vNext" ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ "master", "vNext" ]
20+
schedule:
21+
- cron: '37 17 * * 1'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'javascript' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v3
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
# queries: security-extended,security-and-quality
54+
55+
56+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
57+
# If this step fails, then you should remove it and run the build manually (see below)
58+
- name: Autobuild
59+
uses: github/codeql-action/autobuild@v2
60+
61+
# ℹ️ Command-line programs to run using the OS shell.
62+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
63+
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
65+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
66+
67+
# - run: |
68+
# echo "Run, Build Application using script"
69+
# ./location_of_script_within_repo/buildscript.sh
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v2
73+
with:
74+
category: "/language:${{matrix.language}}"

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
- script: npm config set $(igScope):_auth=$(token)
1313
displayName: 'Npm config auth'
1414

15-
- script: npm ci
15+
- script: npm ci --force
1616
displayName: 'Install dependencies'
1717
env:
1818
AZURE_PIPELINES: "true"

live-editing/configs/GridConfigGenerator.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,18 @@ export class GridConfigGenerator implements IConfigGenerator {
14101410
})
14111411
}));
14121412

1413+
configs.push(new Config({
1414+
component: 'GridSummaryExportComponent',
1415+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
1416+
appModuleConfig: new AppModuleConfig({
1417+
imports: ['IgxGridModule', 'GridSummaryExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
1418+
ngDeclarations: ['GridSummaryExportComponent'],
1419+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxExcelExporterService'],
1420+
ngProviders: ['IgxExcelExporterService']
1421+
})
1422+
}));
1423+
1424+
14131425
return configs;
14141426
}
14151427
}

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,18 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
999999
})
10001000
}));
10011001

1002+
configs.push(new Config({
1003+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
1004+
'/src/app/hierarchical-grid/models.ts'],
1005+
appModuleConfig: new AppModuleConfig({
1006+
imports: ['IgxHierarchicalGridModule', 'HGridSummaryExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
1007+
ngDeclarations: ['HGridSummaryExportComponent'],
1008+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxExcelExporterService'],
1009+
ngProviders: ['IgxExcelExporterService']
1010+
}),
1011+
component: 'HGridSummaryExportComponent'
1012+
}));
1013+
10021014
return configs;
10031015
}
10041016
}

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,18 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
12011201
})
12021202
}));
12031203

1204+
configs.push(new Config({
1205+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/foods.ts'],
1206+
appModuleConfig: new AppModuleConfig({
1207+
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridSummaryExportComponent', 'IgxIconModule', 'IgxExcelExporterService'],
1208+
ngDeclarations: ['TreeGridSummaryExportComponent'],
1209+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxIconModule', 'IgxExcelExporterService'],
1210+
ngProviders: ['IgxExcelExporterService']
1211+
}),
1212+
component: 'TreeGridSummaryExportComponent',
1213+
shortenComponentPathBy: '/tree-grid/'
1214+
}));
1215+
12041216
return configs;
12051217
}
12061218
}

0 commit comments

Comments
 (0)