connect takeOffMarket

finos · Dec 5, 2023 · a9a94e4 · a9a94e4
1 parent 32a3159
commit a9a94e4
Show file tree

Hide file tree

Showing 7 changed files with 2,653 additions and 21 deletions.
diff --git a/vuu-ui/packages/vuu-data/src/inlined-worker.js b/vuu-ui/packages/vuu-data/src/inlined-worker.js
diff --git a/vuu-ui/packages/vuu-protocol-types/index.d.ts b/vuu-ui/packages/vuu-protocol-types/index.d.ts
@@ -215,8 +215,8 @@ export interface ServerToClientRPC {
 // TODO flesh out as we know more
 export interface ServerToClientViewportRpcResponse {
   action: {
-    msg: string;
-    type: "VP_RPC_FAILURE";
+    msg?: string;
+    type: "VP_RCP_FAILURE" | "VP_RCP_SUCCESS";
   };
   type: "VIEW_PORT_RPC_REPONSE";
   method: string;

diff --git a/vuu-ui/packages/vuu-shell/src/shell-layouts/context-panel/ContextPanel.css b/vuu-ui/packages/vuu-shell/src/shell-layouts/context-panel/ContextPanel.css
@@ -27,7 +27,7 @@
     padding-top: 24px;
     padding-left: var(--vuu-side-panel-padding, 0);
     padding-right: var(--vuu-side-panel-padding, 0);
-    position: absolute;
+    position: absolute !important;
     right: 0;
     top:0;
     transition-property: padding-left, padding-right, width;
@@ -41,7 +41,7 @@
     align-items: center;
     display: flex;
     flex-wrap: nowrap;
-    flex: 0 0 27px;
+    flex: 0 0 27px !important;
     justify-content: space-between;
 }
 

diff --git a/vuu-ui/packages/vuu-ui-controls/src/instrument-search/useInstrumentSearch.ts b/vuu-ui/packages/vuu-ui-controls/src/instrument-search/useInstrumentSearch.ts
@@ -17,7 +17,6 @@ export const useInstrumentSearch = ({
   searchColumns = ["description"],
   table,
 }: InstrumentSearchHookProps) => {
-  console.log(`useInstrumentSearch`);
   const [dataSource, setDataSource] = useState(dataSourceProp);
   const { loadSession, saveSession } = useViewContext();
 
@@ -42,8 +41,9 @@ export const useInstrumentSearch = ({
         } else {
           getVuuTableSchema(table).then((tableSchema) => {
             const newDataSource = new RemoteDataSource({
-              table: tableSchema.table,
               columns: tableSchema.columns.map((col) => col.name),
+              // sort: { sortDefs: [{ column: "description", sortType: "A" }] },
+              table: tableSchema.table,
             });
             setDataSource(newDataSource);
             saveSession?.(newDataSource, sessionKey);

diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/basket-toolbar/BasketToolbar.tsx b/vuu-ui/sample-apps/feature-basket-trading/src/basket-toolbar/BasketToolbar.tsx
@@ -40,7 +40,7 @@ export interface BasketToolbarProps extends HTMLAttributes<HTMLDivElement> {
   BasketSelectorProps: BasketSelectorProps;
   onCommit?: BasketChangeHandler;
   onSendToMarket: (basketInstanceId: string) => void;
-  onTakeOffMarket: () => void;
+  onTakeOffMarket: (basketInstanceId: string) => void;
 }
 
 export const BasketToolbar = ({
@@ -94,6 +94,12 @@ export const BasketToolbar = ({
     }
   }, [basket?.instanceId, onSendToMarket]);
 
+  const handleTakeOffMarket = useCallback(() => {
+    if (basket?.instanceId) {
+      onTakeOffMarket(basket?.instanceId);
+    }
+  }, [basket?.instanceId, onTakeOffMarket]);
+
   const basketSelector = (
     <BasketSelector {...BasketSelectorProps} basket={basket} key="selector" />
   );
@@ -191,7 +197,7 @@ export const BasketToolbar = ({
     <Button
       className={`${classBase}-takeOffMarket`}
       key="off-market"
-      onClick={onTakeOffMarket}
+      onClick={handleTakeOffMarket}
       variant="primary"
     >
       off market

diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx b/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx
@@ -2,15 +2,19 @@ import { useVuuMenuActions } from "@finos/vuu-data-react";
 import { DataSourceRow } from "@finos/vuu-data-types";
 import { useViewContext } from "@finos/vuu-layout";
 import { buildColumnMap, ColumnMap } from "@finos/vuu-utils";
-import { ContextMenuConfiguration } from "@finos/vuu-popups";
+import {
+  ContextMenuConfiguration,
+  NotificationLevel,
+  useNotifications,
+} from "@finos/vuu-popups";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { BasketSelectorProps } from "./basket-selector";
 import { BasketChangeHandler } from "./basket-toolbar";
 import { NewBasketPanel } from "./new-basket-panel";
 import { useBasketTradingDataSources } from "./useBasketTradingDatasources";
 import { BasketTradingFeatureProps } from "./VuuBasketTradingFeature";
 import { VuuDataRow, VuuDataRowDto } from "packages/vuu-protocol-types";
-import { SubscribeCallback } from "packages/vuu-data/src";
+import { SubscribeCallback, ViewportRpcResponse } from "packages/vuu-data/src";
 
 export class Basket {
   basketId: string;
@@ -69,6 +73,7 @@ export const useBasketTrading = ({
   basketTradingConstituentJoinSchema,
 }: BasketTradingHookProps) => {
   const { load, save } = useViewContext();
+  const { notify } = useNotifications();
 
   const basketConstituentMap = useMemo(
     () => buildColumnMap(basketConstituentSchema.columns),
@@ -239,20 +244,30 @@ export const useBasketTrading = ({
         );
         const ric = constituentRow[basketConstituentMap.ric];
         dataSourceBasketTradingConstituentJoin
-          .rpcCall?.({
+          .rpcCall?.<ViewportRpcResponse>({
             type: "VIEW_PORT_RPC_CALL",
             rpcName: "addConstituent",
             namedParams: {},
             params: [ric],
           })
           .then((response) => {
-            console.log(`rpc call response`, {
-              response,
-            });
+            if (response?.action.type === "VP_RCP_SUCCESS") {
+              notify?.({
+                type: NotificationLevel.Success,
+                header: "Add Constituent to Basket",
+                body: `${ric} added to basket`,
+              });
+            } else if (response?.action.type === "VP_RCP_FAILURE") {
+              notify?.({
+                type: NotificationLevel.Error,
+                header: "Add Constituent to Basket",
+                body: response?.action.msg ?? `Failed to add ${ric} to basket`,
+              });
+            }
           });
       }
     },
-    [basketConstituentMap, dataSourceBasketTradingConstituentJoin]
+    [basketConstituentMap.ric, dataSourceBasketTradingConstituentJoin, notify]
   );
 
   useEffect(() => {

diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTradingDatasources.ts b/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTradingDatasources.ts
@@ -103,7 +103,7 @@ export const useBasketTradingDataSources = ({
           type: "VIEW_PORT_RPC_CALL",
         })
         .then((response) => {
-          if (response?.action.type === "VP_RPC_FAILURE") {
+          if (response?.action.type === "VP_RCP_FAILURE") {
             notify({
               type: NotificationLevel.Error,
               header: "Failed to Send to market",
@@ -116,8 +116,24 @@ export const useBasketTradingDataSources = ({
     [dataSourceBasketTradingControl, notify]
   );
 
-  const handleTakeOffMarket = useCallback(() => {
-    console.log("take off market");
+  const handleTakeOffMarket = useCallback((basketInstanceId: string) => {
+    dataSourceBasketTradingControl
+      .rpcCall?.<ViewportRpcResponse>({
+        namedParams: {},
+        params: [basketInstanceId],
+        rpcName: "takeOffMarket",
+        type: "VIEW_PORT_RPC_CALL",
+      })
+      .then((response) => {
+        if (response?.action.type === "VP_RCP_FAILURE") {
+          notify({
+            type: NotificationLevel.Error,
+            header: "Failed to take off market",
+            body: "Please contact your support team",
+          });
+          console.error(response.action.msg);
+        }
+      });
   }, []);
 
   return {