@monolith-forensics/monolith-ui 1.2.73 → 1.2.75

package/dist/QueryFilter/DefaultOperators.d.ts

@@ -48,11 +48,11 @@ export declare const Operators: {
         value: string;
         label: string;
     };
-    IsNull: {
+    IsEmpty: {
         value: string;
         label: string;
     };
-    IsNotNull: {
+    IsNotEmpty: {
         value: string;
         label: string;
     };

package/dist/QueryFilter/DefaultOperators.js

@@ -11,8 +11,8 @@ export const Operators = {
     DoesNotContain: { value: "doesNotContain", label: "does not contain" },
     DoesNotBeginWith: { value: "doesNotBeginWith", label: "does not begin with" },
     DoesNotEndWith: { value: "doesNotEndWith", label: "does not end with" },
-    IsNull: { value: "null", label: "is null" },
-    IsNotNull: { value: "notNull", label: "is not null" },
+    IsEmpty: { value: "isEmpty", label: "is empty" },
+    IsNotEmpty: { value: "isNotEmpty", label: "is not empty" },
     In: { value: "in", label: "is any of" },
     NIn: { value: "nin", label: "is none of" },
     Between: { value: "between", label: "between" },

package/dist/QueryFilter/index.d.ts

@@ -2,4 +2,4 @@ export * from "./useQueryFilter";
 export * from "./QueryFilter";
 export * from "./types";
 export * from "./DefaultOperators";
-export * from "./useFilterDefinitions";
+export * from "./useFilterHelper";

package/dist/QueryFilter/index.js

@@ -2,4 +2,4 @@ export * from "./useQueryFilter";
 export * from "./QueryFilter";
 export * from "./types";
 export * from "./DefaultOperators";
-export * from "./useFilterDefinitions";
+export * from "./useFilterHelper";

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/useFilterHelper.d.ts

@@ -0,0 +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 UseFilterHelperParams {
+    filterDef: FilterDefinition[];
+    overrides?: FilterDefinitionOverride[];
+}
+export type UseFilterHelperType = (p: UseFilterHelperParams) => FilterDefinition[];
+export declare const useFilterHelper: UseFilterHelperType;
+export {};

package/dist/QueryFilter/{useFilterDefinitions.js → useFilterHelper.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,16 +22,16 @@ 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);
     });
 };
-export function useFilterDefinitions({ filterDef, overrides, }) {
+export const useFilterHelper = ({ filterDef, overrides, }) => {
     let _filterDef = filterDef;
     if (!!overrides) {
         _filterDef = mergeOverrides(filterDef, overrides);
@@ -57,4 +58,4 @@ export function useFilterDefinitions({ filterDef, overrides, }) {
         filterDef[index].selectOptions = (_a = result[i]) === null || _a === void 0 ? void 0 : _a.data;
     });
     return filterDef;
-}
+};

package/package.json

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

package/dist/QueryFilter/useFilterDefinitions.d.ts

@@ -1,7 +0,0 @@
-import { FilterDefinition } from "./types";
-export interface UserFilterDefinitionsParams {
-    filterDef: FilterDefinition[];
-    overrides?: Partial<FilterDefinition>[];
-}
-export type UseFilterDefinitionsType = (p: UserFilterDefinitionsParams) => FilterDefinition[];
-export declare function useFilterDefinitions({ filterDef, overrides, }: UserFilterDefinitionsParams): FilterDefinition[];