@orchestrator-ui/orchestrator-ui-components 8.9.0 → 8.9.1

package/.turbo/turbo-build.log

@@ -1,8 +1,8 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.0 build
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.1 build
 npm notice run npm run generate-version && tsup src/index.ts
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.0 generate-version
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.1 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 39ms
+src/configuration/version.ts 46ms
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
@@ -10,9 +10,9 @@ src/configuration/version.ts 39ms
 CLI Target: es2022
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js     898.17 KB
+ESM dist/index.js     898.84 KB
 ESM dist/index.js.map 1.55 MB
-ESM ⚡️ Build success in 309ms
+ESM ⚡️ Build success in 362ms
 DTS Build start
-DTS ⚡️ Build success in 22514ms
+DTS ⚡️ Build success in 26313ms
 DTS dist/index.d.ts 1.56 MB

package/.turbo/turbo-lint.log

@@ -1,2 +1,2 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.0 lint
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.1 lint
 npm notice run eslint

package/.turbo/turbo-test.log

@@ -1,54 +1,54 @@
-npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.0 test
+npm notice run @orchestrator-ui/orchestrator-ui-components@8.9.1 test
 npm notice run jest
-PASS Wfo-UI Tests src/components/WfoSubscription/utils/utils.spec.ts
-PASS Wfo-UI Tests src/pages/processes/timelineUtils.spec.ts
 PASS Wfo-UI Tests src/components/WfoTree/treeUtils.spec.ts
 PASS Wfo-UI Tests src/utils/date.spec.ts
+PASS Wfo-UI Tests src/pages/processes/timelineUtils.spec.ts
+PASS Wfo-UI Tests src/components/WfoSubscription/utils/utils.spec.ts
 PASS Wfo-UI Tests src/utils/string.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoStructuredSearchTable/WfoOperatorSelector.spec.tsx
 PASS Wfo-UI Tests src/components/WfoTable/WfoStructuredSearchTable/WfoRestoreLoop.spec.tsx
 PASS Wfo-UI Tests src/components/WfoTable/utils/tableUtils.spec.ts
 PASS Wfo-UI Tests src/utils/getProductNamesFromProcess.spec.ts
-PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts (5.627 s)
+PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts (7.199 s)
+PASS Wfo-UI Tests src/components/WfoTable/WfoTable/WfoTableExpandedRowReveal.spec.tsx
 PASS Wfo-UI Tests src/components/WfoTable/WfoTable/WfoGroupedTable/utils.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoTableWithFilter/updateQueryString.spec.ts
 PASS Wfo-UI Tests src/utils/compareVersions.spec.ts
 PASS Wfo-UI Tests src/utils/optionalArray.spec.ts
-PASS Wfo-UI Tests src/components/WfoTable/WfoTable/WfoTableExpandedRowReveal.spec.tsx
 PASS Wfo-UI Tests src/components/WfoTable/utils/tableConfigPersistence.spec.ts
+PASS Wfo-UI Tests src/components/WfoPydanticForm/fields/WfoCron.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoStructuredSearchTable/utils.spec.ts
 PASS Wfo-UI Tests src/messages/getTranslationMessages.spec.ts
 PASS Wfo-UI Tests src/hooks/usePathAutoComplete.spec.tsx
-PASS Wfo-UI Tests src/components/WfoPydanticForm/fields/WfoCron.spec.ts
 PASS Wfo-UI Tests src/rtk/utils.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoStructuredSearchTable/WfoValueEditor.spec.tsx
 PASS Wfo-UI Tests src/utils/resultFlattener.spec.ts
+PASS Wfo-UI Tests src/components/WfoInlineNoteEdit/WfoProcessListNoteEdit.spec.tsx
 PASS Wfo-UI Tests src/utils/getQueryParams.spec.ts
 PASS Wfo-UI Tests src/utils/getProductLifecycleStatus.spec.ts
 PASS Wfo-UI Tests src/utils/getEnvironmentVariables.spec.ts
+PASS Wfo-UI Tests src/components/WfoTable/WfoTableSettingsModal/WfoTableSettingsModal.spec.ts
 PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoSidebar/utils/menuItemIsAllowed.spec.ts
-PASS Wfo-UI Tests src/components/WfoInlineNoteEdit/WfoProcessListNoteEdit.spec.tsx
 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/utils/toSortedObjectKeys.spec.ts
-PASS Wfo-UI Tests src/components/WfoTable/WfoTableSettingsModal/WfoTableSettingsModal.spec.ts
+PASS Wfo-UI Tests src/components/WfoTable/utils/columns.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/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/environmentVariables.spec.ts
 PASS Wfo-UI Tests src/utils/onlyUnique.spec.ts
-PASS Wfo-UI Tests src/utils/cacheTag.spec.ts
 PASS Wfo-UI Tests src/utils/getTypedFieldFromObject.spec.ts
-PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoPageHeader/utils/toHexColorWithOpacity.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryVariablesForExport.spec.ts
+PASS Wfo-UI Tests src/utils/cacheTag.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/WfoPydanticForm/fields/wfoPydanticFormUtils.spec.ts
 
 Test Suites: 46 passed, 46 total
 Tests:       288 passed, 288 total
 Snapshots:   0 total
-Time:        11.918 s
+Time:        14.139 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @orchestrator-ui/orchestrator-ui-components
 
+## 8.9.1
+
+### Patch Changes
+
+- 0e5b816: Fix query and filter not being applied in certain cases
+
 ## 8.9.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -19773,7 +19773,7 @@ type WfoStructuredSearchTableDataColumnConfig<T extends object> = {
 };
 type WfoStructuredSearchTableColumnConfig<T extends object> = Partial<WfoTableControlColumnConfig<T> | WfoStructuredSearchTableDataColumnConfig<T>>;
 type SearchParams = {
-    queryText?: string | false;
+    queryString?: string | false;
     retrieverType?: RetrieverType;
     ruleGroup?: RuleGroupType | false;
     limit?: number;
@@ -19788,12 +19788,12 @@ type WfoStructuredSearchTableProps<T extends object> = Omit<WfoTableProps<T>, 'c
     defaultHiddenColumns?: TableColumnKeys<T>;
     defaultShowMatchDetails?: boolean;
     defaultAdvancedNestedSearch?: boolean;
-    queryText?: string;
+    queryString?: string;
     localStorageKey: string;
     exportDataIsLoading?: boolean;
     error?: WfoGraphqlError[];
-    onChangeQueryText: (queryString: string) => void;
-    onSearchQueryText: (queryString: string) => void;
+    onChangeQueryString: (queryString: string) => void;
+    onSearchQueryString: (queryString: string) => void;
     onShowMore: () => void;
     onUpdateDataSorting: (updateSorting: WfoDataSorting<T>) => void;
     getColumnSearchFieldName?: (field: keyof T) => string;
@@ -19812,7 +19812,7 @@ type WfoStructuredSearchTableProps<T extends object> = Omit<WfoTableProps<T>, 'c
     hasNextPage: boolean;
     prefilledFieldOptions: FieldToOperatorMap;
 };
-declare const WfoStructuredSearchTable: <T extends object>({ tableColumnConfig, defaultHiddenColumns, defaultShowMatchDetails, defaultAdvancedNestedSearch, queryText, localStorageKey, exportDataIsLoading, error, onChangeQueryText, onSearchQueryText, onShowMore, onExportData, retrieverType, onUpdateRetrieverType, filterString, onUpdateFilterString, isValidFilterString, queryBuilderRuleGroup, onUpdateQueryBuilder, onUpdateDataSorting, getColumnSearchFieldName, handleSearch, pageSize, setPageSize, totalItems, rowExpandingConfiguration, dataSorting, hasNextPage, data, isLoading, prefilledFieldOptions, ...tableProps }: WfoStructuredSearchTableProps<T>) => _emotion_react_jsx_runtime.JSX.Element;
+declare const WfoStructuredSearchTable: <T extends object>({ tableColumnConfig, defaultHiddenColumns, defaultShowMatchDetails, defaultAdvancedNestedSearch, queryString, localStorageKey, exportDataIsLoading, error, onChangeQueryString, onSearchQueryString, onShowMore, onExportData, retrieverType, onUpdateRetrieverType, filterString, onUpdateFilterString, isValidFilterString, queryBuilderRuleGroup, onUpdateQueryBuilder, onUpdateDataSorting, getColumnSearchFieldName, handleSearch, pageSize, setPageSize, totalItems, rowExpandingConfiguration, dataSorting, hasNextPage, data, isLoading, prefilledFieldOptions, ...tableProps }: WfoStructuredSearchTableProps<T>) => _emotion_react_jsx_runtime.JSX.Element;
 
 interface WfoExpandingSearchRowProps {
     score?: number;
@@ -29383,7 +29383,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.9.0";
+declare const ORCHESTRATOR_UI_LIBRARY_VERSION = "8.9.1";
 
 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.9.0";
+var ORCHESTRATOR_UI_LIBRARY_VERSION = "8.9.1";
 
 // src/types/types.ts
 var EngineStatus = /* @__PURE__ */ ((EngineStatus2) => {
@@ -13039,9 +13039,9 @@ import { useTranslations as useTranslations48 } from "next-intl";
 import { EuiButtonIcon as EuiButtonIcon12, EuiFieldSearch as EuiFieldSearch3, EuiFlexItem as EuiFlexItem22, EuiFormRow as EuiFormRow6 } from "@elastic/eui";
 import { Fragment as Fragment38, jsx as jsx193, jsxs as jsxs97 } from "@emotion/react/jsx-runtime";
 var WfoSearchFieldWithActions = ({
-  queryText,
-  onChangeQueryText,
-  onSearchQueryText,
+  queryString,
+  onChangeQueryString,
+  onSearchQueryString,
   onShowInformation,
   onShowTableSettings
 }) => {
@@ -13052,10 +13052,10 @@ var WfoSearchFieldWithActions = ({
       EuiFieldSearch3,
       {
         css: formFieldBaseStyle,
-        value: queryText,
+        value: queryString,
         placeholder: `${t("search")}...`,
-        onChange: (e) => onChangeQueryText(e.target.value),
-        onSearch: (queryText2) => onSearchQueryText(queryText2),
+        onChange: (e) => onChangeQueryString(e.target.value),
+        onSearch: (queryString2) => onSearchQueryString(queryString2),
         fullWidth: true
       }
     ) }) }),
@@ -13136,12 +13136,12 @@ var WfoStructuredSearchTable = ({
   defaultHiddenColumns = [],
   defaultShowMatchDetails = false,
   defaultAdvancedNestedSearch = true,
-  queryText,
+  queryString,
   localStorageKey,
   exportDataIsLoading,
   error,
-  onChangeQueryText,
-  onSearchQueryText,
+  onChangeQueryString,
+  onSearchQueryString,
   onShowMore,
   onExportData,
   retrieverType,
@@ -13271,9 +13271,9 @@ var WfoStructuredSearchTable = ({
       /* @__PURE__ */ jsx195(
         WfoSearchFieldWithActions,
         {
-          queryText,
-          onChangeQueryText,
-          onSearchQueryText,
+          queryString,
+          onChangeQueryString,
+          onSearchQueryString,
           onShowInformation: () => setShowInformationModal(true),
           onShowTableSettings: () => setShowTableSettingsModal(true)
         }
@@ -17473,18 +17473,18 @@ var WfoSearchPocPage = () => {
   const selectedTab = subscriptionListTabs.find(({ id }) => id === activeTab)?.id ?? "ACTIVE" /* ACTIVE */;
   const getStoredTableConfig = useStoredTableConfig(SEARCH_TABLE_LOCAL_STORAGE_KEY);
   const [retrieverType, setRetrieverType] = useState54("auto" /* Auto */);
-  const [queryText, setQueryText] = useState54("");
-  const [committedSearchQuery, setCommittedSearchQuery] = useQueryParam6("queryString", withDefault7(StringParam7, ""));
+  const [queryString, setQueryString] = useState54("");
+  const [committedQueryString, setCommittedQueryString] = useQueryParam6("queryString", withDefault7(StringParam7, ""));
   const [committedFilterString, setCommittedFilterString] = useQueryParam6("filterString", withDefault7(StringParam7, ""));
   const lastSelfCommittedFilter = useRef18("");
   const commitFilterString = (celString) => {
     lastSelfCommittedFilter.current = celString;
     setCommittedFilterString(celString || void 0);
   };
-  const lastSelfCommittedQuery = useRef18("");
-  const commitSearchQuery = (queryText2) => {
-    lastSelfCommittedQuery.current = queryText2;
-    setCommittedSearchQuery(queryText2 || void 0);
+  const lastSelfCommittedQueryString = useRef18("");
+  const commitQueryString = (queryString2) => {
+    lastSelfCommittedQueryString.current = queryString2;
+    setCommittedQueryString(queryString2 || void 0);
   };
   const [filterString, setFilterString] = useState54("");
   const [queryBuilderRuleGroup, setQueryBuilderRuleGroup] = useState54();
@@ -17493,6 +17493,7 @@ var WfoSearchPocPage = () => {
     [committedFilterString]
   );
   const [isValidFilterString, setIsValidFilterString] = useState54(true);
+  const [isCommitRefused, setIsCommitRefused] = useState54(false);
   const [tableDefaults, setTableDefaults] = useState54();
   const [pageSize, setPageSize] = useState54(DEFAULT_PAGE_SIZE);
   const [pageCursor, setPageCursor] = useState54(void 0);
@@ -17501,7 +17502,7 @@ var WfoSearchPocPage = () => {
     sortOrder: "DESC" /* DESC */
   });
   const committedSearchKey = JSON.stringify([
-    committedSearchQuery,
+    committedQueryString,
     committedFilterString,
     selectedTab,
     retrieverType,
@@ -17515,7 +17516,7 @@ var WfoSearchPocPage = () => {
       direction: dataSorting.sortOrder.toLowerCase()
     };
     return {
-      query: committedSearchQuery,
+      query: committedQueryString,
       limit: pageSize,
       entity_type: "SUBSCRIPTION" /* SUBSCRIPTION */,
       response_columns: Array.from(resultColumToPropertyMap.keys()),
@@ -17524,7 +17525,7 @@ var WfoSearchPocPage = () => {
       ...filters && { filters },
       ...cursor && { cursor }
     };
-  }, [committedSearchQuery, committedRuleGroup, selectedTab, retrieverType, pageSize, dataSorting, cursor]);
+  }, [committedQueryString, committedRuleGroup, selectedTab, retrieverType, pageSize, dataSorting, cursor]);
   const { data, isFetching } = useSearchQuery(searchPayload);
   const [getSubscriptionListTrigger] = useLazySearchQuery();
   const getSubscriptionListForExport = (exportLimit) => getSubscriptionListTrigger({ ...searchPayload, limit: exportLimit, cursor: void 0 }).unwrap();
@@ -17632,29 +17633,45 @@ var WfoSearchPocPage = () => {
     }
   };
   const sortableAndFilterableFieldNames = Object.keys(tableColumnConfig).filter((fieldName) => fieldName !== "actions");
-  const isSortingAllowed = queryText === "";
+  const isSortingAllowed = queryString === "";
   const tableColumnConfigWithSortingAndFiltering = mapSortableAndFilterableValuesToTableColumnConfig(
     tableColumnConfig,
     isSortingAllowed ? sortableAndFilterableFieldNames : [],
     sortableAndFilterableFieldNames
   );
-  const handleApplyFilter = (searchParams) => {
-    const ruleGroupParam = searchParams?.ruleGroup;
-    const effectiveRuleGroup = ruleGroupParam === false ? void 0 : ruleGroupParam ?? queryBuilderRuleGroup;
+  const commitFilterDraft = (effectiveRuleGroup) => {
     const celQuery = effectiveRuleGroup ? formatQuery2(effectiveRuleGroup, { format: "cel", fallbackExpression: "" }) : "";
     if (celQuery && !parseCelToRuleGroup(celQuery)) {
       setIsValidFilterString(false);
-      return;
+      setIsCommitRefused(true);
+      return false;
     }
     commitFilterString(celQuery);
+    setIsCommitRefused(false);
+    return true;
+  };
+  const handleApplyFilter = (searchParams) => {
+    const ruleGroupParam = searchParams?.ruleGroup;
+    const effectiveRuleGroup = ruleGroupParam === false ? void 0 : ruleGroupParam ?? queryBuilderRuleGroup;
+    if (!commitFilterDraft(effectiveRuleGroup)) {
+      return;
+    }
+    commitQueryString(queryString);
     setPageCursor(void 0);
   };
-  const onChangeQueryText = (queryText2) => {
-    setQueryText(queryText2);
+  const onChangeQueryString = (queryString2) => {
+    setQueryString(queryString2);
   };
-  const onSearchQueryText = (queryText2) => {
-    setQueryText(queryText2);
-    commitSearchQuery(queryText2);
+  const onSearchQueryString = (queryString2) => {
+    setQueryString(queryString2);
+    if (!isValidFilterString) {
+      setIsCommitRefused(true);
+      return;
+    }
+    if (!commitFilterDraft(queryBuilderRuleGroup)) {
+      return;
+    }
+    commitQueryString(queryString2);
     setPageCursor(void 0);
   };
   const onUpdateRetrieverType = (retrieverType2) => {
@@ -17679,12 +17696,12 @@ var WfoSearchPocPage = () => {
     }
   }, []);
   useEffect39(() => {
-    if (committedSearchQuery === lastSelfCommittedQuery.current) {
+    if (committedQueryString === lastSelfCommittedQueryString.current) {
       return;
     }
-    lastSelfCommittedQuery.current = committedSearchQuery;
-    setQueryText(committedSearchQuery);
-  }, [committedSearchQuery]);
+    lastSelfCommittedQueryString.current = committedQueryString;
+    setQueryString(committedQueryString);
+  }, [committedQueryString]);
   useEffect39(() => {
     if (committedFilterString === lastSelfCommittedFilter.current) {
       return;
@@ -17719,9 +17736,10 @@ var WfoSearchPocPage = () => {
     setFilterString(filterString2);
     safeCelParse(filterString2);
   };
-  const { items: subscriptionListItems, rowExpandingConfiguration } = data ? getDataFromResponse(data, resultColumToPropertyMap, "subscriptionId", selectedTab) : { items: [] };
-  const totalItems = getTotalItemsFromResponse(data);
-  const hasNextPage = data?.page_info?.has_next_page ?? false;
+  const isSearchBlocked = isCommitRefused && !isValidFilterString;
+  const { items: subscriptionListItems, rowExpandingConfiguration } = data && !isSearchBlocked ? getDataFromResponse(data, resultColumToPropertyMap, "subscriptionId", selectedTab) : { items: [] };
+  const totalItems = !isSearchBlocked && getTotalItemsFromResponse(data);
+  const hasNextPage = !isSearchBlocked && (data?.page_info?.has_next_page ?? false);
   const nextPageCursor = data?.page_info?.next_page_cursor ?? void 0;
   const exportData = async () => {
     const exportResult = await getSubscriptionListForExport(totalItems || pageSize);
@@ -17780,12 +17798,12 @@ var WfoSearchPocPage = () => {
         localStorageKey: SEARCH_TABLE_LOCAL_STORAGE_KEY,
         onUpdateFilterString,
         onUpdateQueryBuilder,
-        onChangeQueryText,
-        onSearchQueryText,
+        onChangeQueryString,
+        onSearchQueryString,
         onShowMore,
         onUpdateRetrieverType,
         queryBuilderRuleGroup,
-        queryText,
+        queryString,
         retrieverType,
         tableColumnConfig: tableColumnConfigWithSortingAndFiltering,
         getColumnSearchFieldName: (field) => getKeyByValueFromMap(resultColumToPropertyMap, field),