@c8y/ngx-components 1018.503.63 → 1018.503.69

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

@@ -23,7 +23,7 @@ import { tap, switchMap, shareReplay, takeUntil, map } from 'rxjs/operators';
 import * as i6 from 'ngx-bootstrap/dropdown';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { PopoverModule } from 'ngx-bootstrap/popover';
-import { uniq, pick } from 'lodash-es';
+import { pick, uniq } from 'lodash-es';
 import { LicenseConfirmModule } from '@c8y/ngx-components/ecosystem/license-confirm';
 import { A11yModule } from '@angular/cdk/a11y';
 
@@ -1183,12 +1183,21 @@ class DeployApplicationComponent {
         }
         try {
             this.deployedApp = await this.ecosystemService.deployApp(this.package, formGroupValue, this.model);
+            const applicationCustomEventInfo = pick(this.package, [
+                'id',
+                'name',
+                'contextPath',
+                'label',
+                'key'
+            ]);
             this.deployedWithSuccess = true;
             this.gainsightService.triggerEvent(PRODUCT_EXPERIENCE.APPLICATIONS.EVENTS.DEPLOY_APPLICATION, {
                 component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.DEPLOY_APPLICATION,
                 action: PRODUCT_EXPERIENCE.APPLICATIONS.ACTIONS.DEPLOY_APPLICATION,
                 result: PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.DEPLOYED,
-                url: this.CURRENT_LOCATION
+                url: this.CURRENT_LOCATION,
+                ...applicationCustomEventInfo,
+                package: this.deployedApp?.manifest?.package ?? null
             });
         }
         catch (error) {
@@ -1197,7 +1206,8 @@ class DeployApplicationComponent {
                 component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.DEPLOY_APPLICATION,
                 action: PRODUCT_EXPERIENCE.APPLICATIONS.ACTIONS.DEPLOY_APPLICATION,
                 result: PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.SERVER_FAILURE,
-                url: this.CURRENT_LOCATION
+                url: this.CURRENT_LOCATION,
+                error
             });
         }
         finally {
@@ -1390,11 +1400,6 @@ class PluginListComponent {
         await this.updateAppRemotes(plugin, 'install');
     }
     async uninstallPlugin(plugin) {
-        this.gainsightService.triggerEvent(PRODUCT_EXPERIENCE.APPLICATIONS.EVENTS.PACKAGE_PLUGINS, {
-            component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.PLUGIN_LIST,
-            action: PRODUCT_EXPERIENCE.APPLICATIONS.ACTIONS.INSTALL_PLUGIN,
-            url: this.CURRENT_LOCATION
-        });
         await this.updateAppRemotes(plugin, 'uninstall');
     }
     async updateAppRemotes(plugin, updateType) {
@@ -1447,22 +1452,40 @@ class PluginListComponent {
                     })
                     : this.translateService.instant(gettext('Plugin uninstalled from application "{{ appName }}".'), { appName: app.name });
                 this.alertService.success(successText);
-                this.gainsightService.triggerEvent(PRODUCT_EXPERIENCE.APPLICATIONS.EVENTS.PACKAGE_PLUGINS, {
-                    component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.PLUGIN_LIST,
-                    result: PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.PLUGIN_INSTALLED,
-                    url: this.CURRENT_LOCATION
-                });
+                this.onUpdateEventHandleGS(plugin, app, updateType);
             }
-            catch {
+            catch (error) {
                 this.gainsightService.triggerEvent(PRODUCT_EXPERIENCE.APPLICATIONS.EVENTS.PACKAGE_PLUGINS, {
                     component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.PLUGIN_LIST,
                     result: PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.SERVER_FAILURE,
-                    url: this.CURRENT_LOCATION
+                    url: this.CURRENT_LOCATION,
+                    error
                 });
             }
         }
         this.updatingPluginId[updateType] = '';
     }
+    onUpdateEventHandleGS(plugin, app, updateType) {
+        const pluginCustomEventInfo = pick(plugin, [
+            'name',
+            'contextPath',
+            'module',
+            'version',
+            'type',
+            'id'
+        ]);
+        const gsEventResult = updateType === 'install'
+            ? PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.PLUGIN_INSTALLED
+            : PRODUCT_EXPERIENCE.APPLICATIONS.RESULTS.PLUGIN_REMOVED;
+        this.gainsightService.triggerEvent(PRODUCT_EXPERIENCE.APPLICATIONS.EVENTS.PACKAGE_PLUGINS, {
+            component: PRODUCT_EXPERIENCE.APPLICATIONS.COMPONENTS.PLUGIN_LIST,
+            result: gsEventResult,
+            url: this.CURRENT_LOCATION,
+            ...pluginCustomEventInfo,
+            targetApplicationName: app.name,
+            targetApplicationContextPath: app.contextPath
+        });
+    }
     async getAppsForUpdate(plugin, updateType) {
         let apps = (await this.ecosystemService.getWebApplications()).filter(app => this.ecosystemService.isOwner(app) && app.type !== ApplicationType.EXTERNAL);
         if (updateType === 'install') {