Merge pull request #2120 from AdaptiveConsulting/nlp--fix

fix(client): NLP commands not working for workspace
AdaptiveConsulting · Sep 23, 2022 · 02796f0 · 02796f0
2 parents 06372e4 + 2d36907
commit 02796f0
Show file tree

Hide file tree

Showing 7 changed files with 5,277 additions and 762 deletions.
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
diff --git a/src/client/package.json b/src/client/package.json
@@ -42,7 +42,7 @@
     "build-storybook": "build-storybook -o ./dist/storybook"
   },
   "dependencies": {
-    "@adaptive/hydra-platform": "^3.99.0",
+    "@adaptive/hydra-platform": "^3.120.0",
     "@finos/fdc3": "^1.2.0",
     "@openfin/workspace": "^6.1.6",
     "@openfin/workspace-platform": "^6.1.6",

diff --git a/src/client/src/Launcher/services/nlpService.ts b/src/client/src/Launcher/services/nlpService.ts
@@ -1,14 +1,13 @@
 import { Direction } from "@/services/trades"
 import { DetectIntentResponse } from "dialogflow"
-import { ajax, AjaxResponse } from "rxjs/ajax"
+import { fromFetch } from "rxjs/fetch"
 import { bind } from "@react-rxjs/core"
 import { createSignal } from "@react-rxjs/utils"
 import {
   catchError,
   distinctUntilChanged,
   map,
   mapTo,
-  pluck,
   switchMap,
 } from "rxjs/operators"
 import { equals } from "@/utils"
@@ -90,13 +89,13 @@ export const [useNlpIntent, nlpIntent$] = bind<NlpIntent | null | Loading>(
         ? [null]
         : concat(
             timer(250).pipe(mapTo("loading" as Loading)),
-            ajax(
+            fromFetch(
               `${import.meta.env.VITE_CLOUD_FUNCTION_HOST}/nlp?term=${request}`,
             ).pipe(
-              map<AjaxResponse, DetectIntentResponse[]>(
-                ({ response }) => response,
+              switchMap((response) => response.json()),
+              map<DetectIntentResponse[], DetectIntentResponse>(
+                ([response]) => response,
               ),
-              pluck(0),
               catchError((e) => {
                 console.error("Error getting nlp response", e)
                 return of(null)

diff --git a/src/client/src/generated/TradingGateway.ts b/src/client/src/generated/TradingGateway.ts
@@ -1817,6 +1817,7 @@ export function checkCompatibility(): Observable<HydraPlatform.VersionNegotiatio
           methodRouteKey: BigInt("-7994767111825425152"),
         },
       ],
+      checkHandlersAreRegistered: true,
     },
   )
 }
-Original file line number
+Diff line change
@@ Expand Up @@
               methodRouteKey: BigInt("-7994767111825425152"),
             },
           ],
+          checkHandlersAreRegistered: true,
         },
       )
     }