Skip to content

Commit 0e1cbef

Browse files
ismcagdasismcagdas
authored
Merge pull request #498 from acjh/patch-27
Update abp-web-resources and abp-ng2-module packages
2 parents 7322c03 + 01a2d27 commit 0e1cbef

37 files changed

+4659
-18960
lines changed

‎angular/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"@types/moment": "^2.13.0",
3434
"@types/moment-timezone": "^0.5.12",
3535
"@types/toastr": "^2.1.33",
36-
"abp-ng2-module": "^4.0.0",
37-
"abp-web-resources": "^3.8.4",
36+
"abp-ng2-module": "^5.1.1",
37+
"abp-web-resources": "^5.1.1",
3838
"animate.css": "^3.5.2",
3939
"block-ui": "^2.70.1",
4040
"bootstrap": "^3.3.7",

‎angular/src/app/roles/roles.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
6666
delete(role: RoleDto): void {
6767
abp.message.confirm(
6868
this.l('RoleDeleteWarningMessage', role.displayName),
69+
undefined,
6970
(result: boolean) => {
7071
if (result) {
7172
this._rolesService

‎angular/src/app/tenants/tenants.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
6767
delete(tenant: TenantDto): void {
6868
abp.message.confirm(
6969
this.l('TenantDeleteWarningMessage', tenant.name),
70+
undefined,
7071
(result: boolean) => {
7172
if (result) {
7273
this._tenantService

‎angular/src/app/users/users.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
7575
protected delete(user: UserDto): void {
7676
abp.message.confirm(
7777
this.l('UserDeleteWarningMessage', user.fullName),
78+
undefined,
7879
(result: boolean) => {
7980
if (result) {
8081
this._userService.delete(user.id).subscribe(() => {

‎angular/yarn.lock‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,14 +1245,15 @@ abbrev@1:
12451245
version "1.1.1"
12461246
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
12471247

1248-
abp-ng2-module@^4.0.0:
1249-
version "4.0.0"
1250-
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-4.0.0.tgz#de1d952ce91847dc58ac2929654fee2a6c7a4525"
1251-
integrity sha512-k/KjkAWrNz2Cg2c5IQtEKdKDQA3LGW7nncJneeUz+Hl0KrV+sOi9c2LnaOL0Q7q0hCfUPhO9GkEUrQGpF7c5gQ==
1248+
abp-ng2-module@^5.1.1:
1249+
version "5.1.1"
1250+
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-5.1.1.tgz#a3e673656c3081e21b5dfa679f138d79ebbfc55e"
1251+
integrity sha512-eYtmjQegvjxd7qSYlotqPKbNnJQtFljUXElrpzC85EoVb8wPM2f9SOJcQ0FcgW8w8BXqdipg7YdiujM3bv/LTw==
12521252

1253-
abp-web-resources@^3.8.2:
1254-
version "3.8.2"
1255-
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.8.2.tgz#b7768eb0757cff0266fd3c4e789af81e15c9dc96"
1253+
abp-web-resources@^5.1.1:
1254+
version "5.1.1"
1255+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-5.1.1.tgz#3db1324179e3f28566f84f02c43fe9f3776bb81c"
1256+
integrity sha512-/ueU9++2ZGkjGe/oqdOA2rTEQbCkteZAputaP3Mcr2uvBWTJCvII/R7mgeCAC2x90qpH+WSiIBD6nNpgaSqTZA==
12561257

12571258
accepts@~1.3.4, accepts@~1.3.5:
12581259
version "1.3.5"
@@ -6590,12 +6591,6 @@ [email protected]:
65906591
dependencies:
65916592
tslib "^1.9.0"
65926593

6593-
rxjs@^6.2.0:
6594-
version "6.2.1"
6595-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
6596-
dependencies:
6597-
tslib "^1.9.0"
6598-
65996594
rxjs@^6.4.0:
66006595
version "6.5.2"
66016596
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
@@ -8256,7 +8251,7 @@ yn@^3.0.0:
82568251
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
82578252
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
82588253

8259-
zone.js@~0.10.2:
8260-
version "0.10.2"
8261-
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e"
8262-
integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==
8254+
zone.js@~0.9.1:
8255+
version "0.9.1"
8256+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
8257+
integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"chart.js": "chartjs#^2.6.0",
2626
"jquery-sparkline": "^2.1.3",
2727
"Flot": "jquery-flot#^0.8.3",
28-
"abp-web-resources": "^3.5.0"
28+
"abp-web-resources": "^4.2.0"
2929
},
3030
"resolutions": {
3131
"jquery": ">=1.6.3"

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "3.5.0",
7+
"version": "4.2.0",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,13 +25,13 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "3.5.0",
28+
"_release": "4.2.0",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v3.5.0",
32-
"commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
31+
"tag": "v4.2.0",
32+
"commit": "db5593861ad4ffa44587e0be3a1e153735c6e699"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^3.1.0",
35+
"_target": "^4.2.0",
3636
"_originalSource": "abp-web-resources"
3737
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
let isEnabled: boolean;
2020

21+
let ignoreFeatureCheckForHostUsers: boolean;
22+
2123
let tenantIdCookieName: string;
2224

2325
function setTenantIdCookie(tenantId?: number): void;
@@ -109,6 +111,19 @@
109111
function getToken(): string;
110112

111113
function clearToken(): void;
114+
115+
let refreshTokenCookieName: string;
116+
117+
/**
118+
* Saves refreshToken token.
119+
* @param refreshToken The token to be saved.
120+
* @param expireDate Optional expire date. If not specified, token will be deleted at end of the session.
121+
*/
122+
function setRefreshToken(refreshToken: string, expireDate?: Date): void;
123+
124+
function getRefreshToken(): string;
125+
126+
function clearRefreshToken(): void;
112127
}
113128

114129
namespace features {
@@ -293,17 +308,15 @@
293308

294309
//TODO: these methods return jQuery.Promise instead of any. fix it.
295310

296-
function info(message: string, title?: string): any;
297-
298-
function success(message: string, title?: string): any;
311+
function info(message: string, title?: string, options?: any): any;
299312

300-
function warn(message: string, title?: string): any;
313+
function success(message: string, title?: string, options?: any): any;
301314

302-
function error(message: string, title?: string): any;
315+
function warn(message: string, title?: string, options?: any): any;
303316

304-
function confirm(message: string, callback?: (result: boolean) => void): any;
317+
function error(message: string, title?: string, options?: any): any;
305318

306-
function confirm(message: string, title?: string, callback?: (result: boolean) => void): any;
319+
function confirm(message: string, title?: string, callback?: (result: boolean) => void, options?: any): any;
307320

308321
}
309322

0 commit comments

Comments
 (0)