Skip to content

Commit

Permalink
Merge pull request #825 from IgniteUI/master
Browse files Browse the repository at this point in the history
Merge master to vNext
  • Loading branch information
Lipata authored Jan 18, 2021
2 parents 8921d4e + 5b5a89d commit 400a05d
Show file tree
Hide file tree
Showing 52 changed files with 336 additions and 200 deletions.
101 changes: 100 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,102 @@
# [7.0.2](https://github.com/IgniteUI/igniteui-cli/compare/v7.0.1...v7.0.2) (2021-01-18)

🎉 This version includes Ignite UI for Angular DV components update to version 11.1.0:
* [igniteui-angular-core](https://www.npmjs.com/package/igniteui-angular-core/v/11.1.0)
* [igniteui-angular-charts](https://www.npmjs.com/package/igniteui-angular-charts/v/11.1.0)
* [igniteui-angular-gauges](https://www.npmjs.com/package/igniteui-angular-gauges/v/11.1.0)
* [igniteui-angular-maps](https://www.npmjs.com/package/igniteui-angular-maps/v/11.1.0)

## igniteui/cli-core@7.0.2

Note: Version bump only for package igniteui/cli-core

## igniteui/angular-templates@11.0.702
* **igx-ts:** Update DV components to version 11.1.0 ([cb16f13](https://github.com/IgniteUI/igniteui-cli/commit/cb16f13))

#### Bug Fixes

* **igx-ts:** Update hierarchical grid & tree grid custom templates to declarative toolbar ([7a78df4](https://github.com/IgniteUI/igniteui-cli/commit/7a78df4))

## igniteui/angular-schematics@11.0.702

Note: Version bump only for package igniteui/angular-schematics

## igniteui-cli@7.0.2

* **igx-ts:** Update DV components to version 11.1.0 ([cb16f13](https://github.com/IgniteUI/igniteui-cli/commit/cb16f13))

#### Bug Fixes

* **igx-ts:** Update hierarchical grid & tree grid custom templates to declarative toolbar ([7a78df4](https://github.com/IgniteUI/igniteui-cli/commit/7a78df4))

# [7.0.1](https://github.com/IgniteUI/igniteui-cli/compare/v7.0.0...v7.0.1) (2020-11-16)

## igniteui/cli-core@7.0.1

Note: Version bump only for package igniteui/cli-core

## igniteui/angular-templates@11.0.701

#### Bug Fixes

* **igx-ts:** SSR breaks because of localStorage ref ([dc9410f](https://github.com/IgniteUI/igniteui-cli/commit/dc9410f)), ([3056a97](https://github.com/IgniteUI/igniteui-cli/commit/3056a97))
* **igx,custom-grid:** Assign allowFiltering when selected as option ([7534c5f](https://github.com/IgniteUI/igniteui-cli/commit/7534c5f))
* **igx,custom-grid:** Update toolbar to new declarative setup ([35d274c](https://github.com/IgniteUI/igniteui-cli/commit/35d274c))

## igniteui/angular-schematics@11.0.701

Note: Version bump only for package igniteui/angular-schematics

## igniteui-cli@7.0.1

#### Bug Fixes

* **igx-ts:** SSR breaks because of localStorage ref ([dc9410f](https://github.com/IgniteUI/igniteui-cli/commit/dc9410f)), ([3056a97](https://github.com/IgniteUI/igniteui-cli/commit/3056a97))
* **igx,custom-grid:** Assign allowFiltering when selected as option ([7534c5f](https://github.com/IgniteUI/igniteui-cli/commit/7534c5f))
* **igx,custom-grid:** Update toolbar to new declarative setup ([35d274c](https://github.com/IgniteUI/igniteui-cli/commit/35d274c))

# [7.0.0](https://github.com/IgniteUI/igniteui-cli/compare/6.2.x...v7.0.0) (2020-11-13)

🎉 This update includes igniteui-angular version [11.0.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/11.0.0).

## igniteui/cli-core@7.0.0

Note: Version bump only for package igniteui/cli-core

## igniteui/angular-templates@11.0.700

* Add support for igniteui-angular v11.0.0 [#802](https://github.com/IgniteUI/igniteui-cli/issues/802) ([5922d15](https://github.com/IgniteUI/igniteui-cli/commit/5922d15))

## igniteui/angular-schematics@11.0.700

Note: Version bump only for package igniteui/angular-schematics

## igniteui-cli@7.0.0

* Add support for igniteui-angular v11.0.0 [#802](https://github.com/IgniteUI/igniteui-cli/issues/802) ([5922d15](https://github.com/IgniteUI/igniteui-cli/commit/5922d15))

# [6.2.2](https://github.com/IgniteUI/igniteui-cli/compare/v6.2.1...v6.2.2) (2020-11-16)

## igniteui/cli-core@6.2.2

Note: Version bump only for package igniteui/cli-core

## igniteui/angular-templates@10.2.622

#### Bug Fixes

* **igx-ts:** SSR breaks because of localStorage ref ([b750d9d](https://github.com/IgniteUI/igniteui-cli/commit/b750d9d))

## igniteui/angular-schematics@10.2.622

Note: Version bump only for package igniteui/angular-schematics

## igniteui-cli@6.2.2

#### Bug Fixes

* **igx-ts:** SSR breaks because of localStorage ref ([b750d9d](https://github.com/IgniteUI/igniteui-cli/commit/b750d9d))

# [6.2.1](https://github.com/IgniteUI/igniteui-cli/compare/v6.2.0...v6.2.1) (2020-11-11)

## igniteui/cli-core@6.2.1
Expand Down Expand Up @@ -941,4 +1040,4 @@ A brand new project template type for Ignite UI for Angular with built-in authen
* **igx-ts:** auto-close nav drawer when not pinned (mobile) ([c5ffe1f](https://github.com/IgniteUI/igniteui-cli/commit/c5ffe1f))
* update empty project descriptions. ([d2ce94f](https://github.com/IgniteUI/igniteui-cli/commit/d2ce94f))
* Update the structure using NavBar and NavDrawer. Add overall css. ([beafbb4](https://github.com/IgniteUI/igniteui-cli/commit/beafbb4))
* update to igniteui-angular 5.2.0-beta.1 ([7254119](https://github.com/IgniteUI/igniteui-cli/commit/7254119))
* update to igniteui-angular 5.2.0-beta.1 ([7254119](https://github.com/IgniteUI/igniteui-cli/commit/7254119))
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "7.0.0-rc.2",
"version": "7.0.2",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -77,8 +77,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~11.0.700-rc.2",
"@igniteui/cli-core": "~7.0.0-rc.2",
"@igniteui/angular-templates": "~11.0.702",
"@igniteui/cli-core": "~7.0.2",
"chalk": "^2.3.2",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { lastFiveYears } from "../../assets/world-energy-production";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-data-chart [(options)]="options" widgetId='barChart'></ig-data-chart>
<ig-data-chart [(options)]="options" widgetId="barChart"></ig-data-chart>
</div>
<div id="barLegend" style="float: left"></div>`
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { lastFiveYears } from "../../assets/world-energy-production";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-data-chart [(options)]="options" widgetId='columnChart'></ig-data-chart>
<ig-data-chart [(options)]="options" widgetId="columnChart"></ig-data-chart>
</div>
<div id="columnLegend" style="float: left"></div>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { files } from "../../assets/data-fe";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-tree-grid [(options)]="gridOptions" widgetId='tree-grid'></ig-tree-grid>`,
<ig-tree-grid [(options)]="gridOptions" widgetId="tree-grid"></ig-tree-grid>`,
styles: [`
:host /deep/ .ui-icon.ui-igtreegrid-expansion-indicator.ui-icon-minus {
background: url(src/app/assets/opened_folder.png) !important;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { doughnutData } from "../../assets/doughnut-data";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-doughnut-chart [(options)]="doughnutOptions" widgetId='doughnutChart'></ig-doughnut-chart>
<ig-doughnut-chart [(options)]="doughnutOptions" widgetId="doughnutChart"></ig-doughnut-chart>
</div>
`
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Component } from '@angular/core';
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<$(widget) [(options)]="options" widgetId='$(widget)'></$(widget)>
<$(widget) [(options)]="options" widgetId="$(widget)"></$(widget)>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { financialData } from "../../assets/financial-data";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-data-chart [(options)]="candleOptions" widgetId='candlestickChart'>
<ig-data-chart [(options)]="candleOptions" widgetId="candlestickChart">
</ig-data-chart>
</div>
<div style="float: left; width: 500px; height: 500px;">
<ig-data-chart [(options)]="ohlcOptions" widgetId='ohlcChart'>
<ig-data-chart [(options)]="ohlcOptions" widgetId="ohlcChart">
</ig-data-chart>
</div>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import { funnelData } from "../../assets/funnel-data";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-funnel-chart [(options)]="normalOptions" widgetId='chartNormal'>
<ig-funnel-chart [(options)]="normalOptions" widgetId="chartNormal">
</ig-funnel-chart>
</div>
<div style="float: left; width: 500px; height: 500px;">
<ig-funnel-chart [(options)]="weightedOptions" widgetId='chartWeighted'>
<ig-funnel-chart [(options)]="weightedOptions" widgetId="chartWeighted">
</ig-funnel-chart>
</div>
<div style="float: left; width: 500px; height: 500px;">
<ig-funnel-chart [(options)]="invertedOptions" widgetId='chartInverted'>
<ig-funnel-chart [(options)]="invertedOptions" widgetId="chartInverted">
</ig-funnel-chart>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { products } from "../../assets/northwindProducts";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-grid [(options)]="gridOptions" widgetId='grid'></ig-grid>
<ig-grid [(options)]="gridOptions" widgetId="grid"></ig-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { products } from "../../assets/northwindProducts";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-grid [(options)]="gridOptions" widgetId='grid-custom'></ig-grid>
<ig-grid [(options)]="gridOptions" widgetId="grid-custom"></ig-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { products } from "../../assets/northwindProducts";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-grid [(options)]="gridOptions" widgetId='grid-editing'></ig-grid>
<ig-grid [(options)]="gridOptions" widgetId="grid-editing"></ig-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { products } from "../../assets/northwindProductsFlat";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-grid [(options)]="gridOptions" widgetId='grid-templating'></ig-grid>
<ig-grid [(options)]="gridOptions" widgetId="grid-templating"></ig-grid>
`
})
export class $(ClassName)Component {
Expand All @@ -23,7 +23,7 @@ export class $(ClassName)Component {
dataSourceType: "json",
columns: [
{ headerText: "Product Name", key: "ProductName", width: 300 },
{ headerText: "Unit Price", key: "UnitPrice", type: 'number', width: 150, template: "$ ${UnitPrice} {{if parseInt(${UnitPrice}) >= 19 }}<img width='10' height='15' src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowUp.gif' /> {{else}} <img width='10' height='15' src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowDown.gif' /> {{/if}}" },
{ headerText: "Unit Price", key: "UnitPrice", type: 'number', width: 150, template: "$ ${UnitPrice} {{if parseInt(${UnitPrice}) >= 19 }}<img width="10" height="15" src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowUp.gif' /> {{else}} <img width="10" height="15" src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowDown.gif' /> {{/if}}" },
{ headerText: "Units In Stock", key: "UnitsInStock", width: 125 },
{ headerText: "Units On Order", key: "UnitsOnOrder", width: 125 },
{ headerText: " ", key: "DeltaPrice", hidden: true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { northwind } from "../../assets/northwind";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId='hierarchical-grid-custom'></ig-hierarchical-grid>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId="hierarchical-grid-custom"></ig-hierarchical-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { northwind } from "../../assets/northwind";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId='hierarchical-grid-editing'></ig-hierarchical-grid>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId="hierarchical-grid-editing"></ig-hierarchical-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare var $;
<ig-combo [(options)]="comboOptions" widgetId="combo" [(ngModel)]="comboOptions.value" (selectionChanged)="selectionChanged($event)"></ig-combo>
<input type="button" id="exportBtn" value="Export grid" (click)="export($event)" />
</div>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId='hierarchical-grid-export'></ig-hierarchical-grid>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId="hierarchical-grid-export"></ig-hierarchical-grid>
`,
styles: [`
.ui-igcombo-wrapper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { northwind } from "../../assets/northwind";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId='hierarchical-grid'></ig-hierarchical-grid>
<ig-hierarchical-grid [(options)]="gridOptions" widgetId="hierarchical-grid"></ig-hierarchical-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { data } from "../../assets/line-chart-data";
<br>
</div>
<div style="float: left">
<ig-data-chart [(options)]="options" widgetId='lineChart'></ig-data-chart>
<ig-data-chart [(options)]="options" widgetId="lineChart"></ig-data-chart>
</div>
<div id="lineLegend" style="float: left"></div>`
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { population } from "../../assets/data";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-pie-chart [(options)]="options" widgetId='pieChart'></ig-pie-chart>
<ig-pie-chart [(options)]="options" widgetId="pieChart"></ig-pie-chart>
</div>
`
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { temperature } from "../../assets/temperature";
template: `
<h1>$(description)</h1>
<div style="float: left">
<ig-data-chart [(options)]="options" widgetId='radialChart'></ig-data-chart>
<ig-data-chart [(options)]="options" widgetId="radialChart"></ig-data-chart>
</div>
<div id="radialLegend" style="float: left"></div>`
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { hierarchicalDS } from "../../assets/data-custom";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-tree-grid [(options)]="gridOptions" widgetId='tree-grid'></ig-tree-grid>
<ig-tree-grid [(options)]="gridOptions" widgetId="tree-grid"></ig-tree-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { hierarchicalDS } from "../../assets/data-editing";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-tree-grid [(options)]="gridOptions" widgetId='tree-grid'></ig-tree-grid>
<ig-tree-grid [(options)]="gridOptions" widgetId="tree-grid"></ig-tree-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { hierarchicalDS } from "../../assets/data-basic";
selector: "$(filePrefix)",
template: `
<h1>$(description)</h1>
<ig-tree-grid [(options)]="gridOptions" widgetId='tree-grid'></ig-tree-grid>
<ig-tree-grid [(options)]="gridOptions" widgetId="tree-grid"></ig-tree-grid>
`
})
export class $(ClassName)Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<script id="colTmpl" type="text/template">
$ ${UnitPrice}
{{if parseInt(${UnitPrice}) >= parseInt(${DeltaPrice}) }}
<img width='10' height='15' src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowUp.gif' />
<img width="10" height="15" src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowUp.gif' />
{{else}}
<img width='10' height='15' src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowDown.gif' />
<img width="10" height="15" src= 'https://www.igniteui.com/images/samples/templating-engine/colTemplateWithConditionalCell/arrowDown.gif' />
{{/if}}
</script>

Expand Down
Loading

0 comments on commit 400a05d

Please sign in to comment.