@osovitny/anatoly 2.1.11 → 2.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/osovitny-anatoly.umd.js +13 -6
- package/bundles/osovitny-anatoly.umd.js.map +1 -1
- package/esm2015/lib/core/services/appcontext.service.js +14 -7
- package/fesm2015/osovitny-anatoly.js +13 -6
- package/fesm2015/osovitny-anatoly.js.map +1 -1
- package/lib/core/services/appcontext.service.d.ts +2 -0
- package/osovitny-anatoly.metadata.json +1 -1
- package/package.json +1 -1
|
@@ -31,8 +31,15 @@ export class AppContextService extends BaseApiService {
|
|
|
31
31
|
this.successes = [];
|
|
32
32
|
this.baseUrl = '/api/appContext';
|
|
33
33
|
}
|
|
34
|
+
//Session
|
|
35
|
+
getCurrentFromSession() {
|
|
36
|
+
return this.sessionStorage.getObject(this.storageKeyName);
|
|
37
|
+
}
|
|
38
|
+
setCurrentFromSession(value) {
|
|
39
|
+
this.sessionStorage.setObject(this.storageKeyName, value);
|
|
40
|
+
}
|
|
34
41
|
updateCurrentIfExpired() {
|
|
35
|
-
let context = this.
|
|
42
|
+
let context = this.getCurrentFromSession();
|
|
36
43
|
if (!context) {
|
|
37
44
|
return;
|
|
38
45
|
}
|
|
@@ -59,10 +66,10 @@ export class AppContextService extends BaseApiService {
|
|
|
59
66
|
this.subscription = null;
|
|
60
67
|
}
|
|
61
68
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
62
|
-
let
|
|
63
|
-
if (getCachedIfExist &&
|
|
69
|
+
let context = this.getCurrentFromSession();
|
|
70
|
+
if (getCachedIfExist && context != null) {
|
|
64
71
|
if (success) {
|
|
65
|
-
success(
|
|
72
|
+
success(context);
|
|
66
73
|
}
|
|
67
74
|
return;
|
|
68
75
|
}
|
|
@@ -95,10 +102,10 @@ export class AppContextService extends BaseApiService {
|
|
|
95
102
|
//current
|
|
96
103
|
get current() {
|
|
97
104
|
this.updateCurrentIfExpired();
|
|
98
|
-
return this.
|
|
105
|
+
return this.getCurrentFromSession();
|
|
99
106
|
}
|
|
100
107
|
set current(value) {
|
|
101
|
-
this.
|
|
108
|
+
this.setCurrentFromSession(value);
|
|
102
109
|
}
|
|
103
110
|
}
|
|
104
111
|
AppContextService.decorators = [
|
|
@@ -108,4 +115,4 @@ AppContextService.ctorParameters = () => [
|
|
|
108
115
|
{ type: HttpClient },
|
|
109
116
|
{ type: SessionStorageService }
|
|
110
117
|
];
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"appcontext.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/services/appcontext.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;EAcE;AAEF,OAAO;AACP,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM;AACN,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAG7D,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IAOnD,YACY,IAAgB,EAClB,cAAqC;QAC7C,KAAK,CAAC,IAAI,CAAC,CAAC;QAFF,SAAI,GAAJ,IAAI,CAAY;QAClB,mBAAc,GAAd,cAAc,CAAuB;QAR/C,QAAQ;QACA,mBAAc,GAAG,YAAY,CAAC;QAE9B,iBAAY,GAAiB,IAAI,CAAC;QAClC,cAAS,GAAG,EAAE,CAAC;QAMrB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC;IACnC,CAAC;IAED,SAAS;IACD,qBAAqB;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAEM,qBAAqB,CAAC,KAAU;QACrC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAEO,sBAAsB;QAC5B,IAAI,OAAO,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE3C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;QAE/B,IAAI,EAAE,EAAE;YACN,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,aAAa,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACpD,IAAI,OAAO,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,OAAO,EAAE,EACnG,aAAa,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAElE,IAAI,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,EAAE;gBACrC,IAAI,CAAC,aAAa,EAAE,CAAC;aACtB;SACF;IACH,CAAC;IAEO,YAAY,CAAC,IAAI;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;SACF;QAED,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,UAAoB,IAAI,EAAE,mBAA4B,IAAI;QACnE,IAAI,OAAO,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE3C,IAAI,gBAAgB,IAAI,OAAO,IAAI,IAAI,EAAE;YACvC,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,OAAO,CAAC,CAAC;aAClB;YAED,OAAO;SACR;QAED,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;QAED,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;YAC7B,OAAO;SACR;QAED,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,GAAG,CAAC,CAAC;QAErD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,SAAS,CAC/D,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;QACN,CAAC,CACF,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,UAAoB,IAAI;QACpC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,cAAc;QACZ,OAAO,gBAAgB,CAAC,cAAc,CAAC;IACzC,CAAC;IAED,WAAW;QACT,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACtC,CAAC;IAED,YAAY;IACZ,SAAS;IACT,IAAW,OAAO;QAChB,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACtC,CAAC;IACD,IAAW,OAAO,CAAC,KAAU;QAC3B,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;;;YAnHF,UAAU;;;YARF,UAAU;YAMV,qBAAqB","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny\r\n    Anatoly Osovitny\r\n\r\n  Created:\r\n    13 Nov 2017\r\n\r\n  Copyright (c) 2016-2021 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n// Node\r\nimport { Injectable } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { Subscription } from 'rxjs';\r\n\r\n// App\r\nimport { ContextInitState } from '../consts/settings';\r\nimport { BaseApiService } from '../../data/base/base-api.service';\r\nimport { SessionStorageService } from './web-storage.service'\r\n\r\n@Injectable()\r\nexport class AppContextService extends BaseApiService {\r\n  //Consts\r\n  private storageKeyName = 'appContext';\r\n\r\n  private subscription: Subscription = null;\r\n  private successes = [];  \r\n\r\n  constructor(\r\n    protected http: HttpClient, \r\n    private sessionStorage: SessionStorageService) {\r\n    super(http);\r\n    this.baseUrl = '/api/appContext';\r\n  }\r\n\r\n  //Session\r\n  private getCurrentFromSession() {\r\n    return this.sessionStorage.getObject(this.storageKeyName);\r\n  }\r\n\r\n  public setCurrentFromSession(value: any) {\r\n    this.sessionStorage.setObject(this.storageKeyName, value);\r\n  }\r\n\r\n  private updateCurrentIfExpired() {\r\n    let context = this.getCurrentFromSession();\r\n\r\n    if (!context) {\r\n      return;\r\n    }\r\n\r\n    let lu = context.lastRequested;\r\n\r\n    if (lu) {\r\n      let now = new Date();\r\n      let lastRequested = new Date(context.lastRequested);\r\n      let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(),\r\n        lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);\r\n\r\n      if (in2Mins.getTime() < now.getTime()) {\r\n        this.updateCurrent();\r\n      }\r\n    }    \r\n  }\r\n\r\n  private dataReceived(data) {\r\n    this.current = data;\r\n\r\n    for (let i = 0; i < this.successes.length; i++) {\r\n      let success = this.successes[i];\r\n      if (success) {\r\n        success(data);\r\n      }      \r\n    }\r\n\r\n    this.successes = [];\r\n    this.subscription.unsubscribe();\r\n    this.subscription = null;\r\n  }\r\n\r\n  getCurrent(success: Function = null, getCachedIfExist: boolean = true) {\r\n    let context = this.getCurrentFromSession();\r\n\r\n    if (getCachedIfExist && context != null) {    \r\n      if (success) {\r\n        success(context);\r\n      } \r\n\r\n      return;      \r\n    }\r\n\r\n    if (success) {\r\n      this.successes.push(success);\r\n    }    \r\n\r\n    if (this.subscription != null) {\r\n      return;\r\n    }\r\n\r\n    let now = new Date();\r\n    console.log('Requesting a new AppContext at ' + now);\r\n\r\n    this.subscription = this.get('getCurrentContext', null).subscribe(\r\n      (data) => {\r\n        this.dataReceived(data);\r\n      },\r\n      (e) => {\r\n      }\r\n    );\r\n  }\r\n\r\n  updateCurrent(success: Function = null) {\r\n    this.getCurrent(success, false);\r\n  }\r\n\r\n  clearCurrent() {\r\n    this.sessionStorage.remove(this.storageKeyName);\r\n  }\r\n\r\n  isUserSignedIn() {\r\n    return ContextInitState.isUserSignedIn;\r\n  }\r\n\r\n  isUserAdmin() {\r\n    return ContextInitState.isUserAdmin;\r\n  }\r\n\r\n  //Properties\r\n  //current\r\n  public get current() {\r\n    this.updateCurrentIfExpired();\r\n    return this.getCurrentFromSession();\r\n  }\r\n  public set current(value: any) {\r\n    this.setCurrentFromSession(value);\r\n  }\r\n}\r\n"]}
|
|
@@ -1351,8 +1351,15 @@ class AppContextService extends BaseApiService {
|
|
|
1351
1351
|
this.successes = [];
|
|
1352
1352
|
this.baseUrl = '/api/appContext';
|
|
1353
1353
|
}
|
|
1354
|
+
//Session
|
|
1355
|
+
getCurrentFromSession() {
|
|
1356
|
+
return this.sessionStorage.getObject(this.storageKeyName);
|
|
1357
|
+
}
|
|
1358
|
+
setCurrentFromSession(value) {
|
|
1359
|
+
this.sessionStorage.setObject(this.storageKeyName, value);
|
|
1360
|
+
}
|
|
1354
1361
|
updateCurrentIfExpired() {
|
|
1355
|
-
let context = this.
|
|
1362
|
+
let context = this.getCurrentFromSession();
|
|
1356
1363
|
if (!context) {
|
|
1357
1364
|
return;
|
|
1358
1365
|
}
|
|
@@ -1379,10 +1386,10 @@ class AppContextService extends BaseApiService {
|
|
|
1379
1386
|
this.subscription = null;
|
|
1380
1387
|
}
|
|
1381
1388
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
1382
|
-
let
|
|
1383
|
-
if (getCachedIfExist &&
|
|
1389
|
+
let context = this.getCurrentFromSession();
|
|
1390
|
+
if (getCachedIfExist && context != null) {
|
|
1384
1391
|
if (success) {
|
|
1385
|
-
success(
|
|
1392
|
+
success(context);
|
|
1386
1393
|
}
|
|
1387
1394
|
return;
|
|
1388
1395
|
}
|
|
@@ -1415,10 +1422,10 @@ class AppContextService extends BaseApiService {
|
|
|
1415
1422
|
//current
|
|
1416
1423
|
get current() {
|
|
1417
1424
|
this.updateCurrentIfExpired();
|
|
1418
|
-
return this.
|
|
1425
|
+
return this.getCurrentFromSession();
|
|
1419
1426
|
}
|
|
1420
1427
|
set current(value) {
|
|
1421
|
-
this.
|
|
1428
|
+
this.setCurrentFromSession(value);
|
|
1422
1429
|
}
|
|
1423
1430
|
}
|
|
1424
1431
|
AppContextService.decorators = [
|