Skip to content

Commit 770eedd

Browse files
authored
Merge pull request #1126 from IgniteUI/vnext
Updating Production for 7.0.0
2 parents f879c82 + 36e3b60 commit 770eedd

1,212 files changed

Lines changed: 31446 additions & 14187 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/node.js.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,16 @@ jobs:
1414

1515
runs-on: ubuntu-latest
1616

17-
strategy:
18-
matrix:
19-
node-version: [16.x, 18.x]
20-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
21-
2217
# defaults:
2318
# run:
2419
# working-directory: ./browser # The working directory path
2520

2621
steps:
2722
- uses: actions/checkout@v3
28-
- name: Use Node.js ${{ matrix.node-version }}
23+
- name: Use Node.js
2924
uses: actions/setup-node@v3
3025
with:
31-
node-version: ${{ matrix.node-version }}
26+
node-version: 22.x
3227
cache: 'npm'
3328
# cache-dependency-path: browser/package-lock.json
3429

azure-pipelines/build-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ stages:
3535
displayName: 'Install Node'
3636
inputs:
3737
versionSource: 'spec'
38-
versionSpec: '20.x'
38+
versionSpec: '22.15.1'
3939

4040
- task: Npm@1
4141
displayName: 'Register licensed npm registry in .npmrc'

browser/public/index.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/polar-spline-chart"><span>Polar Spline Chart</span></a>
185185
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-area-chart"><span>Radial Area Chart</span></a>
186186
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-area-chart-styling"><span>Radial Area Chart Styling</span></a>
187+
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-chart-animation"><span>Radial Chart Animation</span></a>
187188
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-chart-types"><span>Radial Chart Types</span></a>
188189
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-column-chart"><span>Radial Column Chart</span></a>
189190
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/radial-column-chart-selection"><span>Radial Column Chart Selection</span></a>
@@ -376,6 +377,13 @@
376377
<a class="nav-link" href="#" data-nav="/samples/excel/spreadsheet/sort-dialog"><span>Sort Dialog</span></a>
377378
</div>
378379

380+
<div class="nav-group">GALLERY</div>
381+
<label id="nav-themes" class="nav-component">Themes</label>
382+
<div id="nav-themes-list" class="nav-list" state="collapsed">
383+
<a class="nav-link" href="#" data-nav="/samples/gallery/themes/dark-theme"><span>Dark Theme</span></a>
384+
<a class="nav-link" href="#" data-nav="/samples/gallery/themes/light-theme"><span>Light Theme</span></a>
385+
</div>
386+
379387
<div class="nav-group">GAUGES</div>
380388
<label id="nav-bullet-graph" class="nav-component">Bullet Graph</label>
381389
<div id="nav-bullet-graph-list" class="nav-list" state="collapsed">
@@ -612,6 +620,7 @@
612620
<a class="nav-link" href="#" data-nav="/samples/grids/grid-lite/sort-config-grid"><span>Sort Config Grid</span></a>
613621
<a class="nav-link" href="#" data-nav="/samples/grids/grid-lite/sort-config-pipeline"><span>Sort Config Pipeline</span></a>
614622
<a class="nav-link" href="#" data-nav="/samples/grids/grid-lite/sort-config-sample"><span>Sort Config Sample</span></a>
623+
<a class="nav-link" href="#" data-nav="/samples/grids/grid-lite/styling-config-themes"><span>Styling Config Themes</span></a>
615624
<a class="nav-link" href="#" data-nav="/samples/grids/grid-lite/styling-custom-theme"><span>Styling Custom Theme</span></a>
616625
</div>
617626
<label id="nav-hierarchical-grid" class="nav-component">Hierarchical Grid</label>
@@ -821,6 +830,7 @@
821830
<div class="nav-group">INPUTS</div>
822831
<label id="nav-badge" class="nav-component">Badge</label>
823832
<div id="nav-badge-list" class="nav-list" state="collapsed">
833+
<a class="nav-link" href="#" data-nav="/samples/inputs/badge/dot"><span>Dot</span></a>
824834
<a class="nav-link" href="#" data-nav="/samples/inputs/badge/outlined"><span>Outlined</span></a>
825835
<a class="nav-link" href="#" data-nav="/samples/inputs/badge/shape"><span>Shape</span></a>
826836
<a class="nav-link" href="#" data-nav="/samples/inputs/badge/styling"><span>Styling</span></a>
@@ -1012,6 +1022,11 @@
10121022
<a class="nav-link" href="#" data-nav="/samples/interactions/chat/overview"><span>Overview</span></a>
10131023
<a class="nav-link" href="#" data-nav="/samples/interactions/chat/styling"><span>Styling</span></a>
10141024
</div>
1025+
<label id="nav-query-builder" class="nav-component">Query Builder</label>
1026+
<div id="nav-query-builder-list" class="nav-list" state="collapsed">
1027+
<a class="nav-link" href="#" data-nav="/samples/interactions/query-builder/overview"><span>Overview</span></a>
1028+
<a class="nav-link" href="#" data-nav="/samples/interactions/query-builder/template"><span>Template</span></a>
1029+
</div>
10151030

10161031
<div class="nav-group">LAYOUTS</div>
10171032
<label id="nav-accordion" class="nav-component">Accordion</label>

browser/src/assets/css/browser.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,12 @@ html, body, .sample-content {
143143
width: 20px;
144144
height: 20px;
145145
display: inline-block;
146+
}
147+
148+
img[src*="dl.infragistics.com/x/img/people"] {
149+
width: 62px;
150+
height: 62px;
151+
object-fit: cover;
152+
display: block;
153+
margin: auto;
146154
}

browser/src/router.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { RouterCharts } from "./samples/charts/router";
33
import { RouterEditors } from "./samples/editors/router";
44
import { RouterExcel } from "./samples/excel/router";
5+
import { RouterGallery } from "./samples/gallery/router";
56
import { RouterGauges } from "./samples/gauges/router";
67
import { RouterGrids } from "./samples/grids/router";
78
import { RouterInputs } from "./samples/inputs/router";
@@ -105,6 +106,9 @@ export class Router {
105106
else if (route.indexOf("/excel/") >= 0) {
106107
this.displaySample(await RouterExcel.get(route));
107108
}
109+
else if (route.indexOf("/gallery/") >= 0) {
110+
this.displaySample(await RouterGallery.get(route));
111+
}
108112
else if (route.indexOf("/gauges/") >= 0) {
109113
this.displaySample(await RouterGauges.get(route));
110114
}

browser/tasks/Transformer.ts

Lines changed: 58 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@ let igConfig = require('./gulp-config.js');
1212

1313
// this class provides information about a sample that is implemented in /samples folder
1414
class SampleInfo {
15-
public ComponentGroup: string; // maps
16-
public ComponentFolder: string; // geo-map
17-
public ComponentName: string; // Geo Map
18-
public ComponentID: string; // GeoMap
19-
20-
public HtmlFilePath: string; // /samples/maps/geo-map/binding-csv-points/index.html
21-
public HtmlFileCode: string; // html code of above file
22-
public HtmlFileRoot: string; // root code of above file
23-
24-
// public SampleDirOnDisk: string; // C:\repo\igniteui-web-comp-examples\samples\maps\geo-map\binding-csv-points\
25-
public SampleFolderPath: string; // /samples/maps/geo-map/binding-csv-points/
26-
public SampleFilePath: string; // /samples/maps/geo-map/binding-csv-points/src/MapBindingDataCSV.ts
27-
public SampleRouteOld: string; // /maps/geo-map-binding-csv-points/
28-
public SampleRouteNew: string; // /maps/geo-map/binding-csv-points/
29-
public SampleFolderName: string; // binding-csv-points
30-
public SampleFileName: string; // MapBindingDataCSV.ts
31-
public SampleImportName: string; // MapBindingDataCSV
32-
public SampleImportPath: string; // ./geo-map/binding-csv-points/MapBindingDataCSV
33-
public SampleDisplayName: string; // Map Binding Data CSV
34-
public SampleFileSourcePath: string; // /src/MapBindingDataCSV.ts
35-
public SampleFileSourceCode: string; // source code from /src/MapBindingDataCSV.ts file
36-
public SampleFileBrowserCode: string; // source code for a sample in browser
37-
public SampleFileSourceClass: string; // MapBindingDataCSV
38-
public SampleFileOriginalClass: string; // MapBindingDataCSV
39-
40-
public SampleImportLines: string[];
41-
public SampleImportPackages: string[];
42-
public SampleImportFiles: string[];
43-
public SampleReadMe: string; // content of ReadMe.md file generated for /samples/maps/geo-map/binding-csv-points/
44-
public SampleFilePaths: string[]; // relative paths to files in sample folder: /samples/maps/geo-map/binding-csv-points/
45-
public SampleFileNames: string[]; // names of files in sample folder: /samples/maps/geo-map/binding-csv-points/
46-
47-
public DocsUrl: string // https://infragistics.com/webcomponentssite/components/geo-map.html
48-
49-
public SandboxUrlView: string; // https://codesandbox.io/embed/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
50-
public SandboxUrlEdit: string; // https://codesandbox.io/s/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
51-
public SandboxUrlShort: string; // https://codesandbox.io/s/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
52-
53-
public PackageFileContent: PackageJson;
15+
public ComponentGroup: string | undefined; // maps
16+
public ComponentFolder: string | undefined; // geo-map
17+
public ComponentName: string | undefined; // Geo Map
18+
public ComponentID: string | undefined; // GeoMap
19+
20+
public HtmlFilePath: string | undefined; // /samples/maps/geo-map/binding-csv-points/index.html
21+
public HtmlFileCode: string | undefined; // html code of above file
22+
public HtmlFileRoot: string | undefined; // root code of above file
23+
24+
// public SampleDirOnDisk: string | undefined; // C:\repo\igniteui-web-comp-examples\samples\maps\geo-map\binding-csv-points\
25+
public SampleFolderPath: string | undefined; // /samples/maps/geo-map/binding-csv-points/
26+
public SampleFilePath: string | undefined; // /samples/maps/geo-map/binding-csv-points/src/MapBindingDataCSV.ts
27+
public SampleRouteOld: string | undefined; // /maps/geo-map-binding-csv-points/
28+
public SampleRouteNew: string | undefined; // /maps/geo-map/binding-csv-points/
29+
public SampleFolderName: string | undefined; // binding-csv-points
30+
public SampleFileName: string | undefined; // MapBindingDataCSV.ts
31+
public SampleImportName: string | undefined; // MapBindingDataCSV
32+
public SampleImportPath: string | undefined; // ./geo-map/binding-csv-points/MapBindingDataCSV
33+
public SampleDisplayName: string | undefined; // Map Binding Data CSV
34+
public SampleFileSourcePath: string | undefined; // /src/MapBindingDataCSV.ts
35+
public SampleFileSourceCode: string | undefined; // source code from /src/MapBindingDataCSV.ts file
36+
public SampleFileBrowserCode: string | undefined; // source code for a sample in browser
37+
public SampleFileSourceClass: string | undefined; // MapBindingDataCSV
38+
public SampleFileOriginalClass: string | undefined; // MapBindingDataCSV
39+
40+
public SampleImportLines: string[] | undefined;
41+
public SampleImportPackages: string[] | undefined;
42+
public SampleImportFiles: string[] | undefined;
43+
public SampleReadMe: string | undefined; // content of ReadMe.md file generated for /samples/maps/geo-map/binding-csv-points/
44+
public SampleFilePaths: string[] | undefined; // relative paths to files in sample folder: /samples/maps/geo-map/binding-csv-points/
45+
public SampleFileNames: string[] | undefined; // names of files in sample folder: /samples/maps/geo-map/binding-csv-points/
46+
47+
public DocsUrl: string | undefined; // https://infragistics.com/webcomponentssite/components/geo-map.html
48+
49+
public SandboxUrlView: string | undefined; // https://codesandbox.io/embed/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
50+
public SandboxUrlEdit: string | undefined; // https://codesandbox.io/s/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
51+
public SandboxUrlShort: string | undefined; // https://codesandbox.io/s/github/IgniteUI/igniteui-web-comp-examples/tree/master/samples/maps/geo-map/binding-csv-points
52+
53+
public PackageFileContent: PackageJson | undefined;
5454
public PackageDependencies: PackageDependency[];
5555

5656
constructor() {
@@ -62,16 +62,16 @@ class SampleInfo {
6262
}
6363

6464
public isUsingFileName(name: string): boolean {
65-
return this.SampleFileNames.includes(name);
65+
return this.SampleFileNames ? this.SampleFileNames.includes(name) : false;
6666
}
6767
}
6868

6969
class SampleSourceBlock {
70-
public ImportLines: string[];
71-
public ImportFiles: string[];
72-
public ImportPackages: string[];
73-
public ImportCSS: string[];
74-
public OtherLines: string[];
70+
public ImportLines: string[] | undefined;
71+
public ImportFiles: string[] | undefined;
72+
public ImportPackages: string[] | undefined;
73+
public ImportCSS: string[] | undefined;
74+
public OtherLines: string[] | undefined;
7575
}
7676

7777
class Transformer {
@@ -98,7 +98,7 @@ class Transformer {
9898
}
9999

100100
public static sort(samples: SampleInfo[]): void {
101-
samples.sort((a, b) => a.SampleFolderPath > b.SampleFolderPath ? 1 : -1);
101+
samples.sort((a, b) => (a.SampleFolderPath ?? "") > (b.SampleFolderPath ?? "") ? 1 : -1);
102102
}
103103

104104
public static printNames(samples: SampleInfo[]): void {
@@ -585,15 +585,10 @@ class Transformer {
585585
}
586586
}
587587

588-
public static getRelative(path: string): string {
589-
if (path.indexOf(igConfig.RepositoryName) > -1) {
590-
path = path.split(igConfig.RepositoryName).pop() as string;
591-
path = path.split("\\").join("/");
592-
return "." + path;
593-
}
594-
595-
console.log("failed on getRelative " + path);
596-
return path;
588+
public static getRelative(absolutePath: string): string {
589+
let relative = require('path').relative(process.cwd(), absolutePath);
590+
relative = relative.split("\\").join("/");
591+
return "./" + relative;
597592
}
598593

599594
public static getFileName(relativePath: string): string {
@@ -926,10 +921,10 @@ class Transformer {
926921

927922
class SampleGroup {
928923

929-
public Name: string;
930-
public RouterClass: string;
931-
public RouterFile: string;
932-
public RouterImport: string;
924+
public Name: string | undefined;
925+
public RouterClass: string | undefined;
926+
public RouterFile: string | undefined;
927+
public RouterImport: string | undefined;
933928

934929
public Components: SampleComponent[];
935930

@@ -940,8 +935,8 @@ class SampleGroup {
940935

941936
class SampleComponent {
942937

943-
public Name: string;
944-
public Group: string;
938+
public Name: string | undefined;
939+
public Group: string | undefined;
945940
public Samples: SampleInfo[];
946941

947942
constructor() {
@@ -1003,8 +998,8 @@ class PackageJson {
1003998
}
1004999

10051000
class PackageDependency {
1006-
public name: string;
1007-
public version: string;
1001+
public name: string | undefined;
1002+
public version: string | undefined;;
10081003

10091004
public samples?: SampleInfo[];
10101005

browser/tasks/gulp-samples.js

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ var sampleSources = [
5050

5151
// including all samples for all components:
5252
igConfig.SamplesCopyPath + '/**/package.json',
53+
54+
// igConfig.SamplesCopyPath + '/maps/**/package.json',
55+
// igConfig.SamplesCopyPath + '/gallery/**/package.json',
5356

5457
// uncomment to exclude samples for specific components:
5558
// '!' + igConfig.SamplesCopyPath + '/charts/category-chart/**/package.json',
@@ -61,6 +64,7 @@ var sampleSources = [
6164
// '!' + igConfig.SamplesCopyPath + '/charts/tree-map/**/package.json',
6265
// '!' + igConfig.SamplesCopyPath + '/charts/zoomslider/**/package.json',
6366
// '!' + igConfig.SamplesCopyPath + '/maps/**/package.json',
67+
// '!' + igConfig.SamplesCopyPath + '/gallery/**/package.json',
6468
// '!' + igConfig.SamplesCopyPath + '/excel/excel-library/**/package.json',
6569
// '!' + igConfig.SamplesCopyPath + '/excel/spreadsheet/**/package.json',
6670
// '!' + igConfig.SamplesCopyPath + '/gauges/bullet-graph/**/package.json',
@@ -999,23 +1003,24 @@ function updateIG(cb) {
9991003
// { version: "3.2.12", name: "igniteui-webcomponents-core" }, // PUBLIC NPM
10001004
let packageUpgrades = [
10011005
// these IG packages are often updated:
1002-
{ version: "6.3.1", name: "igniteui-webcomponents-core" },
1003-
{ version: "6.3.1", name: "igniteui-webcomponents-charts" },
1004-
{ version: "6.3.1", name: "igniteui-webcomponents-excel" },
1005-
{ version: "6.3.1", name: "igniteui-webcomponents-gauges" },
1006-
{ version: "6.3.1", name: "igniteui-webcomponents-data-grids" },
1007-
{ version: "6.3.1", name: "igniteui-webcomponents-inputs" },
1008-
{ version: "6.3.1", name: "igniteui-webcomponents-layouts" },
1009-
{ version: "6.3.1", name: "igniteui-webcomponents-maps" },
1010-
{ version: "6.3.1", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
1011-
{ version: "6.3.1", name: "igniteui-webcomponents-spreadsheet" },
1012-
{ version: "6.3.1", name: "igniteui-webcomponents-datasources" },
1013-
{ version: "6.3.1", name: "igniteui-webcomponents-dashboards" },
1006+
{ version: "7.0.0", name: "igniteui-webcomponents-core" },
1007+
{ version: "7.0.0", name: "igniteui-webcomponents-charts" },
1008+
{ version: "7.0.0", name: "igniteui-webcomponents-excel" },
1009+
{ version: "7.0.0", name: "igniteui-webcomponents-gauges" },
1010+
{ version: "7.0.0", name: "igniteui-webcomponents-data-grids" },
1011+
{ version: "7.0.0", name: "igniteui-webcomponents-inputs" },
1012+
{ version: "7.0.0", name: "igniteui-webcomponents-layouts" },
1013+
{ version: "7.0.0", name: "igniteui-webcomponents-maps" },
1014+
{ version: "7.0.0", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
1015+
{ version: "7.0.0", name: "igniteui-webcomponents-spreadsheet" },
1016+
{ version: "7.0.0", name: "igniteui-webcomponents-datasources" },
1017+
{ version: "7.0.0", name: "igniteui-webcomponents-dashboards" },
1018+
{ version: "^1.0.2", name: "igniteui-i18n-resources" },
10141019
// these IG packages are sometimes updated:
1015-
{ version: "^0.0.1", name: "igniteui-grid-lite" },
1016-
{ version: "^6.2.2", name: "igniteui-webcomponents-grids" },
1017-
{ version: "^6.3.6" , name: "igniteui-webcomponents" },
1018-
{ version: "^1.18.0", name: "igniteui-dockmanager" },
1020+
{ version: "^0.6.0", name: "igniteui-grid-lite" },
1021+
{ version: "^7.0.0", name: "igniteui-webcomponents-grids" },
1022+
{ version: "^7.0.0" , name: "igniteui-webcomponents" },
1023+
{ version: "^2.0.1", name: "igniteui-dockmanager" },
10191024
// other packages:
10201025
{ version: "^5.101.3", name: "webpack" },
10211026
{ version: "^6.0.1", name: "webpack-cli" },

0 commit comments

Comments
 (0)