@c8y/ngx-components 1021.25.5 → 1021.29.0

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

@@ -2230,6 +2230,12 @@ class OrphanedStatusCellRendererComponent {
                     text: gettext('LATEST`plugin status`'),
                     class: 'label-success'
                 };
+            case ApplicationPluginStatus.AUTO:
+                return {
+                    value: statusValue,
+                    text: gettext('AUTO`plugin status`'),
+                    class: 'label-success'
+                };
             default:
                 return null;
         }
@@ -2354,8 +2360,25 @@ 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]) => installedPlugins.filter(p => selfPlugins.some(selfPlugin => selfPlugin.id === p.id))
-            .length === selfPlugins.length && installedPlugins.length === selfPlugins.length));
+        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);
+        }));
         this.title = gettext('Installed plugins');
         this.loadMoreItemsLabel = gettext('Load more packages');
         this.loadingItemsLabel = gettext('Loading packages…');
@@ -2387,9 +2410,16 @@ class ApplicationPluginsComponent {
             {
                 name: 'Version',
                 header: gettext('Version'),
-                path: 'displayVersion',
+                path: 'version',
                 filterable: false
             },
+            {
+                name: 'Tag',
+                header: gettext('Tag`noun`'),
+                path: 'installedViaTag',
+                filterable: false,
+                cellRendererComponent: LabelCellRendererComponent
+            },
             {
                 name: 'description',
                 header: gettext('Description'),
@@ -2661,29 +2691,46 @@ class ApplicationPluginsComponent {
     }
     getInstallModalInitState() {
         return {
-            plugins$: combineLatest([
-                this.allAvailablePlugins$,
-                this.installedPlugins$.pipe(map(plugins => plugins.map(p => p.id)))
-            ]).pipe(map(([allPlugins, installedPlugins]) => {
-                const plugins = [];
-                allPlugins.map(p => plugins.push({
-                    ...p,
-                    installed: !!installedPlugins.includes(p.id)
-                }));
-                return plugins;
+            plugins$: combineLatest([this.allAvailablePlugins$, this.installedPlugins$]).pipe(map(([allPlugins, installedPlugins]) => {
+                // to not mutate the original array and objects contained in it
+                const allPluginsAsNewObjects = allPlugins.map(p => ({ ...p }));
+                for (const plugin of installedPlugins) {
+                    let installedPlugin = allPluginsAsNewObjects.find(p => p.id === plugin.id);
+                    if (!installedPlugin && plugin.installedViaTag) {
+                        installedPlugin = allPluginsAsNewObjects.find(p => p.contextPath === plugin.contextPath &&
+                            p.module === plugin.module &&
+                            p.tags?.includes(plugin.installedViaTag));
+                    }
+                    if (installedPlugin) {
+                        installedPlugin.installed = true;
+                        continue;
+                    }
+                }
+                return allPluginsAsNewObjects.map(p => ({ ...p, installed: !!p.installed }));
             }), shareReplay(1))
         };
     }
     getOrphanedPlugins(orphanedPluginIds, allPlugins) {
         const orphanedPlugins = orphanedPluginIds.map(p => this.extractDetails(p));
         const orphanedPluginsUpdated = orphanedPlugins.map(p => {
+            const pluginWithMatchingTag = allPlugins.find(tmp => tmp.contextPath === p.contextPath &&
+                tmp.module === p.module &&
+                tmp.tags?.includes(p.version || 'latest'));
+            if (pluginWithMatchingTag) {
+                return {
+                    ...pluginWithMatchingTag,
+                    id: p.id,
+                    status: ApplicationPluginStatus.AUTO,
+                    installedViaTag: p.version || 'latest'
+                };
+            }
             const pluginInDifferentVersion = allPlugins.find(tmp => tmp.contextPath === p.contextPath && tmp.module === p.module);
             if (pluginInDifferentVersion) {
                 return {
                     ...pluginInDifferentVersion,
-                    version: p.version || pluginInDifferentVersion.version,
+                    version: p.version,
                     id: p.id,
-                    status: p.version ? ApplicationPluginStatus.OUTDATED : ApplicationPluginStatus.LATEST
+                    status: ApplicationPluginStatus.OUTDATED
                 };
             }
             return p;
@@ -2716,12 +2763,15 @@ class ApplicationPluginsComponent {
         }));
         const orphanedPluginIds = remotePlugins.filter(r => !availablePlugins.find(plugin => plugin.id === r));
         const orphanedPlugins = this.getOrphanedPlugins(orphanedPluginIds, allPlugins);
-        const { actuallyOrphanedPlugins, revokedPlugins } = this.splitOrphanedPluginsIntoOrphanedAndRevokedPlugins(allPlugins, orphanedPlugins);
-        return [...availablePlugins, ...revokedPlugins, ...actuallyOrphanedPlugins].map(plugin => ({
-            ...plugin,
-            // adding 'v' prefix so version string is not treated as date in data grid
-            displayVersion: 'v' + plugin.version
-        }));
+        const notActuallyOrphanedPlugins = orphanedPlugins.filter(p => p.status === ApplicationPluginStatus.AUTO);
+        const orphanedOrRevokedPlugins = orphanedPlugins.filter(p => p.status !== ApplicationPluginStatus.AUTO);
+        const { actuallyOrphanedPlugins, revokedPlugins } = this.splitOrphanedPluginsIntoOrphanedAndRevokedPlugins(allPlugins, orphanedOrRevokedPlugins);
+        return [
+            ...availablePlugins,
+            ...notActuallyOrphanedPlugins,
+            ...revokedPlugins,
+            ...actuallyOrphanedPlugins
+        ];
     }
     extractDetails(pluginId) {
         const contextPath = this.getStringMatchingRegex(pluginId, /^[^@]*(@|\/)/);