Skip to content

Commit d9313b5

Browse files
authored
Merge branch 'master' into mpopov/sorting-indicator
2 parents d5cdc5e + f3e6713 commit d9313b5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/npm-publish.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ jobs:
3535
if [[ ${VERSION} == *"alpha"* || ${VERSION} == *"beta"* || ${VERSION} == *"rc"* ]]; then echo "NPM_TAG=next"; else echo "NPM_TAG=latest"; fi >> $GITHUB_ENV
3636
echo ${NPM_TAG}
3737
38-
- name: Copy readme for igniteui-angular
39-
run: cp ../../README.md README.md
38+
- name: Copy readme and license for igniteui-angular
39+
run: |
40+
cp ../../README.md README.md
41+
cp ../../LICENSE LICENSE
4042
working-directory: dist/igniteui-angular
4143

4244
- name: Copy i18n files

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ export class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent
745745
case GridColumnDataType.Time:
746746
return formatDate(element, format, locale, timezone);
747747
case GridColumnDataType.Currency:
748-
return formatCurrency(element, currencyCode ?? getLocaleCurrencyCode(locale), display, digitsInfo, locale);
748+
return formatCurrency(element, currencyCode || getLocaleCurrencyCode(locale), display, digitsInfo, locale);
749749
case GridColumnDataType.Number:
750750
return formatNumber(element, locale, digitsInfo);
751751
case GridColumnDataType.Percent:

src/app/hierarchical-grid-remote-virtualization/hierarchical-remote.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export class HierarchicalRemoteService {
1717
public url = `https://services.odata.org/V4/Northwind/Northwind.svc/Products`;
1818
public urlBuilder;
1919

20-
constructor(private http: HttpClient, private hierarchyPipe: IgxGridHierarchicalPipe) {
20+
private hierarchyPipe: IgxGridHierarchicalPipe = null;
21+
22+
constructor(private http: HttpClient) {
2123
this._remoteData = new BehaviorSubject([]);
2224
this.remoteData = this._remoteData.asObservable();
2325
}
@@ -43,6 +45,7 @@ export class HierarchicalRemoteService {
4345
}
4446

4547
public getData(virtualizationState: any, grid: IgxHierarchicalGridComponent, cb?: (any) => void) {
48+
this.hierarchyPipe = this.hierarchyPipe ?? new IgxGridHierarchicalPipe(grid);
4649
return this.http.get(this.buildUrl(virtualizationState, grid)).pipe(
4750
map(response => response),
4851
)

0 commit comments

Comments
 (0)