@c8y/ngx-components 1018.0.112 → 1018.0.115

package/fesm2020/c8y-ngx-components-ecosystem-shared.mjs

@@ -7,8 +7,8 @@ import { gettext, PackageType, Status, DropAreaComponent, C8yStepper, CoreModule
 import * as i2$1 from '@ngx-translate/core';
 import { saveAs } from 'file-saver';
 import { groupBy, uniqBy, get, pick, kebabCase, cloneDeep } from 'lodash-es';
-import { BehaviorSubject, merge, combineLatest } from 'rxjs';
-import { debounceTime, take, distinctUntilKeyChanged, map, tap, filter, switchMap, shareReplay } from 'rxjs/operators';
+import { BehaviorSubject, defer, merge, combineLatest } from 'rxjs';
+import { map, shareReplay, debounceTime, take, distinctUntilKeyChanged, tap, filter, switchMap } from 'rxjs/operators';
 import { gt, coerce } from 'semver';
 import * as i3$1 from '@angular/common';
 import * as i4 from '@angular/router';
@@ -215,6 +215,7 @@ class EcosystemService {
         this.wizardModalService = wizardModalService;
         this.appDeleted = new EventEmitter();
         this.progress = new BehaviorSubject(null);
+        this.appsGroupedByContextPath$ = defer(() => this.getWebApplications()).pipe(map(webApps => groupBy(webApps, 'contextPath')), shareReplay({ bufferSize: 1, refCount: true }));
     }
     getUniqueAppConfig(srcApp, existingApps) {
         let app = {
@@ -314,7 +315,6 @@ class EcosystemService {
     async getWebApplications(customFilter = {}) {
         const apps = (await this.getApplications(customFilter)).data;
         const webApps = apps.filter(app => this.isApplication(app));
-        this.appsGroupedByContextPath = groupBy(webApps, 'contextPath');
         return webApps.sort((a, b) => a.name.localeCompare(b.name));
     }
     async getFeatureApplications(customFilter = {}) {
@@ -356,7 +356,7 @@ class EcosystemService {
         window.open(this.applicationService.getHref(app), '_blank', 'noopener,noreferrer');
     }
     async canDeleteApp(app) {
-        return (this.isOwner(app) && ((await this.hasSubscribedAppParent(app)) || !this.isCurrentApp(app)));
+        return (this.isOwner(app) && (!this.isCurrentApp(app) || (await this.hasSubscribedAppParent(app))));
     }
     isOwner(app) {
         const currentTenant = this.appStateService.currentTenant.value;
@@ -693,10 +693,8 @@ class EcosystemService {
         return !this.isOwner(app) && (await this.hasSubscribedAppParent(app));
     }
     async hasSubscribedAppParent(app) {
-        if (!this.appsGroupedByContextPath) {
-            await this.getWebApplications();
-        }
-        return app.contextPath && this.appsGroupedByContextPath[app.contextPath]?.length === 2;
+        const appsGroupedByContextPath = await this.appsGroupedByContextPath$.pipe(take(1)).toPromise();
+        return app.contextPath && appsGroupedByContextPath[app.contextPath]?.length === 2;
     }
     /**
      * @deprecated