Skip to content

Commit

Permalink
Merge pull request #1136 from IgniteUI/nalipiev/update-16-dv
Browse files Browse the repository at this point in the history
chore(igx): update DV 16
  • Loading branch information
Lipata authored Jun 2, 2023
2 parents c7e600c + 1373d18 commit 8d429c0
Show file tree
Hide file tree
Showing 20 changed files with 36 additions and 34 deletions.
2 changes: 1 addition & 1 deletion packages/cli/lib/commands/upgrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ command = {
if (success && !argv.skipInstall) {
Util.log("Installing npm packages.");
try {
Util.execSync("npm install --force --quiet");
Util.execSync("npm install --quiet");
Util.log("npm packages installed.");
} catch (error) {
Util.error(`Error installing npm packages.`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { customElement } from 'lit/decorators.js';
import {
EditModeType,
GridActivationMode,
DataGridSelectionMode,
GridSelectionMode,
IgcDataGridComponent,
IgcDataGridModule,
IgcGridCellValueChangingEventArgs,
Expand Down Expand Up @@ -193,7 +193,7 @@ export default class $(ClassName) extends LitElement {
if (grid !== null) {
grid.dataSource = this.data;
grid.activationMode = GridActivationMode.Cell;
grid.selectionMode = DataGridSelectionMode.SingleCell;
grid.selectionMode = GridSelectionMode.SingleCell;
grid.editMode = EditModeType.Cell;
grid.cellValueChanging = onCellValueChanging;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core/packages/PackageManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
command = `${managerCommand} install --force --quiet`;
command = `${managerCommand} install --quiet`;
break;
}
await this.flushQueue(false);
Expand Down Expand Up @@ -277,7 +277,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
return `${managerCommand} install ${packageName} --force --quiet --save`;
return `${managerCommand} install ${packageName} --quiet --save`;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxBulletGraphTemplate extends IgniteUIForAngularTemplate {
import: ["IgxBulletGraphModule"],
from: "igniteui-angular-gauges"
}];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-gauges@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-gauges@~16.0.0"];
}
}
module.exports = new IgxBulletGraphTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxCategoryChartTemplate extends IgniteUIForAngularTemplate {
{ import: "IgxCategoryChartModule", from: "igniteui-angular-charts" },
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxCategoryChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class IgxGridAwesomeTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxGridAwesomeTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import {
CloseScrollStrategy,
ConnectedPositioningStrategy,
DataGridSelectionMode,
GridSelectionMode,
HorizontalAlignment,
IColumnExportingEventArgs,
ColumnType,
Expand Down Expand Up @@ -54,7 +54,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {

public searchText = '';
public caseSensitive = false;
public selectionMode: DataGridSelectionMode = 'multiple';
public selectionMode: GridSelectionMode = 'multiple';
public displayType = SparklineDisplayType;

public positionSettings: PositionSettings = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class IgxGridCRMTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxGridCRMTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ $green-palette: palette($primary: #09f, $secondary: #72da67, $surface: #333);
::ng-deep {

.fin-dark-theme {
@include dark-theme($dark-palette);
@include dark-theme($green-palette);
background: #333;

igx-grid-cell {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnI
import {
CellType,
DefaultSortingStrategy,
DataGridSelectionMode,
GridSelectionMode,
IButtonGroupEventArgs,
IChangeSwitchEventArgs,
IGridKeydownEventArgs,
Expand Down Expand Up @@ -36,7 +36,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy

public showToolbar: boolean = false;
public properties: string[] = [];
public selectionMode: DataGridSelectionMode = 'multiple';
public selectionMode: GridSelectionMode = 'multiple';
public chartType = CategoryChartType;
public theme: boolean = false;
public volume: number = 1000;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ class IgxFinTechGridTemplate extends IgniteUIForAngularTemplate {
{
import: [
"IgxButtonGroupModule",
"IgxButtonModule",
"IgxDialogModule",
"IgxFocusModule",
"IgxGridModule",
"IgxIconModule",
"IgxRippleModule",
"IgxSelectModule",
"IgxSliderModule",
"IgxSwitchModule",
"IgxToggleModule"
Expand All @@ -28,7 +29,7 @@ class IgxFinTechGridTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxFinTechGridTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ $green-palette: palette($primary: #09f, $secondary: #72da67, $surface: #333);
::ng-deep {

.fin-dark-theme {
@include dark-theme($dark-palette);
@include dark-theme($green-palette);
background: #333;

::-moz-placeholder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
import {
AbsoluteScrollStrategy,
ConnectedPositioningStrategy,
DataGridSelectionMode,
GridSelectionMode,
HorizontalAlignment,
IButtonGroupEventArgs,
IChangeSwitchEventArgs,
Expand Down Expand Up @@ -35,7 +35,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy
@ViewChild('slider2', { static: true }) public intervalSlider!: IgxSliderComponent;

public showToolbar: boolean = true;
public selectionMode: DataGridSelectionMode = 'multiple';
public selectionMode: GridSelectionMode = 'multiple';
public theme: boolean = false;
public volume: number = 1000;
public frequency: number = 500;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ class IgxTreeGridFinTechTemplate extends IgniteUIForAngularTemplate {
{ provide: "IgxExcelExporterService", from: "<%=igxPackage%>" },
{
import: [
"IgxButtonGroupModule",
"IgxCheckboxModule",
"IgxButtonModule",
"IgxIconModule",
"IgxSwitchModule",
"IgxSliderModule"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IgxFinancialChartTemplate extends IgniteUIForAngularTemplate {
this.dependencies = [
{ import: "IgxFinancialChartModule", from: "igniteui-angular-charts" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxFinancialChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class IgxLinearGaugeTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-gauges"
}
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-gauges@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-gauges@~16.0.0"];
}
}
module.exports = new IgxLinearGaugeTemplate();
2 changes: 1 addition & 1 deletion packages/igx-templates/igx-ts/map/default/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class IgxGeographicMapTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-charts"
}
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0", "igniteui-angular-maps@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0", "igniteui-angular-maps@~16.0.0"];
}
}
module.exports = new IgxGeographicMapTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class IgxRadialGaugeTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-gauges"
}
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-gauges@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-gauges@~16.0.0"];
}
}
module.exports = new IgxRadialGaugeTemplate();
18 changes: 9 additions & 9 deletions spec/unit/packageManager-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ describe("Unit - Package Manager", () => {
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"~20.1"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@"~20.1" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@"~20.1" --quiet --save`,
jasmine.any(Object)
);
expect(TestPackageManager.removePackage).toHaveBeenCalledWith("ignite-ui", true);
Expand All @@ -232,15 +232,15 @@ describe("Unit - Package Manager", () => {
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"^17.1"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@"^17.1" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@"^17.1" --quiet --save`,
jasmine.any(Object)
);

mockDeps.dependencies["ignite-ui"] = ">=0.1.0 <0.2.0";
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@">=0.1.0 <0.2.0"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --quiet --save`,
jasmine.any(Object)
);
done();
Expand All @@ -263,7 +263,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`);
expect(Util.log).toHaveBeenCalledWith(`Example`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true });
done();
Expand All @@ -280,7 +280,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(2);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true });
done();
Expand All @@ -301,7 +301,7 @@ describe("Unit - Package Manager", () => {
await PackageManager.installPackages(true);
expect(Util.log).toHaveBeenCalledTimes(1);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(process.exit).toHaveBeenCalled();
expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0);
Expand Down Expand Up @@ -345,7 +345,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledWith(`Error installing package example-package with npm`);
expect(Util.log).toHaveBeenCalledWith(`Error`);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" });
`npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" });
done();
});
it("Should run addPackage properly without error code", async done => {
Expand All @@ -355,7 +355,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(1);
expect(Util.log).toHaveBeenCalledWith(`Package example-package installed successfully`);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" });
`npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" });
done();
});

Expand All @@ -380,7 +380,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(0);
expect(cp.exec).toHaveBeenCalledTimes(1);
expect(cp.exec).toHaveBeenCalledWith(
`npm install test-pack --force --quiet --no-save`, {}, jasmine.any(Function));
`npm install test-pack --quiet --no-save`, {}, jasmine.any(Function));
done();
});

Expand Down
2 changes: 1 addition & 1 deletion spec/unit/upgrade-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe("Unit - Upgrade command", () => {
upgradeIgniteUIPackagesSpy.and.returnValue(Promise.resolve(true));
await upgradeCmd.execute({ skipInstall: false });
expect(mockProject.upgradeIgniteUIPackages).toHaveBeenCalledTimes(3);
expect(Util.execSync).toHaveBeenCalledWith("npm install --force --quiet");
expect(Util.execSync).toHaveBeenCalledWith("npm install --quiet");

done();
});
Expand Down

0 comments on commit 8d429c0

Please sign in to comment.