Fixed displayName return

finos · May 15, 2024 · 5d6ab84 · 5d6ab84
1 parent 0761a18
commit 5d6ab84
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kite9/web-fdc3",
   "private": true,
-  "version": "0.0.15",
+  "version": "0.0.16",
   "workspaces": [
     "packages/*"
   ],

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -2,7 +2,7 @@
   "name": "@kite9/client",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "scripts": {
     "build": "tsc --module es2022",
     "clean": "rimraf dist; rimraf cucumber-report.html; rimraf coverage"

diff --git a/packages/da-proxy/package.json b/packages/da-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kite9/da-proxy",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "files": [
     "dist"
   ],

diff --git a/packages/da-server/package.json b/packages/da-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kite9/da-server",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "files": [
     "dist"
   ],

diff --git a/packages/da-server/src/directory/BasicDirectory.ts b/packages/da-server/src/directory/BasicDirectory.ts
@@ -46,15 +46,19 @@ export class BasicDirectory implements Directory {
         return lfAugmented as DirectoryIntent[]
     }
 
-    retrieveIntents(contextType: string, resultType: string | undefined): DirectoryIntent[] {
+    retrieveAllIntents(): DirectoryIntent[] {
         const allIntents = this.retrieveAllApps()
             .flatMap(a => this.retrieveIntentsForApp(a))
-            .filter(i => {
-                return i.contexts.includes(contextType) && (genericResultTypeSame(resultType, i.resultType))
-            })
+
         return allIntents
     }
 
+    retrieveIntents(contextType: string | undefined, intentName: string | undefined, resultType: string | undefined): DirectoryIntent[] {
+        const matchingIntents = this.retrieveAllIntents()
+            .filter(i => this.intentMatches(i, contextType, intentName, resultType))
+        return matchingIntents
+    }
+
     retrieveApps(contextType: string | undefined, intentName: string | undefined, resultType: string | undefined): DirectoryApp[] {
         return this.retrieveAllApps()
             .filter(a => this.retrieveIntentsForApp(a)

diff --git a/packages/da-server/src/directory/DirectoryInterface.ts b/packages/da-server/src/directory/DirectoryInterface.ts
@@ -13,11 +13,15 @@ export type DirectoryApp = schemas['Application'];
 
 export interface Directory {
 
+    retrieveAllApps(): DirectoryApp[]
+
     retrieveApps(contextType: string | undefined, intentName: string | undefined, resultType: string | undefined): DirectoryApp[]
 
-    retrieveIntents(contextType: string, resultType: string | undefined): DirectoryIntent[]
+    retrieveAllIntents(): DirectoryIntent[]
+
+    retrieveIntents(contextType: string | undefined, intentName: string | undefined, resultType: string | undefined): DirectoryIntent[]
 
     retrieveAppsById(appId: string): DirectoryApp[]
 
-    retrieveAllApps(): DirectoryApp[]
+
 }
diff --git a/packages/da-server/src/handlers/IntentHandler.ts b/packages/da-server/src/handlers/IntentHandler.ts
@@ -225,10 +225,11 @@ export class IntentHandler implements MessageHandler {
         // TODO: Add result type
         const { context } = r.payload
 
-        const apps1 = this.directory.retrieveIntents(context?.type, undefined).map(di => {
+        const apps1 = this.directory.retrieveIntents(context?.type, undefined, undefined).map(di => {
             return {
                 intent: {
-                    name: di.intentName
+                    name: di.intentName,
+                    displayName: di.displayName
                 },
                 apps: [
                     {
@@ -279,7 +280,9 @@ export class IntentHandler implements MessageHandler {
                 return !running
             }) as AppMetadata[]
 
-
+        // just need this for the (deprecated) display name
+        const allMatchingIntents = this.directory.retrieveIntents(context?.type, intent, resultType)
+        const displayName = (allMatchingIntents.length > 0) ? allMatchingIntents[0].displayName : undefined
 
         const out = {
             meta: {
@@ -291,7 +294,8 @@ export class IntentHandler implements MessageHandler {
             payload: {
                 appIntent: {
                     intent: {
-                        name: r.payload.intent
+                        name: intent,
+                        displayName
                     },
                     apps: [...apps1, ...apps2]
                 }

diff --git a/packages/da-server/test/features/find-intent.feature b/packages/da-server/test/features/find-intent.feature
@@ -25,14 +25,14 @@ Feature: Find Intent API
   Scenario: Successful Find Intents Request
     When "App1/a1" finds intents with intent "loanBook" and contextType "{empty}" and result type "{empty}"
     Then messaging will have outgoing posts
-      | msg.type           | msg.payload.appIntent.intent.name | msg.payload.appIntent.apps.length | msg.payload.appIntent.apps[0].appId | to.instanceId |
-      | findIntentResponse | loanBook                          |                                 1 | libraryApp                          | a1            |
+      | msg.type           | msg.payload.appIntent.intent.name | msg.payload.appIntent.apps.length | msg.payload.appIntent.apps[0].appId | to.instanceId | msg.payload.appIntent.intent.displayName |
+      | findIntentResponse | loanBook                          |                                 1 | libraryApp                          | a1            | loan book                                |
 
   Scenario: Find Intents by Context Request
     When "App/a1" finds intents with contextType "fdc3.book"
     Then messaging will have outgoing posts
-      | msg.type                     | msg.payload.appIntents[0].intent.name | msg.payload.appIntents.length | to.instanceId |
-      | findIntentsByContextResponse | loanBook                              |                             4 | a1            |
+      | msg.type                     | msg.payload.appIntents[0].intent.name | msg.payload.appIntents.length | to.instanceId | msg.payload.appIntents[0].intent.displayName |
+      | findIntentsByContextResponse | loanBook                              |                             4 | a1            | loan book                                    |
 
   Scenario: Successful Find Intents Request With Channel
     When "App1/a1" finds intents with intent "streamBook" and contextType "fdc3.book" and result type "channel"

diff --git a/packages/da-server/test/step-definitions/intents.steps.ts b/packages/da-server/test/step-definitions/intents.steps.ts
@@ -15,11 +15,21 @@ type ListensFor = {
     };
 }
 
+function decamelize(str: string, separator: string) {
+    separator = typeof separator === 'undefined' ? '_' : separator;
+
+    return str
+        .replace(/([a-z\d])([A-Z])/g, '$1' + separator + '$2')
+        .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, '$1' + separator + '$2')
+        .toLowerCase();
+}
+
 function convertDataTableToListensFor(cw: CustomWorld, dt: DataTable): ListensFor {
     const hashes = dt.hashes()
     const out: { [key: string]: any } = {}
     hashes.forEach(h => {
         out[h["Intent Name"]] = {
+            displayName: decamelize(h["Intent Name"], " "),
             contexts: [handleResolve(h["Context Type"], cw)],
             resultType: handleResolve(h["Result Type"], cw)
         }

diff --git a/...ages/da-server/test/features/apps.feature → ...-server/test/unused-features/apps.feature b/...ages/da-server/test/features/apps.feature → ...-server/test/unused-features/apps.feature
diff --git a/...da-server/test/features/broadcast.feature → ...er/test/unused-features/broadcast.feature b/...da-server/test/features/broadcast.feature → ...er/test/unused-features/broadcast.feature
diff --git a/...erver/test/features/intent-result.feature → ...est/unused-features/intent-result.feature b/...erver/test/features/intent-result.feature → ...est/unused-features/intent-result.feature
diff --git a/...ver/test/features/private-channel.feature → ...t/unused-features/private-channel.feature b/...ver/test/features/private-channel.feature → ...t/unused-features/private-channel.feature
diff --git a/...server/test/features/raise-intent.feature → ...test/unused-features/raise-intent.feature b/...server/test/features/raise-intent.feature → ...test/unused-features/raise-intent.feature
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kite9/demo",
   "private": true,
-  "version": "0.0.15",
+  "version": "0.0.16",
   "scripts": {
     "dev": "nodemon -w src/server -x tsx src/server/main.ts",
     "start": "NODE_ENV=production tsx src/server/main.ts",

diff --git a/packages/fdc3-common/package.json b/packages/fdc3-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kite9/fdc3-common",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "files": [
     "dist"
   ],

diff --git a/packages/fdc3-workbench/package.json b/packages/fdc3-workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fdc3-workbench",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "private": true,
   "homepage": ".",
   "license": "Apache-2.0",