@monolith-forensics/monolith-ui 1.2.72 → 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,6 +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?: FilterDefinitionOverride[];
 }
 export type UseFilterDefinitionsType = (p: UserFilterDefinitionsParams) => FilterDefinition[];
-export declare function useFilterDefinitions({ filterDef, }: UserFilterDefinitionsParams): FilterDefinition[];
+export declare function useFilterDefinitions({ filterDef, overrides, }: UserFilterDefinitionsParams): FilterDefinition[];
+export {};

package/dist/QueryFilter/useFilterDefinitions.js

@@ -1,7 +1,44 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { useQueries } from "@tanstack/react-query";
-export function useFilterDefinitions({ filterDef, }) {
+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;
+        }
+        const { query, dropDownOptions } = override, rest = __rest(override, ["query", "dropDownOptions"]);
+        // Handle merge directly on query and dropDownOptions
+        // prevents overriding the entire query object
+        // allows user to override specific properties
+        if (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({}, f.dropDownOptions), dropDownOptions);
+        }
+        // Merge override with original filter def
+        return Object.assign(Object.assign({}, f), rest);
+    });
+};
+export function useFilterDefinitions({ filterDef, overrides, }) {
+    let _filterDef = filterDef;
+    if (!!overrides) {
+        _filterDef = mergeOverrides(filterDef, overrides);
+    }
     // Keeps track of filters that have queries
     const queryIndex = [];
+    // Get query options from filter defs
     const queries = filterDef
         .filter((f, i) => {
         // Track array index of filter def that has a query
@@ -10,9 +47,11 @@ export function useFilterDefinitions({ filterDef, }) {
         return hasQuery;
     })
         .map((filter) => filter.query);
+    // run queries from filter defs
     const result = useQueries({
         queries,
     });
+    // Add useQueries result data to filter def as options
     queryIndex.forEach((index, i) => {
         var _a;
         // User query index to add useQueries result data to filter def as options

package/package.json

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