fix package dependency issues (#540)

finos · Feb 23, 2023 · d4160fd · d4160fd
1 parent a2b1e43
commit d4160fd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/vuu-ui/packages/vuu-data/package.json b/vuu-ui/packages/vuu-data/package.json
@@ -15,6 +15,8 @@
     "@finos/vuu-protocol-types": "0.0.26"
   },
   "peerDependencies": {
+    "@finos/vuu-filters": "0.0.26",
+    "@finos/vuu-popups": "0.0.26",
     "@finos/vuu-utils": "0.0.26",
     "react": "^17.0.2"
   }

diff --git a/vuu-ui/packages/vuu-data/src/array-data-source.ts b/vuu-ui/packages/vuu-data/src/array-data-source.ts
@@ -1,5 +1,5 @@
 import { ColumnDescriptor, Selection } from "@finos/vuu-datagrid-types";
-import { KeySet } from "@finos/vuu-datatable/src/KeySet";
+import { KeySet } from "./server-proxy/keyset";
 import {
   LinkDescriptorWithLabel,
   VuuGroupBy,

diff --git a/vuu-ui/packages/vuu-data/src/hooks/useVuuMenuActions.ts b/vuu-ui/packages/vuu-data/src/hooks/useVuuMenuActions.ts
@@ -15,7 +15,7 @@ import {
   VuuRowDataItemType,
 } from "@finos/vuu-protocol-types";
 import { ColumnMap, getRowRecord, metadataKeys } from "@finos/vuu-utils";
-import { getFilterPredicate } from "@finos/vuu-utils/src/filter-evaluation-utils";
+import { getFilterPredicate } from "@finos/vuu-filters";
 import { useCallback } from "react";
 import {
   DataSource,

diff --git a/vuu-ui/packages/vuu-filters/package.json b/vuu-ui/packages/vuu-filters/package.json
@@ -14,6 +14,7 @@
     "@finos/vuu-codemirror": "0.0.26",
     "@finos/vuu-data": "0.0.26",
     "@finos/vuu-utils": "0.0.26",
+    "@salt-ds/core": "1.0.0",
     "@heswell/salt-lab": "1.0.0-alpha.0-vuu.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"

diff --git a/.../vuu-utils/src/filter-evaluation-utils.ts → ...uu-filters/src/filter-evaluation-utils.ts b/.../vuu-utils/src/filter-evaluation-utils.ts → ...uu-filters/src/filter-evaluation-utils.ts
@@ -6,8 +6,8 @@ import {
   OrFilter,
   SingleValueFilterClause,
 } from "@finos/vuu-filter-types";
-import { parseFilter } from "@finos/vuu-filters/src/filter-input/filter-language-parser/FilterParser";
-import { ColumnMap } from "./column-utils";
+import { ColumnMap } from "@finos/vuu-utils";
+import { parseFilter } from "./filter-input/filter-language-parser/FilterParser";
 
 const filterPredicateMap = new Map<string, FilterPredicate>();
 

diff --git a/vuu-ui/packages/vuu-filters/src/index.ts b/vuu-ui/packages/vuu-filters/src/index.ts
@@ -1,4 +1,5 @@
 export * from "./filter-input";
 export * from "./filter-toolbar";
+export * from "./filter-evaluation-utils";
 export * from "./filter-utils";
 export * from "./filterTypes";