@osovitny/anatoly 2.14.44 → 2.14.46
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/esm2020/lib/core/services/appcontext.service.mjs +14 -13
- package/fesm2015/osovitny-anatoly.mjs +13 -12
- package/fesm2015/osovitny-anatoly.mjs.map +1 -1
- package/fesm2020/osovitny-anatoly.mjs +13 -12
- package/fesm2020/osovitny-anatoly.mjs.map +1 -1
- package/lib/core/services/appcontext.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -48,8 +48,8 @@ export class AppContextService extends BaseApiService {
|
|
|
48
48
|
if (lr) {
|
|
49
49
|
let now = new Date();
|
|
50
50
|
let lastRequested = new Date(context.lastRequested);
|
|
51
|
-
let
|
|
52
|
-
if (
|
|
51
|
+
let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);
|
|
52
|
+
if (in3Mins.getTime() < now.getTime()) {
|
|
53
53
|
shouldBeUpdated = true;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -73,13 +73,17 @@ export class AppContextService extends BaseApiService {
|
|
|
73
73
|
this.subscription = null;
|
|
74
74
|
}
|
|
75
75
|
//Public
|
|
76
|
+
getLatestCurrent(success = null) {
|
|
77
|
+
this.getCurrent(success, false);
|
|
78
|
+
}
|
|
76
79
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (
|
|
80
|
-
success
|
|
80
|
+
if (getCachedIfExist) {
|
|
81
|
+
let context = this.getCurrentFromSession();
|
|
82
|
+
if (context != null) {
|
|
83
|
+
if (success)
|
|
84
|
+
success(context);
|
|
85
|
+
return;
|
|
81
86
|
}
|
|
82
|
-
return;
|
|
83
87
|
}
|
|
84
88
|
if (success) {
|
|
85
89
|
this.successes.push(success);
|
|
@@ -96,15 +100,12 @@ export class AppContextService extends BaseApiService {
|
|
|
96
100
|
});
|
|
97
101
|
}
|
|
98
102
|
updateCurrent(success = null) {
|
|
99
|
-
this.
|
|
103
|
+
this.clearCurrent();
|
|
104
|
+
this.getLatestCurrent(success);
|
|
100
105
|
}
|
|
101
106
|
clearCurrent() {
|
|
102
107
|
this.sessionStorage.remove(this.storageKeyName);
|
|
103
108
|
}
|
|
104
|
-
refreshCurrent() {
|
|
105
|
-
this.clearCurrent();
|
|
106
|
-
this.updateCurrent();
|
|
107
|
-
}
|
|
108
109
|
//Properties
|
|
109
110
|
get current() {
|
|
110
111
|
this.updateCurrentIfExpired();
|
|
@@ -119,4 +120,4 @@ AppContextService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
|
|
|
119
120
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: AppContextService, decorators: [{
|
|
120
121
|
type: Injectable
|
|
121
122
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.SessionStorageService }]; } });
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"appcontext.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/services/appcontext.service.ts"],"names":[],"mappings":"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","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-2022 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 { 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    protected 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  private 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 shouldBeUpdated = false;\r\n    let lr = context.lastRequested;\r\n\r\n    if (lr) {\r\n      let now = new Date();\r\n      let lastRequested = new Date(context.lastRequested);\r\n      let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(),\r\n        lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);\r\n\r\n      if (in3Mins.getTime() < now.getTime()) {\r\n        shouldBeUpdated = true;\r\n      }\r\n    }\r\n    else {\r\n      shouldBeUpdated = true;\r\n    }\r\n\r\n    if (shouldBeUpdated) {\r\n      this.updateCurrent();\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  //Public\r\n  getLatestCurrent(success: Function = null) {\r\n    this.getCurrent(success, false);\r\n  }\r\n\r\n  getCurrent(success: Function = null, getCachedIfExist: boolean = true) {\r\n    if (getCachedIfExist) {\r\n      let context = this.getCurrentFromSession();\r\n\r\n      if (context != null) {\r\n        if (success) success(context);\r\n        return;\r\n      }\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      next: (data) => {\r\n        this.dataReceived(data);\r\n      }\r\n    });\r\n  }\r\n\r\n  updateCurrent(success: Function = null) {\r\n    this.clearCurrent();\r\n    this.getLatestCurrent(success);\r\n  }\r\n\r\n  clearCurrent() {\r\n    this.sessionStorage.remove(this.storageKeyName);\r\n  }\r\n\r\n  //Properties\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"]}
|
|
@@ -1382,8 +1382,8 @@ class AppContextService extends BaseApiService {
|
|
|
1382
1382
|
if (lr) {
|
|
1383
1383
|
let now = new Date();
|
|
1384
1384
|
let lastRequested = new Date(context.lastRequested);
|
|
1385
|
-
let
|
|
1386
|
-
if (
|
|
1385
|
+
let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);
|
|
1386
|
+
if (in3Mins.getTime() < now.getTime()) {
|
|
1387
1387
|
shouldBeUpdated = true;
|
|
1388
1388
|
}
|
|
1389
1389
|
}
|
|
@@ -1407,13 +1407,17 @@ class AppContextService extends BaseApiService {
|
|
|
1407
1407
|
this.subscription = null;
|
|
1408
1408
|
}
|
|
1409
1409
|
//Public
|
|
1410
|
+
getLatestCurrent(success = null) {
|
|
1411
|
+
this.getCurrent(success, false);
|
|
1412
|
+
}
|
|
1410
1413
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
1411
|
-
|
|
1412
|
-
|
|
1413
|
-
if (
|
|
1414
|
-
success
|
|
1414
|
+
if (getCachedIfExist) {
|
|
1415
|
+
let context = this.getCurrentFromSession();
|
|
1416
|
+
if (context != null) {
|
|
1417
|
+
if (success)
|
|
1418
|
+
success(context);
|
|
1419
|
+
return;
|
|
1415
1420
|
}
|
|
1416
|
-
return;
|
|
1417
1421
|
}
|
|
1418
1422
|
if (success) {
|
|
1419
1423
|
this.successes.push(success);
|
|
@@ -1430,15 +1434,12 @@ class AppContextService extends BaseApiService {
|
|
|
1430
1434
|
});
|
|
1431
1435
|
}
|
|
1432
1436
|
updateCurrent(success = null) {
|
|
1433
|
-
this.
|
|
1437
|
+
this.clearCurrent();
|
|
1438
|
+
this.getLatestCurrent(success);
|
|
1434
1439
|
}
|
|
1435
1440
|
clearCurrent() {
|
|
1436
1441
|
this.sessionStorage.remove(this.storageKeyName);
|
|
1437
1442
|
}
|
|
1438
|
-
refreshCurrent() {
|
|
1439
|
-
this.clearCurrent();
|
|
1440
|
-
this.updateCurrent();
|
|
1441
|
-
}
|
|
1442
1443
|
//Properties
|
|
1443
1444
|
get current() {
|
|
1444
1445
|
this.updateCurrentIfExpired();
|