Fix faulty conflict resolutions

- for finos:main -> sl:main
ScottLogic · Nov 13, 2023 · 61cafc2 · 61cafc2
1 parent 66fc0db
commit 61cafc2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 34 deletions.
diff --git a/vuu-ui/packages/vuu-data-react/src/hooks/useVuuMenuActions.ts b/vuu-ui/packages/vuu-data-react/src/hooks/useVuuMenuActions.ts
@@ -1,12 +1,7 @@
 import {
   DataSource,
-  DataSourceMenusMessage,
   DataSourceVisualLinkCreatedMessage,
-  DataSourceVisualLinkRemovedMessage,
-  DataSourceVisualLinksMessage,
   MenuRpcResponse,
-  VuuFeatureInvocationMessage,
-  VuuFeatureMessage,
   VuuUIMessageInRPCEditReject,
   VuuUIMessageInRPCEditResponse,
 } from "@finos/vuu-data";
@@ -16,7 +11,6 @@ import {
   MenuActionHandler,
   MenuBuilder,
 } from "@finos/vuu-data-types";
-import { GridAction } from "@finos/vuu-datagrid-types";
 import { getFilterPredicate } from "@finos/vuu-filter-parser";
 import {
   ClientToServerMenuCellRPC,
@@ -185,7 +179,7 @@ export type VuuServerMenuOptions = {
   columnMap: ColumnMap;
   columnName: string;
   row: DataSourceRow;
-  selectedRowsCount: number;
+  selectedRows: DataSourceRow[];
   viewport: string;
 };
 

diff --git a/vuu-ui/packages/vuu-data/src/connection-manager.ts b/vuu-ui/packages/vuu-data/src/connection-manager.ts
@@ -17,6 +17,7 @@ import {
 } from "./data-source";
 import * as Message from "./server-proxy/messages";
 import {
+  ConnectionQualityMetrics,
   ConnectionStatusMessage,
   isConnectionQualityMetrics,
   isConnectionStatusMessage,
@@ -32,7 +33,6 @@ import {
 
 // Note: inlined-worker is a generated file, it must be built
 import { workerSourceCode } from "./inlined-worker";
-import { ConnectionQualityMetrics } from "./vuuUIMessageTypes";
 import { WebSocketProtocol } from "./websocket-connection";
 import { TableSchema } from "./message-utils";
 
@@ -164,7 +164,6 @@ function handleMessageFromWorker({
   } else if (isConnectionStatusMessage(message)) {
     ConnectionManager.emit("connection-status", message);
   } else if (isConnectionQualityMetrics(message)) {
-    console.log({ message });
     ConnectionManager.emit("connection-metrics", message);
   } else {
     const requestId = (message as VuuUIMessageInRPC).requestId;

diff --git a/vuu-ui/packages/vuu-data/src/json-data-source.ts b/vuu-ui/packages/vuu-data/src/json-data-source.ts
@@ -1,14 +1,13 @@
 import { ColumnDescriptor, Selection } from "@finos/vuu-datagrid-types";
 import {
+  ClientToServerEditRpc,
+  ClientToServerMenuRPC,
   LinkDescriptorWithLabel,
-  VuuGroupBy,
   VuuAggregation,
+  VuuGroupBy,
   VuuRange,
-  VuuSort,
-  ClientToServerMenuRPC,
-  ClientToServerEditRpc,
-  VuuColumnDataType,
   VuuRowDataItemType,
+  VuuSort,
 } from "@finos/vuu-protocol-types";
 import { DataSourceFilter, DataSourceRow } from "@finos/vuu-data-types";
 import {
@@ -338,10 +337,6 @@ export class JsonDataSource
     this.#aggregations = aggregations;
   }
 
-  set data(data: JsonData) {
-    console.log(`set JsonDataSource data`);
-  }
-
   get sort() {
     return this.#sort;
   }

diff --git a/vuu-ui/packages/vuu-layout/test/layout-persistence/LocalLayoutPersistenceManager.test.ts b/vuu-ui/packages/vuu-layout/test/layout-persistence/LocalLayoutPersistenceManager.test.ts
@@ -263,19 +263,13 @@ describe("updateLayout", () => {
   it("errors if there are no metadata entries and multiple layouts in local storage with requested ID ", async () => {
     saveLocalEntity(layoutsSaveLocation, [existingLayout, existingLayout]);
 
-<<<<<<< HEAD
     expectPromiseRejectsWithError(
       () =>
         persistenceManager.updateLayout(
           existingId,
           metadataToUpdate,
           layoutToAdd
         ),
-=======
-    expectError(
-      () =>
-        persistenceManager.updateLayout(existingId, metadataToAdd, layoutToAdd),
->>>>>>> finos-main
       `No metadata with ID ${existingId}; Non-unique layout with ID ${existingId}`
     );
   });

diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css b/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css
@@ -8,16 +8,15 @@
 
 .vuuBasketNewBasketPanel-body {
     flex: 1 1 auto;
+    padding: 16px 0;
 }
 
 .vuuBasketNewBasketPanel-buttonBar {
     --saltButton-borderRadius: 6px;
     --saltButton-padding: 12px;
     display: flex;
     align-items: flex-end;
-    gap: 8px;
-    height: 32px;
     justify-content: flex-end;
-    padding: 0 16px;
-
-}
+    padding-top: 8px;
+    gap: 8px;
+}
diff --git a/vuu-ui/showcase/src/examples/Table/TableNext.examples.tsx b/vuu-ui/showcase/src/examples/Table/TableNext.examples.tsx
@@ -6,15 +6,14 @@ import {
   View,
 } from "@finos/vuu-layout";
 import { ContextPanel } from "@finos/vuu-shell";
-import { TableNext } from "@finos/vuu-table";
+import { GroupHeaderCellNext, TableNext } from "@finos/vuu-table";
 import {
   ColumnSettingsPanel,
   TableSettingsPanel,
 } from "@finos/vuu-table-extras";
 import { ColumnDescriptor, TableConfig } from "@finos/vuu-datagrid-types";
 import { CSSProperties, useCallback, useMemo, useState } from "react";
 import { useTableConfig, useTestDataSource } from "../utils";
-import { GroupHeaderCellNext } from "@finos/vuu-table";
 import { getAllSchemas } from "@finos/vuu-data-test";
 
 import "./TableNext.examples.css";

diff --git a/vuu/src/main/scala/org/finos/vuu/provider/VuuJoinTableProvider.scala b/vuu/src/main/scala/org/finos/vuu/provider/VuuJoinTableProvider.scala
@@ -148,9 +148,6 @@ class VuuJoinTableProvider(implicit timeProvider: Clock, lifecycle: LifecycleCon
 
   def eventToKey(tableName: String, ev: util.HashMap[String, Any]): String = {
     val keyField = sourceTableDefsByName.get(tableName).keyField
-    if(keyField == null)
-      println("here")
-
     ev.get(keyField).toString
   }