@osovitny/anatoly 2.14.12 → 2.14.13

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.
@@ -44,15 +44,22 @@ export class AppContextService extends BaseApiService {
44
44
  if (!context) {
45
45
  return;
46
46
  }
47
- let lu = context.lastRequested;
48
- if (lu) {
47
+ let shouldBeUpdated = false;
48
+ let lr = context.lastRequested;
49
+ if (lr) {
49
50
  let now = new Date();
50
51
  let lastRequested = new Date(context.lastRequested);
51
52
  let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
52
53
  if (in2Mins.getTime() < now.getTime()) {
53
- this.updateCurrent();
54
+ shouldBeUpdated = true;
54
55
  }
55
56
  }
57
+ else {
58
+ shouldBeUpdated = true;
59
+ }
60
+ if (shouldBeUpdated) {
61
+ this.updateCurrent();
62
+ }
56
63
  }
57
64
  dataReceived(data) {
58
65
  this.current = data;
@@ -101,7 +108,6 @@ export class AppContextService extends BaseApiService {
101
108
  return ContextInitState.isUserAdmin;
102
109
  }
103
110
  //Properties
104
- //current
105
111
  get current() {
106
112
  this.updateCurrentIfExpired();
107
113
  return this.getCurrentFromSession();
@@ -115,4 +121,4 @@ AppContextService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
115
121
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: AppContextService, decorators: [{
116
122
  type: Injectable
117
123
  }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.SessionStorageService }]; } });
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":"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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 { 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    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 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  //Public\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"]}
124
+ //# 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 { 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    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 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        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  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  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"]}
@@ -1365,15 +1365,22 @@ class AppContextService extends BaseApiService {
1365
1365
  if (!context) {
1366
1366
  return;
1367
1367
  }
1368
- let lu = context.lastRequested;
1369
- if (lu) {
1368
+ let shouldBeUpdated = false;
1369
+ let lr = context.lastRequested;
1370
+ if (lr) {
1370
1371
  let now = new Date();
1371
1372
  let lastRequested = new Date(context.lastRequested);
1372
1373
  let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
1373
1374
  if (in2Mins.getTime() < now.getTime()) {
1374
- this.updateCurrent();
1375
+ shouldBeUpdated = true;
1375
1376
  }
1376
1377
  }
1378
+ else {
1379
+ shouldBeUpdated = true;
1380
+ }
1381
+ if (shouldBeUpdated) {
1382
+ this.updateCurrent();
1383
+ }
1377
1384
  }
1378
1385
  dataReceived(data) {
1379
1386
  this.current = data;
@@ -1422,7 +1429,6 @@ class AppContextService extends BaseApiService {
1422
1429
  return ContextInitState.isUserAdmin;
1423
1430
  }
1424
1431
  //Properties
1425
- //current
1426
1432
  get current() {
1427
1433
  this.updateCurrentIfExpired();
1428
1434
  return this.getCurrentFromSession();