Skip to content

Commit d230ab6

Browse files
MarielaTihovaMarielaTihova
committed
Merge remote-tracking branch 'origin/vnext' into mtihova/fix-867
2 parents c51bfa4 + 864d1cf commit d230ab6

File tree

1,773 files changed

+25277
-31755
lines changed

Some content is hidden

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

1,773 files changed

+25277
-31755
lines changed

CODEOWNERS renamed to .github/CODEOWNERS

File renamed without changes.

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Follow these instructions to run all samples locally in a browser application.
9393
This will install required packages and [Ignite UI for Web Components](https://www.infragistics.com/products/ignite-ui-web-components/web-components/components/general-getting-started.html) packages from npm website:
9494

9595
- [igniteui-webcomponents-core](https://www.npmjs.com/package/igniteui-webcomponents-core)
96+
- [igniteui-webcomponents-core](https://www.npmjs.com/package/igniteui-webcomponents-dashboards)
9697
- [igniteui-webcomponents-charts](https://www.npmjs.com/package/igniteui-webcomponents-charts)
9798
- [igniteui-webcomponents-excel](https://www.npmjs.com/package/igniteui-webcomponents-excel)
9899
- [igniteui-webcomponents-gauges](https://www.npmjs.com/package/igniteui-webcomponents-gauges)
@@ -170,6 +171,20 @@ Next, follow these steps:
170171
- submit your pull request
171172

172173

174+
## Updating Packages in Samples
175+
176+
NOTE Do NOT find replace version of packages in package.json files.
177+
178+
- open this repo in VS Code
179+
- open [./browser/tasks/gulp-samples.js](./browser/tasks/gulp-samples.js) file
180+
- navigate to the `updateIG` function
181+
- update version of packages in `packageUpgrades` array
182+
- open terminal window
183+
- run `cd browser` command
184+
- run the `gulp updateIG` command
185+
- run `npm install --legacy-peer-deps` command
186+
- create AND merge a pull request with changes in all package.json files in this repository
187+
- create 2nd pull request with similar changes in `/editor-templates/WebComponents/main-template/package.json` of the [igniteui-xplat-examples](https://github.com/IgniteUI/igniteui-xplat-examples) repository.
173188

174189
## Learn More
175190

‎browser/config-overrides.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
//note: I suspect this was copied over from the react browser, and isn't needed here.
23
module.exports = function override(config, env) {
34
console.log("Running config-overrides.js");
45
const paths = require('./node_modules/react-scripts/config/paths');
@@ -41,16 +42,21 @@ module.exports = function override(config, env) {
4142
name: 'igniteui-webcomponents-grids',
4243
chunks: 'all',
4344
},
44-
igniteuiMaps: {
45+
igniteuiInputs: {
4546
test: /[\\/]node_modules[\\/](igniteui-webcomponents-inputs)[\\/]/,
4647
name: 'igniteui-webcomponents-inputs',
4748
chunks: 'all',
4849
},
49-
igniteuiMaps: {
50+
igniteuiLayouts: {
5051
test: /[\\/]node_modules[\\/](igniteui-webcomponents-layouts)[\\/]/,
5152
name: 'igniteui-webcomponents-layouts',
5253
chunks: 'all',
5354
},
55+
igniteuiDashboards: {
56+
test: /[\\/]node_modules[\\/](igniteui-webcomponents-dashboards)[\\/]/,
57+
name: 'igniteui-webcomponents-dashboards',
58+
chunks: 'all',
59+
},
5460
igniteuiMaps: {
5561
test: /[\\/]node_modules[\\/](igniteui-webcomponents-maps)[\\/]/,
5662
name: 'igniteui-webcomponents-maps',

‎browser/public/index.html‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@
105105
<a class="nav-link" href="#" data-nav="/samples/charts/category-chart/trendline">─<span>Trendline</span></a>
106106
<a class="nav-link" href="#" data-nav="/samples/charts/category-chart/value-lines">─<span>Value Lines</span></a>
107107
</div>
108+
<label id="nav-dashboard-tile" class="nav-component">Dashboard Tile</label>
109+
<div id="nav-dashboard-tile-list" class="nav-list" state="collapsed">
110+
<a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/chart-dashboard">─<span>Chart Dashboard</span></a>
111+
<a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/financial-dashboard">─<span>Financial Dashboard</span></a>
112+
<a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/gauge-dashboard">─<span>Gauge Dashboard</span></a>
113+
<a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/map-dashboard">─<span>Map Dashboard</span></a>
114+
<a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/pie-dashboard">─<span>Pie Dashboard</span></a>
115+
</div>
108116
<label id="nav-data-chart" class="nav-component">Data Chart</label>
109117
<div id="nav-data-chart-list" class="nav-list" state="collapsed">
110118
<a class="nav-link" href="#" data-nav="/samples/charts/data-chart/annotations-custom">─<span>Annotations Custom</span></a>
@@ -292,6 +300,7 @@
292300
<div id="nav-toolbar-list" class="nav-list" state="collapsed">
293301
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/actions-built-in-category-chart">─<span>Actions Built In Category Chart</span></a>
294302
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/actions-built-in-data-chart">─<span>Actions Built In Data Chart</span></a>
303+
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/color-editor-support">─<span>Color Editor Support</span></a>
295304
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/custom-tool">─<span>Custom Tool</span></a>
296305
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/layout-actions-for-data-chart">─<span>Layout Actions For Data Chart</span></a>
297306
<a class="nav-link" href="#" data-nav="/samples/charts/toolbar/layout-in-vertical-orientation">─<span>Layout In Vertical Orientation</span></a>
@@ -316,6 +325,14 @@
316325
<div id="nav-multi-column-combobox-list" class="nav-list" state="collapsed">
317326
<a class="nav-link" href="#" data-nav="/samples/editors/multi-column-combobox/overview">─<span>Overview</span></a>
318327
</div>
328+
<label id="nav-x-date-picker" class="nav-component">X Date Picker</label>
329+
<div id="nav-x-date-picker-list" class="nav-list" state="collapsed">
330+
<a class="nav-link" href="#" data-nav="/samples/editors/x-date-picker/date-limits">─<span>XDate Picker Date Limits</span></a>
331+
<a class="nav-link" href="#" data-nav="/samples/editors/x-date-picker/editing">─<span>XDate Picker Editing</span></a>
332+
<a class="nav-link" href="#" data-nav="/samples/editors/x-date-picker/format">─<span>XDate Picker Format</span></a>
333+
<a class="nav-link" href="#" data-nav="/samples/editors/x-date-picker/overview">─<span>XDate Picker Overview</span></a>
334+
<a class="nav-link" href="#" data-nav="/samples/editors/x-date-picker/range">─<span>XDate Picker Range</span></a>
335+
</div>
319336

320337
<div class="nav-group">EXCEL</div>
321338
<label id="nav-excel-library" class="nav-component">Excel Library</label>
@@ -459,6 +476,7 @@
459476
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-editing-styling">─<span>Cell Editing Styling</span></a>
460477
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-selection-mode">─<span>Cell Selection Mode</span></a>
461478
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-selection-style">─<span>Cell Selection Style</span></a>
479+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/change-icons-custom">─<span>Change Icons Custom</span></a>
462480
<a class="nav-link" href="#" data-nav="/samples/grids/grid/clipboard-operations">─<span>Clipboard Operations</span></a>
463481
<a class="nav-link" href="#" data-nav="/samples/grids/grid/column-auto-sizing">─<span>Column Auto Sizing</span></a>
464482
<a class="nav-link" href="#" data-nav="/samples/grids/grid/column-collapsible-groups">─<span>Column Collapsible Groups</span></a>
@@ -501,6 +519,7 @@
501519
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-columns">─<span>Editing Columns</span></a>
502520
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-events">─<span>Editing Events</span></a>
503521
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-excel-style">─<span>Editing Excel Style</span></a>
522+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-excel-style-custom">─<span>Editing Excel Style Custom</span></a>
504523
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-lifecycle">─<span>Editing Lifecycle</span></a>
505524
<a class="nav-link" href="#" data-nav="/samples/grids/grid/excel-exporting">─<span>Excel Exporting</span></a>
506525
<a class="nav-link" href="#" data-nav="/samples/grids/grid/excel-style-filtering-sample-1">─<span>Excel Style Filtering Sample1</span></a>
@@ -556,6 +575,7 @@
556575
<a class="nav-link" href="#" data-nav="/samples/grids/grid/styling-custom-css">─<span>Styling Custom Css</span></a>
557576
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-1">─<span>Toolbar Sample1</span></a>
558577
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-2">─<span>Toolbar Sample2</span></a>
578+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-2-custom">─<span>Toolbar Sample2 Custom</span></a>
559579
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-3">─<span>Toolbar Sample3</span></a>
560580
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-4">─<span>Toolbar Sample4</span></a>
561581
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-style">─<span>Toolbar Style</span></a>
@@ -804,6 +824,10 @@
804824
<a class="nav-link" href="#" data-nav="/samples/inputs/circular-progress-indicator/simple">─<span>Simple</span></a>
805825
<a class="nav-link" href="#" data-nav="/samples/inputs/circular-progress-indicator/styling">─<span>Styling</span></a>
806826
</div>
827+
<label id="nav-color-editor" class="nav-component">Color Editor</label>
828+
<div id="nav-color-editor-list" class="nav-list" state="collapsed">
829+
<a class="nav-link" href="#" data-nav="/samples/inputs/color-editor/overview">─<span>Overview</span></a>
830+
</div>
807831
<label id="nav-combo" class="nav-component">Combo</label>
808832
<div id="nav-combo-list" class="nav-list" state="collapsed">
809833
<a class="nav-link" href="#" data-nav="/samples/inputs/combo/features">─<span>Features</span></a>
@@ -949,9 +973,9 @@
949973
</div>
950974
<label id="nav-divider" class="nav-component">Divider</label>
951975
<div id="nav-divider-list" class="nav-list" state="collapsed">
952-
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/base">─<span>Base</span></a>
953976
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/dashed">─<span>Dashed</span></a>
954977
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/middle">─<span>Middle</span></a>
978+
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/overview">─<span>Overview</span></a>
955979
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/select">─<span>Select</span></a>
956980
<a class="nav-link" href="#" data-nav="/samples/layouts/divider/vertical">─<span>Vertical</span></a>
957981
</div>
@@ -1091,7 +1115,7 @@
10911115
</div>
10921116
<label id="nav-date-picker" class="nav-component">Date Picker</label>
10931117
<div id="nav-date-picker-list" class="nav-list" state="collapsed">
1094-
<a class="nav-link" href="#" data-nav="/samples/scheduling/date-picker/dialog_mode">─<span>Dialog_mode</span></a>
1118+
<a class="nav-link" href="#" data-nav="/samples/scheduling/date-picker/dialog-mode">─<span>Dialog Mode</span></a>
10951119
<a class="nav-link" href="#" data-nav="/samples/scheduling/date-picker/form">─<span>Form</span></a>
10961120
<a class="nav-link" href="#" data-nav="/samples/scheduling/date-picker/format">─<span>Format</span></a>
10971121
<a class="nav-link" href="#" data-nav="/samples/scheduling/date-picker/overview">─<span>Overview</span></a>

‎browser/tasks/gulp-samples.js‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -972,30 +972,31 @@ function updateIG(cb) {
972972
del.sync("./samples/**/node_modules", {force:true});
973973

974974
// NOTE: change this array with new version of packages and optionally use "@infragistics/" proget prefix, e.g.
975-
// { name: "@infragistics/igniteui-webcomponents-core", version: "22.1.62" }, // LOCAL PROGET
976-
// { name: "igniteui-webcomponents-core", version: "3.2.2" }, // PUBLIC NPM
975+
// { version: "22.1.62", name: "@infragistics/igniteui-webcomponents-core" }, // LOCAL PROGET
976+
// { version: "3.2.12", name: "igniteui-webcomponents-core" }, // PUBLIC NPM
977977
let packageUpgrades = [
978978
// these IG packages are often updated:
979-
{ name: "igniteui-webcomponents-core" , version: "5.0.3-beta.0" },
980-
{ name: "igniteui-webcomponents-charts" , version: "5.0.3-beta.0" },
981-
{ name: "igniteui-webcomponents-excel" , version: "5.0.3-beta.0" },
982-
{ name: "igniteui-webcomponents-gauges" , version: "5.0.3-beta.0" },
983-
{ name: "igniteui-webcomponents-grids" , version: "5.0.3-beta.0" },
984-
{ name: "igniteui-webcomponents-inputs" , version: "5.0.3-beta.0" },
985-
{ name: "igniteui-webcomponents-layouts" , version: "5.0.3-beta.0" },
986-
{ name: "igniteui-webcomponents-maps" , version: "5.0.3-beta.0" },
987-
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "5.0.3-beta.0" },
988-
{ name: "igniteui-webcomponents-spreadsheet" , version: "5.0.3-beta.0" },
989-
{ name: "igniteui-webcomponents-datasources" , version: "5.0.3-beta.0" },
979+
{ version: "5.1.1", name: "igniteui-webcomponents-core" },
980+
{ version: "5.1.1", name: "igniteui-webcomponents-charts" },
981+
{ version: "5.1.1", name: "igniteui-webcomponents-excel" },
982+
{ version: "5.1.1", name: "igniteui-webcomponents-gauges" },
983+
{ version: "5.1.1", name: "igniteui-webcomponents-grids" },
984+
{ version: "5.1.1", name: "igniteui-webcomponents-inputs" },
985+
{ version: "5.1.1", name: "igniteui-webcomponents-layouts" },
986+
{ version: "5.1.1", name: "igniteui-webcomponents-maps" },
987+
{ version: "5.1.1", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
988+
{ version: "5.1.1", name: "igniteui-webcomponents-spreadsheet" },
989+
{ version: "5.1.1", name: "igniteui-webcomponents-datasources" },
990+
{ version: "5.1.1", name: "igniteui-webcomponents-dashboards" },
990991
// these IG packages are sometimes updated:
991-
{ name: "igniteui-webcomponents", version: "5.1.1" },
992-
{ name: "igniteui-dockmanager", version: "1.14.3" },
992+
{ version: "5.1.2" , name: "igniteui-webcomponents" },
993+
{ version: "1.15.2", name: "igniteui-dockmanager" },
993994
// other packages:
994-
{ name: "webpack", version: "^5.74.0" },
995-
{ name: "webpack-cli", version: "^4.10.0" },
996-
{ name: "webpack-dev-server", version: "^4.11.1" },
997-
{ name: "lit", version: "^3.2.0" },
998-
{ name: "lit-html", version: "^3.2.0" },
995+
{ version: "^5.96.1", name: "webpack" },
996+
{ version: "^4.10.0", name: "webpack-cli" },
997+
{ version: "^4.11.1", name: "webpack-dev-server" },
998+
{ version: "^3.2.0", name: "lit" },
999+
{ version: "^3.2.0", name: "lit-html" },
9991000
];
10001001

10011002
var packagePaths = [

0 commit comments

Comments
 (0)