@c8y/ngx-components 1021.22.116 → 1021.22.118

package/fesm2022/c8y-ngx-components-ecosystem.mjs

@@ -2362,25 +2362,8 @@ class ApplicationPluginsComponent {
             this.allAvailablePlugins$
         ]).pipe(map(([remotePlugins, allPlugins]) => this.getInstalledPlugins(allPlugins, remotePlugins)), shareReplay(1));
         this.orphanedPlugins$ = this.installedPlugins$.pipe(map(plugins => plugins.filter(p => p.status === ApplicationPluginStatus.ORPHANED)));
-        this.isStandard$ = combineLatest([this.installedPlugins$, this.selfPlugins$]).pipe(map(([installedPlugins, selfPlugins]) => {
-            const manifestRemotes = this.app?.manifest?.remotes || {};
-            // ensure that every installed plugin is a self plugin or a plugin from the manifest
-            const allInstalledPluginsAreSelf = installedPlugins.every(p => selfPlugins.some(selfPlugin => selfPlugin.id === p.id) ||
-                (Array.isArray(manifestRemotes[p.contextPath]) &&
-                    manifestRemotes[p.contextPath].includes(p.module)));
-            // ensure that every self plugin is installed
-            const allSelfPluginsAreInstalled = selfPlugins.every(selfPlugin => installedPlugins.some(p => p.id === selfPlugin.id));
-            const configRemotes = this.app?.config?.remotes || {};
-            // ensure that every remote from the manifest is in the config
-            // if no config exists we are also all good
-            const everyRemoteFromManifestIsInConfig = !this.app?.config?.remotes ||
-                Object.keys(manifestRemotes).every(contextPath => Array.isArray(configRemotes[contextPath]) &&
-                    Array.isArray(manifestRemotes[contextPath]) &&
-                    manifestRemotes[contextPath].every(module => configRemotes[contextPath].includes(module)));
-            return (allInstalledPluginsAreSelf &&
-                allSelfPluginsAreInstalled &&
-                everyRemoteFromManifestIsInConfig);
-        }));
+        // only use the installedPlugins$ and selfPlugins$ as triggers
+        this.isStandard$ = combineLatest([this.installedPlugins$, this.selfPlugins$]).pipe(map(() => this.isStandard(this.app)));
         this.title = gettext('Installed plugins');
         this.loadMoreItemsLabel = gettext('Load more packages');
         this.loadingItemsLabel = gettext('Loading packages…');
@@ -2608,6 +2591,43 @@ class ApplicationPluginsComponent {
         this.destroy$.next();
         this.destroy$.complete();
     }
+    isStandard(app) {
+        return (
+        // ensure that every remote from the manifest is in the config
+        this.everyRemoteFromManifestIsInConfig(app) &&
+            // should not have any excluded remotes
+            Object.keys(app?.config?.excludedRemotes || {}).length === 0 &&
+            // ensure that every remote from the config is in the manifest
+            this.everyRemoteFromConfigIsInManifest(app));
+    }
+    everyRemoteFromManifestIsInConfig(app) {
+        const manifestRemotes = app?.manifest?.remotes;
+        const configRemotes = app?.config?.remotes;
+        if (!manifestRemotes || !configRemotes) {
+            return true;
+        }
+        return Object.keys(manifestRemotes).every(contextPath => {
+            return (Array.isArray(configRemotes[contextPath]) &&
+                Array.isArray(manifestRemotes[contextPath]) &&
+                manifestRemotes[contextPath].every(module => {
+                    return configRemotes[contextPath].includes(module);
+                }));
+        });
+    }
+    everyRemoteFromConfigIsInManifest(app) {
+        const manifestRemotes = app?.manifest?.remotes || {};
+        const configRemotes = app?.config?.remotes;
+        if (!configRemotes) {
+            return true;
+        }
+        return Object.keys(configRemotes).every(contextPath => {
+            return (Array.isArray(configRemotes[contextPath]) &&
+                Array.isArray(manifestRemotes[contextPath]) &&
+                configRemotes[contextPath].every(module => {
+                    return manifestRemotes[contextPath].includes(module);
+                }));
+        });
+    }
     addInstallButtonToHeaderActionControls() {
         if (this.appId) {
             this.headerActionControls = [
@@ -2655,8 +2675,8 @@ class ApplicationPluginsComponent {
         return this.app;
     }
     async getApplicationMFExports(app) {
-        const exports = this.pluginsService.getMFExports(app, [], true);
-        return exports;
+        const applicationExports = this.pluginsService.getMFExports(app, [], true);
+        return applicationExports;
     }
     async getApplicationMFRemotes(app) {
         const appConfigRemotes = this.pluginsService.getMFRemotes(app);