diff --git a/package-lock.json b/package-lock.json index 91d3bb33e..dc825f118 100644 --- a/package-lock.json +++ b/package-lock.json @@ -91,9 +91,10 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.3.1", - "dev": true, - "license": "MIT" + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz", + "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==", + "dev": true }, "node_modules/@ampproject/remapping": { "version": "2.2.0", @@ -8733,7 +8734,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.3", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8741,7 +8744,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -9793,10 +9795,30 @@ "node": ">=12" } }, - "node_modules/ip": { - "version": "2.0.0", + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "dev": true, - "license": "MIT" + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/ip-address/node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "dev": true + }, + "node_modules/ip-address/node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true }, "node_modules/ipaddr.js": { "version": "2.1.0", @@ -15785,15 +15807,16 @@ } }, "node_modules/socks": { - "version": "2.7.1", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.3.tgz", + "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==", "dev": true, - "license": "MIT", "dependencies": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 10.13.0", + "node": ">= 10.0.0", "npm": ">= 3.0.0" } }, @@ -17996,7 +18019,9 @@ "dev": true }, "@adobe/css-tools": { - "version": "4.3.1", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz", + "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==", "dev": true }, "@ampproject/remapping": { @@ -23529,7 +23554,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.3", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true }, "for-each": { @@ -24204,9 +24231,29 @@ "internmap": { "version": "2.0.3" }, - "ip": { - "version": "2.0.0", - "dev": true + "ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dev": true, + "requires": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "dependencies": { + "jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "dev": true + }, + "sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true + } + } }, "ipaddr.js": { "version": "2.1.0", @@ -28006,10 +28053,12 @@ } }, "socks": { - "version": "2.7.1", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.3.tgz", + "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==", "dev": true, "requires": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" } }, diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index 8c30f7a29..91105842d 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "24.3.5", + "version": "24.3.5-alpha.6", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", diff --git a/projects/arlas-toolkit/src/lib/components/config-manager/action-modal/action-modal.component.ts b/projects/arlas-toolkit/src/lib/components/config-manager/action-modal/action-modal.component.ts index 36ee616a2..576d9656a 100644 --- a/projects/arlas-toolkit/src/lib/components/config-manager/action-modal/action-modal.component.ts +++ b/projects/arlas-toolkit/src/lib/components/config-manager/action-modal/action-modal.component.ts @@ -55,9 +55,6 @@ export class ActionModalComponent { if (!!arlasConfig) { const hasResources = this.configurationService.hasResources(arlasConfig); if (hasResources) { - - } - if (this.configurationService.hasResources(arlasConfig)) { this.duplicateResourcesThenConfig$(arlasConfig, newName, config.org).subscribe({ error: error => this.raiseError(error), next: () => { diff --git a/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.html b/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.html index cc526b350..05cb1c650 100644 --- a/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.html +++ b/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.html @@ -22,7 +22,7 @@
- diff --git a/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.ts b/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.ts index 024f630da..f64ef3549 100644 --- a/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.ts +++ b/projects/arlas-toolkit/src/lib/components/config-manager/config-menu/config-menu.component.ts @@ -37,7 +37,6 @@ import { ErrorService } from '../../../services/error/error.service'; }) export class ConfigMenuComponent implements OnInit { @Input() public actions: Array; - @Input() public canCreateDashboard = false; @Input() public zone: string; diff --git a/projects/arlas-toolkit/src/lib/services/persistence/persistence.service.ts b/projects/arlas-toolkit/src/lib/services/persistence/persistence.service.ts index 466a06b31..0e364c3a6 100644 --- a/projects/arlas-toolkit/src/lib/services/persistence/persistence.service.ts +++ b/projects/arlas-toolkit/src/lib/services/persistence/persistence.service.ts @@ -42,6 +42,7 @@ export class PersistenceService { } public get(id: string, options = this.options): Observable { + console.log(options.headers?.Authorization); return from(this.persistenceApi.getById(id, false, options)); } diff --git a/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts b/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts index bb5a524dd..a9a5384af 100644 --- a/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts +++ b/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts @@ -40,8 +40,8 @@ import * as rootContributorConfSchema from 'arlas-web-contributors/jsonSchemas/r import { CollaborativesearchService, ConfigService, Contributor } from 'arlas-web-core'; import { projType } from 'arlas-web-core/models/projections'; import YAML from 'js-yaml'; -import { Subject } from 'rxjs'; -import { mergeMap } from 'rxjs/operators'; +import { Subject, defer, of, throwError, timer } from 'rxjs'; +import { catchError, delayWhen, map, mergeMap, retry, retryWhen, take, tap } from 'rxjs/operators'; import { PersistenceService, PersistenceSetting } from '../persistence/persistence.service'; import { CONFIG_ID_QUERY_PARAM, GET_OPTIONS, WidgetConfiguration, getFieldProperties, @@ -627,12 +627,22 @@ export class ArlasStartupService { let configData; if (usePersistence) { if (!!configurationId) { - configDataPromise = this.persistenceService.get(configurationId).toPromise() + configDataPromise = defer(() => this.persistenceService.get(configurationId)).pipe( + catchError(err => { + this.errorService.closeAll(); + return throwError(() => err); + }), + retry({ count: 1, delay: 2000 }) + ).toPromise() .then((s: DataWithLinks) => { - const config = JSON.parse(s.doc_value); - this.configService.appName = s.doc_key; - configData = config; - return Promise.resolve(config); + if (s) { + const config = JSON.parse(s.doc_value); + this.configService.appName = s.doc_key; + configData = config; + return Promise.resolve(config); + } + return Promise.resolve(null); + }).catch((err) => { if (!(err instanceof Response)) { this.shouldRunApp = false;