@orchestrator-ui/orchestrator-ui-components 8.7.1 → 8.7.2

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.1 build
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.2 build
 npm notice run npm run generate-version && tsup src/index.ts
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.1 generate-version
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.2 generate-version
 npm notice run node -p "'export const ORCHESTRATOR_UI_LIBRARY_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'" > src/configuration/version.ts && prettier --write src/configuration/version.ts
 src/configuration/version.ts 44ms
 CLI Building entry: src/index.ts
@@ -10,9 +10,9 @@ src/configuration/version.ts 44ms
 CLI Target: es2022
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js     878.47 KB
+ESM dist/index.js     878.76 KB
 ESM dist/index.js.map 1.51 MB
-ESM ⚡️ Build success in 323ms
+ESM ⚡️ Build success in 314ms
 DTS Build start
-DTS ⚡️ Build success in 22597ms
+DTS ⚡️ Build success in 24972ms
 DTS dist/index.d.ts 1.53 MB

package/.turbo/turbo-lint.log

@@ -1,2 +1,2 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.1 lint
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.2 lint
 npm notice run eslint

package/.turbo/turbo-test.log

@@ -1,11 +1,11 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.1 test
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.7.2 test
 npm notice run jest
-PASS Wfo-UI Tests src/components/WfoTree/treeUtils.spec.ts
-PASS Wfo-UI Tests src/pages/processes/timelineUtils.spec.ts
-PASS Wfo-UI Tests src/utils/date.spec.ts
 PASS Wfo-UI Tests src/components/WfoSubscription/utils/utils.spec.ts
+PASS Wfo-UI Tests src/utils/date.spec.ts
+PASS Wfo-UI Tests src/components/WfoTree/treeUtils.spec.ts
 PASS Wfo-UI Tests src/utils/string.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/utils/tableUtils.spec.ts
+PASS Wfo-UI Tests src/pages/processes/timelineUtils.spec.ts
 PASS Wfo-UI Tests src/utils/getProductNamesFromProcess.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoTable/WfoGroupedTable/utils.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoTableWithFilter/updateQueryString.spec.ts
@@ -14,33 +14,33 @@ PASS Wfo-UI Tests src/utils/optionalArray.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/utils/tableConfigPersistence.spec.ts
 PASS Wfo-UI Tests src/messages/getTranslationMessages.spec.ts
 PASS Wfo-UI Tests src/rtk/utils.spec.ts
-PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts (5.648 s)
-PASS Wfo-UI Tests src/components/WfoPydanticForm/fields/WfoCron.spec.ts (5.113 s)
+PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts (6.379 s)
+PASS Wfo-UI Tests src/components/WfoPydanticForm/fields/WfoCron.spec.ts (5.541 s)
 PASS Wfo-UI Tests src/utils/resultFlattener.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryParams.spec.ts
-PASS Wfo-UI Tests src/components/WfoTable/WfoTableSettingsModal/WfoTableSettingsModal.spec.ts
 PASS Wfo-UI Tests src/utils/getEnvironmentVariables.spec.ts
 PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoSidebar/utils/menuItemIsAllowed.spec.ts
 PASS Wfo-UI Tests src/utils/getToastMessage.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/utils/columns.spec.ts
+PASS Wfo-UI Tests src/components/WfoTable/WfoTableSettingsModal/WfoTableSettingsModal.spec.ts
 PASS Wfo-UI Tests src/utils/toSortedObjectKeys.spec.ts
 PASS Wfo-UI Tests src/components/WfoWorkflowSteps/stepListUtils.spec.ts
 PASS Wfo-UI Tests src/utils/filterData.spec.ts
-PASS Wfo-UI Tests src/utils/getTokenName.spec.ts
 PASS Wfo-UI Tests src/utils/toObjectWithSerializedValues.spec.ts
+PASS Wfo-UI Tests src/utils/getTokenName.spec.ts
 PASS Wfo-UI Tests src/utils/uuid.spec.ts
 PASS Wfo-UI Tests src/utils/environmentVariables.spec.ts
 PASS Wfo-UI Tests src/utils/integer.spec.ts
-PASS Wfo-UI Tests src/utils/getTypedFieldFromObject.spec.ts
 PASS Wfo-UI Tests src/utils/onlyUnique.spec.ts
+PASS Wfo-UI Tests src/utils/getTypedFieldFromObject.spec.ts
 PASS Wfo-UI Tests src/utils/cacheTag.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryVariablesForExport.spec.ts
-PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoPageHeader/utils/toHexColorWithOpacity.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryUrl.spec.ts
+PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoPageHeader/utils/toHexColorWithOpacity.spec.ts
 PASS Wfo-UI Tests src/components/WfoPydanticForm/fields/wfoPydanticFormUtils.spec.ts
 
 Test Suites: 38 passed, 38 total
 Tests:       257 passed, 257 total
 Snapshots:   0 total
-Time:        9.057 s
+Time:        10.181 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @orchestrator-ui/orchestrator-ui-components
 
+## 8.7.2
+
+### Patch Changes
+
+- a5ce17a: Minor comment improvements
+- af9eaf6: Fixes subscription search has component and range filters
+
 ## 8.7.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -28882,7 +28882,7 @@ declare const METADATA_WORKFLOWS_ENDPOINT = "workflows";
 declare const METADATA_SCHEDULES_ENDPOINT = "schedules";
 declare const SEARCH_QUERY_RESULTS_ENDPOINT = "search/queries";
 
-declare const ORCHESTRATOR_UI_LIBRARY_VERSION = "8.7.1";
+declare const ORCHESTRATOR_UI_LIBRARY_VERSION = "8.7.2";
 
 declare const useGetTranslationMessages: (locale: string | undefined) => {
     pydanticForms: {

package/dist/index.js

@@ -61,7 +61,7 @@ var PolicyResource = /* @__PURE__ */ ((PolicyResource2) => {
 })(PolicyResource || {});
 
 // src/configuration/version.ts
-var ORCHESTRATOR_UI_LIBRARY_VERSION = "8.7.1";
+var ORCHESTRATOR_UI_LIBRARY_VERSION = "8.7.2";
 
 // src/types/types.ts
 var EngineStatus = /* @__PURE__ */ ((EngineStatus2) => {
@@ -12209,7 +12209,7 @@ var WfoFieldSelector = ({ handleOnChange, disabled, rule, context }) => {
   const storeFieldOperators = (selectedValue2) => {
     const matchingPath = paths.find((path) => path.path === selectedValue2) ?? paths.find((path) => path.availablePaths?.includes(selectedValue2));
     const operators = matchingPath?.operators ?? prefilledFieldOptions2.get(selectedValue2) ?? [];
-    context?.onFieldSelected?.(selectedValue2, operators);
+    context?.onFieldSelected?.(selectedValue2, operators, matchingPath);
   };
   const handleFieldSelection = (selectedOptions) => {
     const selectedOption = selectedOptions[0];
@@ -12281,6 +12281,10 @@ import { defaultOperators } from "react-querybuilder";
 import { EuiSelect as EuiSelect2 } from "@elastic/eui";
 import { jsx as jsx182 } from "@emotion/react/jsx-runtime";
 var isOptionGroup = (operator) => "options" in operator;
+var FALLBACK_OPERATOR_LABELS = {
+  notNull: "\u2713 has component",
+  null: "\u2717 does not have component"
+};
 var WfoOperatorSelector = (props) => {
   const { value, handleOnChange } = props;
   const flatOptions = props.options.flatMap(
@@ -12302,7 +12306,13 @@ var WfoOperatorSelector = (props) => {
     }
   }, [optionsKey, selectOptions, value, handleOnChange]);
   const currentValueIsListed = !value || selectOptions.some((option) => option.value === value);
-  const displayOptions = currentValueIsListed ? selectOptions : [...selectOptions, { value, text: defaultOperators.find((operator) => operator.name === value)?.label ?? value }];
+  const displayOptions = currentValueIsListed ? selectOptions : [
+    ...selectOptions,
+    {
+      value,
+      text: FALLBACK_OPERATOR_LABELS[value] ?? defaultOperators.find((operator) => operator.name === value)?.label ?? value
+    }
+  ];
   return /* @__PURE__ */ jsx182(
     EuiSelect2,
     {
@@ -12438,40 +12448,42 @@ import { EuiButtonGroup as EuiButtonGroup2, EuiDatePicker as EuiDatePicker2, Eui
 import { useEffect as useEffect22, useState as useState32 } from "react";
 import { EuiFlexGroup as EuiFlexGroup20 } from "@elastic/eui";
 import { jsx as jsx189, jsxs as jsxs95 } from "@emotion/react/jsx-runtime";
-var WfoRangeEditor = ({ handleOnChange, operator, Element, value: currentValue }) => {
-  const [currentOperator, setCurrentOperator] = useState32(operator);
+var WfoRangeEditor = ({ handleOnChange, InputElement, value: currentValue }) => {
   const startValue = currentValue ? currentValue?.toString().split(",") : [];
   const [value, setValue] = useState32(startValue);
+  const handleRangeChange = (newValue, rangeIndex) => {
+    setValue((currentValues) => {
+      const next = [...currentValues];
+      const isCleared = newValue === void 0 || typeof newValue === "number" && Number.isNaN(newValue);
+      next[rangeIndex] = isCleared ? void 0 : String(newValue);
+      return next;
+    });
+  };
   useEffect22(() => {
-    if (operator !== currentOperator && (operator === "between" || currentOperator === "between")) {
-      setValue([]);
-      handleOnChange("");
-      setCurrentOperator(operator);
-    }
-  }, [currentOperator, handleOnChange, operator]);
-  const handleChange = (value2, rangeIndex = 0) => {
-    if (operator === "between") {
-      setValue((currentDates) => {
-        if (value2 === null) {
-          return currentDates.filter((_7, index) => index !== rangeIndex);
-        }
-        currentDates[rangeIndex] = value2;
-        if (currentDates.length === 2) {
-          handleOnChange(`${currentDates[0]},${currentDates[1]}`);
-        }
-        return currentDates;
-      });
-    } else {
-      handleOnChange(value2);
+    if (value[0] !== void 0 && value[1] !== void 0) {
+      handleOnChange(`${value[0]},${value[1]}`);
     }
-  };
-  if (operator === "between") {
-    return /* @__PURE__ */ jsxs95(EuiFlexGroup20, { direction: "row", gutterSize: "s", children: [
-      /* @__PURE__ */ jsx189(Element, { handleOnChange: handleChange, rangeIndex: 0, value: value[0] }),
-      /* @__PURE__ */ jsx189(Element, { handleOnChange: handleChange, rangeIndex: 1, value: value[1] })
-    ] });
-  }
-  return /* @__PURE__ */ jsx189(Element, { handleOnChange, value: value[0] });
+  }, [value]);
+  return /* @__PURE__ */ jsxs95(EuiFlexGroup20, { direction: "row", gutterSize: "s", children: [
+    /* @__PURE__ */ jsx189(
+      InputElement,
+      {
+        handleOnChange: (value2) => {
+          handleRangeChange(value2, 0);
+        },
+        value: value[0]
+      }
+    ),
+    /* @__PURE__ */ jsx189(
+      InputElement,
+      {
+        handleOnChange: (value2) => {
+          handleRangeChange(value2, 1);
+        },
+        value: value[1]
+      }
+    )
+  ] });
 };
 
 // src/components/WfoTable/WfoStructuredSearchTable/WfoValueEditor.tsx
@@ -12524,14 +12536,14 @@ var TextEditor = ({ handleOnChange, value: currentValue = "" }) => {
   };
   return /* @__PURE__ */ jsx190(EuiFieldText3, { value, onChange: handleTextChange, onBlur: handleOnBlur, onKeyDown: handleOnKeyDown });
 };
-var NumberEditor = ({ handleOnChange, rangeIndex, value: currentValue }) => {
+var NumberEditor = ({ handleOnChange, value: currentValue }) => {
   const [value, setValue] = useState33(currentValue?.toString() || "");
   const handleNumberChange = (e) => {
     setValue(e.target.value || "");
   };
   const handleOnBlur = () => {
     const numberValue = parseFloat(value);
-    handleOnChange(numberValue, rangeIndex);
+    handleOnChange(numberValue);
   };
   const handleOnKeyDown = (e) => {
     if (e.key === "Enter") {
@@ -12548,7 +12560,7 @@ var NumberEditor = ({ handleOnChange, rangeIndex, value: currentValue }) => {
     }
   );
 };
-var DatePicker = ({ handleOnChange, rangeIndex, value: currentValue }) => {
+var DatePicker = ({ handleOnChange, value: currentValue }) => {
   const [date, setDate] = useState33(currentValue || "");
   const t = useTranslations46("search.page");
   return /* @__PURE__ */ jsx190(
@@ -12558,9 +12570,8 @@ var DatePicker = ({ handleOnChange, rangeIndex, value: currentValue }) => {
       onChange: (date2) => {
         const utcDate = date2 ? moment3.utc(date2) : void 0;
         setDate(utcDate?.toISOString() || "");
-        handleOnChange(utcDate?.toISOString(), rangeIndex);
+        handleOnChange(utcDate?.toISOString());
       },
-      id: rangeIndex ? `date-range-${rangeIndex}` : "date-range",
       css: { width: "330px" },
       showTimeSelect: true,
       dateFormat: "yyyy-MM-dd HH:mm",
@@ -12579,20 +12590,24 @@ var WfoValueEditor = ({
   value,
   className
 }) => {
+  if (operator === "null" || operator === "notNull") {
+    return null;
+  }
+  const getComponentByType = () => {
+    if (uiFieldType === "boolean" /* boolean */) return BooleanEditor;
+    if (uiFieldType === "datetime" /* datetime */) return DatePicker;
+    if (uiFieldType === "number" /* number */) return NumberEditor;
+    return TextEditor;
+  };
   const fieldPathInfoMap = context?.fieldPathInfoMap;
   const fieldInfo = fieldPathInfoMap && fieldPathInfoMap.has(fieldName) ? fieldPathInfoMap.get(fieldName) : void 0;
-  const uiFieldType = fieldInfo?.ui_types[0] || "text" /* text */;
+  const uiFieldType = fieldInfo?.ui_types?.[0] || "text" /* text */;
   const getEditor = () => {
-    if (uiFieldType === "boolean" /* boolean */) {
-      return /* @__PURE__ */ jsx190(BooleanEditor, { handleOnChange, value });
-    }
-    if (uiFieldType === "datetime" /* datetime */) {
-      return /* @__PURE__ */ jsx190(WfoRangeEditor, { handleOnChange, operator, Element: DatePicker, value });
-    }
-    if (uiFieldType === "number" /* number */) {
-      return /* @__PURE__ */ jsx190(WfoRangeEditor, { handleOnChange, operator, Element: NumberEditor, value });
+    const InputElement = getComponentByType();
+    if (operator === "between") {
+      return /* @__PURE__ */ jsx190(WfoRangeEditor, { handleOnChange, value, InputElement });
     }
-    return /* @__PURE__ */ jsx190(TextEditor, { handleOnChange, value });
+    return /* @__PURE__ */ jsx190(InputElement, { handleOnChange, value });
   };
   const handleWrapperKeyDown = (event) => {
     if (event.key !== "Enter") return;
@@ -12612,8 +12627,11 @@ var SEARCH_OPERATOR_TO_RQB_OPERATOR_MAP = {
   gt: ">",
   gte: ">=",
   between: "between",
-  like: "contains"
+  like: "contains",
+  has_component: "notNull",
+  not_has_component: "null"
 };
+var RQB_UNARY_OPERATORS = ["null", "notNull"];
 var OPERATOR_MAP2 = {
   eq: { symbol: "=", description: "equals" },
   neq: { symbol: "\u2260", description: "not equals" },
@@ -12649,21 +12667,32 @@ var WfoFilterBuilder = ({
     return (operators ?? []).map((operator) => {
       const { symbol, description } = OPERATOR_MAP2[operator] || { symbol: operator, description: operator };
       const rqbOperator = SEARCH_OPERATOR_TO_RQB_OPERATOR_MAP[operator] ?? operator;
-      return { name: rqbOperator, label: `${symbol} ${description}`, value: rqbOperator };
+      return {
+        name: rqbOperator,
+        label: `${symbol} ${description}`,
+        value: rqbOperator,
+        ...RQB_UNARY_OPERATORS.includes(rqbOperator) && { arity: "unary" }
+      };
     });
   };
   const t = useTranslations47("common");
   const { queryBuilderContainerStyles } = useWithOrchestratorTheme(getWfoStructuredSearchTableStyles);
   const [fieldToOperatorMap, setFieldToOperatorMap] = useState34(prefilledFieldOptions2);
+  const [fieldPathInfoMap, setFieldPathInfoMap] = useState34(/* @__PURE__ */ new Map());
   const latestRuleGroupRef = useRef13(queryBuilderRuleGroup);
   latestRuleGroupRef.current = queryBuilderRuleGroup;
   const handleValueEditorEnter = () => {
     handleSearch({ ruleGroup: latestRuleGroupRef.current });
   };
-  const handleFieldSelected = (field, operators) => {
+  const handleFieldSelected = (field, operators, pathInfo) => {
     setFieldToOperatorMap((previousMap) => {
       return new Map(previousMap).set(field, operators);
     });
+    if (pathInfo) {
+      setFieldPathInfoMap((previousMap) => {
+        return new Map(previousMap).set(field, pathInfo);
+      });
+    }
   };
   return /* @__PURE__ */ jsx191(EuiFlexGroup21, { css: queryBuilderContainerStyles, children: /* @__PURE__ */ jsxs96(EuiFlexGroup21, { direction: "column", children: [
     /* @__PURE__ */ jsx191(EuiFlexItem21, { children: /* @__PURE__ */ jsx191(
@@ -12678,6 +12707,7 @@ var WfoFilterBuilder = ({
         context: {
           onFieldSelected: handleFieldSelected,
           prefilledFieldOptions: prefilledFieldOptions2,
+          fieldPathInfoMap,
           onValueEditorEnter: handleValueEditorEnter
         },
         getOperators: (field) => {