@monolith-forensics/monolith-ui 1.2.73 → 1.2.74

package/dist/QueryFilter/types.d.ts

@@ -36,7 +36,7 @@ export interface FilterDefinition {
         style?: React.CSSProperties;
     };
     editorType?: EditorType;
-    query?: UseQueryOptions & {
+    query?: Omit<UseQueryOptions, "select"> & {
         select: (data: unknown) => DropDownItem[];
     };
 }

package/dist/QueryFilter/useFilterDefinitions.d.ts

@@ -1,7 +1,20 @@
+import { UseQueryOptions } from "@tanstack/react-query";
 import { FilterDefinition } from "./types";
+import { DropDownItem } from "../DropDownMenu";
+/** Override Filters Type
+ * some properties have been overridden to allow for partial overrides
+ */
+type FilterDefinitionOverride = Partial<Omit<FilterDefinition, "query" | "dataField">> & {
+    dataField: string;
+    query?: Omit<Partial<UseQueryOptions>, "select" | "queryKey"> & {
+        select?: (data: unknown) => DropDownItem[];
+        queryKey?: UseQueryOptions["queryKey"];
+    };
+};
 export interface UserFilterDefinitionsParams {
     filterDef: FilterDefinition[];
-    overrides?: Partial<FilterDefinition>[];
+    overrides?: FilterDefinitionOverride[];
 }
 export type UseFilterDefinitionsType = (p: UserFilterDefinitionsParams) => FilterDefinition[];
 export declare function useFilterDefinitions({ filterDef, overrides, }: UserFilterDefinitionsParams): FilterDefinition[];
+export {};

package/dist/QueryFilter/useFilterDefinitions.js

@@ -12,6 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { useQueries } from "@tanstack/react-query";
 const mergeOverrides = (filterDef, overrides) => {
     return filterDef.map((f) => {
+        var _a, _b, _c;
         const override = overrides.find((o) => o.dataField === f.dataField);
         if (!override) {
             return f;
@@ -21,10 +22,10 @@ const mergeOverrides = (filterDef, overrides) => {
         // prevents overriding the entire query object
         // allows user to override specific properties
         if (query) {
-            f.query = Object.assign(Object.assign({}, query), override.query);
+            f.query = Object.assign(Object.assign(Object.assign({}, f.query), query), { queryFn: query.queryFn || ((_a = f === null || f === void 0 ? void 0 : f.query) === null || _a === void 0 ? void 0 : _a.queryFn) || (() => { }), queryKey: query.queryKey || ((_b = f === null || f === void 0 ? void 0 : f.query) === null || _b === void 0 ? void 0 : _b.queryKey) || [], select: query.select || ((_c = f === null || f === void 0 ? void 0 : f.query) === null || _c === void 0 ? void 0 : _c.select) || (() => []) });
         }
         if (dropDownOptions) {
-            f.dropDownOptions = Object.assign(Object.assign({}, dropDownOptions), override.dropDownOptions);
+            f.dropDownOptions = Object.assign(Object.assign({}, f.dropDownOptions), dropDownOptions);
         }
         // Merge override with original filter def
         return Object.assign(Object.assign({}, f), rest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monolith-forensics/monolith-ui",
-  "version": "1.2.73",
+  "version": "1.2.74",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Matt Danner (Monolith Forensics LLC)",