@equinor/fusion-framework-module-analytics 0.3.0 → 1.0.1

package/dist/types/collectors/ContextSelectedCollector.d.ts

@@ -1,6 +1,7 @@
 import { type ObservableInput } from 'rxjs';
 import type { IAnalyticsCollector } from './AnalyticsCollector.interface.js';
 import type { IContextProvider } from '@equinor/fusion-framework-module-context';
+import type { AppModuleProvider } from '@equinor/fusion-framework-module-app';
 import { BaseCollector } from './BaseCollector.js';
 import { type ContextItemType } from './utils/extractContextMetadata.js';
 /**
@@ -9,13 +10,15 @@ import { type ContextItemType } from './utils/extractContextMetadata.js';
  */
 export declare class ContextSelectedCollector extends BaseCollector<ContextItemType, {
     previous?: ContextItemType;
+    appKey?: string;
 }> implements IAnalyticsCollector {
     #private;
-    constructor(contextProvider: IContextProvider);
+    constructor(contextProvider: IContextProvider, appProvider: AppModuleProvider);
     _initialize(): ObservableInput<{
         value: ContextItemType;
         attributes: {
             previous?: ContextItemType;
+            appKey?: string;
         };
     }>;
 }

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.3.0";
+export declare const version = "1.0.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-analytics",
-  "version": "0.3.0",
+  "version": "1.0.1",
   "description": "Fusion module for collecting and exporting application analytics using OpenTelemetry standards",
   "main": "dist/esm/index.js",
   "type": "module",
@@ -49,11 +49,11 @@
     "rxjs": "^7.8.1",
     "uuid": "^13.0.0",
     "zod": "^4.1.11",
-    "@equinor/fusion-framework-module": "5.0.5",
     "@equinor/fusion-framework-module-context": "7.0.2",
     "@equinor/fusion-framework-module-event": "5.0.0",
     "@equinor/fusion-framework-module-http": "7.0.7",
-    "@equinor/fusion-framework-module-app": "7.4.0"
+    "@equinor/fusion-framework-module-app": "7.4.0",
+    "@equinor/fusion-framework-module": "5.0.5"
   },
   "devDependencies": {
     "typescript": "^5.8.2",

package/src/collectors/ContextSelectedCollector.ts

@@ -1,6 +1,7 @@
 import { distinctUntilChanged, map, type ObservableInput, pairwise } from 'rxjs';
 import type { IAnalyticsCollector } from './AnalyticsCollector.interface.js';
 import type { IContextProvider } from '@equinor/fusion-framework-module-context';
+import type { AppModuleProvider } from '@equinor/fusion-framework-module-app';
 import { z } from 'zod';
 import { BaseCollector, createSchema } from './BaseCollector.js';
 import {
@@ -12,26 +13,31 @@ import {
 /**
  * The schema of the data to be sent.
  */
-const eventSchema = createSchema(contextSchema, z.object({ previous: contextSchema }));
+const eventSchema = createSchema(
+  contextSchema,
+  z.object({ previous: contextSchema, appKey: z.string().optional() }),
+);
 
 /**
  * Collector to listen for context changes and add values and attributes for
  * further processing by adapters.
  */
 export class ContextSelectedCollector
-  extends BaseCollector<ContextItemType, { previous?: ContextItemType }>
+  extends BaseCollector<ContextItemType, { previous?: ContextItemType; appKey?: string }>
   implements IAnalyticsCollector
 {
   #contextProvider: IContextProvider;
+  #appProvider: AppModuleProvider;
 
-  constructor(contextProvider: IContextProvider) {
+  constructor(contextProvider: IContextProvider, appProvider: AppModuleProvider) {
     super('context-selected', eventSchema);
     this.#contextProvider = contextProvider;
+    this.#appProvider = appProvider;
   }
 
   _initialize(): ObservableInput<{
     value: ContextItemType;
-    attributes: { previous?: ContextItemType };
+    attributes: { previous?: ContextItemType; appKey?: string };
   }> {
     const contextSelected$ = this.#contextProvider.currentContext$.pipe(
       // Only emit when an actual change has happened.
@@ -46,6 +52,7 @@ export class ContextSelectedCollector
           value: next && extractContextMetadata(next),
           attributes: {
             previous: prev && extractContextMetadata(prev),
+            appKey: this.#appProvider.current?.appKey,
           },
         };
       }),

package/src/collectors/utils/extractContextMetadata.ts

@@ -19,9 +19,9 @@ export type ContextItemType = z.infer<typeof contextSchema>;
 export const extractContextMetadata = (context: ContextItem): z.input<typeof contextSchema> => {
   return {
     id: context.id,
-    externalId: context.externalId,
-    title: context.title,
+    externalId: context.externalId ?? undefined,
+    title: context.title ?? undefined,
     type: context.type.id,
-    source: context.source,
+    source: context.source ?? undefined,
   };
 };

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.3.0';
+export const version = '1.0.1';