add expression support for organisation instance owner name

src/features/expressions/expression-functions.ts

@@ -390,6 +390,7 @@ export const ExprFunctionImplementations: { [K in ExprFunctionName]: Implementat
       appId: true,
       instanceOwnerPartyId: true,
       instanceOwnerPartyType: true,
+      instanceOwnerName: true,
     };
 
     if (key === null || instanceDataSourcesKeys[key] !== true) {

src/features/expressions/shared-tests/functions/instanceContext/instanceOwnerNameOrg.json

@@ -0,0 +1,18 @@
+{
+  "name": "Instance owner name when instance owner is Person",
+  "expression": [
+    "instanceContext",
+    "instanceOwnerName"
+  ],
+  "expects": "My Org AS",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "organisationNumber": "1234567",
+      "party": {
+        "name": "My Org AS"
+      }
+    }
+  }
+}

src/features/expressions/shared-tests/functions/instanceContext/instanseOwnerNamePerson.json

@@ -0,0 +1,17 @@
+{
+  "name": "Instance owner name when instance owner is Person",
+  "expression": [
+    "instanceContext",
+    "instanceOwnerName"
+  ],
+  "expects": "unknown",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "party": {
+        "name": "Secret Name"
+      }
+    }
+  }
+}

src/types/shared.ts

@@ -96,6 +96,7 @@ export interface IInstanceOwner {
   personNumber?: string;
   organisationNumber?: string | null;
   username?: string;
+  party?: IParty | null;
 }
 
 export interface IInstanceState {
@@ -292,6 +293,7 @@ export interface IInstanceDataSources {
   appId: string;
   instanceOwnerPartyId: string;
   instanceOwnerPartyType: InstanceOwnerPartyType;
+  instanceOwnerName?: string;
 }
 
 export type IActionType = 'instantiate' | 'confirm' | 'sign' | 'reject';

src/utils/instanceDataSources.test.ts

@@ -11,6 +11,9 @@ describe('instanceDataSources/instanceContext', () => {
       appId,
       instanceOwner: {
         partyId,
+        party: {
+          name: 'My secret person name',
+        },
       },
     } as IInstance;
 
@@ -19,6 +22,35 @@ describe('instanceDataSources/instanceContext', () => {
       instanceId: instaceId,
       instanceOwnerPartyId: partyId,
       instanceOwnerPartyType: 'unknown',
+      instanceOwnerName: 'unknown',
+    };
+    const actual = buildInstanceDataSources(mockInstance);
+
+    expect(actual).toEqual(expected);
+  });
+
+  it('should build a valid instance context with instance owner name if organisation', () => {
+    const partyId = '1337';
+    const appId = 'tdd/enapp';
+    const instaceId = `${partyId}/super-secret-uuid-000`;
+    const mockInstance: IInstance = {
+      id: instaceId,
+      appId,
+      instanceOwner: {
+        partyId,
+        organisationNumber: '123456789',
+        party: {
+          name: 'My Organisation AS',
+        },
+      },
+    } as IInstance;
+
+    const expected: IInstanceDataSources = {
+      appId,
+      instanceId: instaceId,
+      instanceOwnerPartyId: partyId,
+      instanceOwnerPartyType: 'org',
+      instanceOwnerName: 'My Organisation AS',
     };
     const actual = buildInstanceDataSources(mockInstance);
 

src/utils/instanceDataSources.ts

@@ -1,7 +1,7 @@
 import type { IInstance, IInstanceDataSources } from 'src/types/shared';
 
 export function buildInstanceDataSources(instance?: IInstance | null | undefined): IInstanceDataSources | null {
-  if (!instance || !instance.instanceOwner) {
+  if (!instance?.instanceOwner) {
     return null;
   }
   const instanceOwnerPartyType = instance.instanceOwner.organisationNumber
@@ -12,10 +12,14 @@ export function buildInstanceDataSources(instance?: IInstance | null | undefined
         ? 'selfIdentified'
         : 'unknown';
 
+  // instanceOwnerName is set to 'unknown' if the instanceOwner is not an organisation
+  const instanceOwnerName = instance.instanceOwner.organisationNumber ? instance.instanceOwner?.party?.name : 'unknown';
+
   return {
     appId: instance.appId,
     instanceId: instance.id,
     instanceOwnerPartyId: instance.instanceOwner?.partyId,
     instanceOwnerPartyType,
+    instanceOwnerName,
   };
 }