@centreon/ui 24.12.0 → 24.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.12.0",
+  "version": "24.12.1",
   "description": "Centreon UI Components",
   "scripts": {
     "update:deps": "pnpx npm-check-updates -i --format group",

package/src/InputField/Select/Autocomplete/Connected/index.test.tsx

@@ -95,8 +95,8 @@ describe(SingleConnectedAutocompleteField, () => {
     });
 
     await waitFor(() => {
-      expect(getFetchCall(2)).toEqual(
-        `${baseEndpoint}?page=1&search=%7B%22%24and%22%3A%5B%7B%22%24or%22%3A%5B%7B%22host.name%22%3A%7B%22%24lk%22%3A%22%25My%20Option%202%25%22%7D%7D%5D%7D%5D%7D`
+      expect(decodeURIComponent(getFetchCall(2))).toEqual(
+        'endpoint?page=1&search={"$and":[{"$and":[{"host.name":{"$lk":"%My Option 2%"}}]}]}'
       );
     });
   });

package/src/InputField/Select/Autocomplete/Connected/index.tsx

@@ -34,7 +34,7 @@ export interface ConnectedAutoCompleteFieldProps<TData> {
   allowUniqOption?: boolean;
   baseEndpoint?: string;
   changeIdValue: (item: TData) => number | string;
-  conditionField?: keyof SelectEntry;
+  exclusionOptionProperty?: keyof SelectEntry;
   field: string;
   getEndpoint: ({ search, page }) => string;
   getRenderedOptionText: (option: TData) => string;
@@ -55,7 +55,7 @@ const ConnectedAutocompleteField = (
     field,
     labelKey,
     open,
-    conditionField = 'name',
+    exclusionOptionProperty = 'id',
     searchConditions = [],
     getRenderedOptionText = (option): string => option.name?.toString(),
     getRequestHeaders,
@@ -106,7 +106,7 @@ const ConnectedAutocompleteField = (
       ],
       isPaginated: true,
       queryOptions: {
-        cacheTime: 0,
+        gcTime: 0,
         enabled: false,
         staleTime: 0,
         suspense: false
@@ -134,10 +134,11 @@ const ConnectedAutocompleteField = (
         : [selectedValue];
 
       return {
-        field: conditionField,
+        operator: '$and',
+        field,
         values: {
           $ni: map(
-            prop(conditionField),
+            prop(exclusionOptionProperty),
             selectedValues as Array<
               Record<keyof SelectEntry, string | undefined>
             >
@@ -154,6 +155,7 @@ const ConnectedAutocompleteField = (
       }
 
       return {
+        operator: '$and',
         field,
         values: {
           $lk: `%${searchedValue}%`
@@ -322,12 +324,13 @@ const ConnectedAutocompleteField = (
       <AutocompleteField
         filterOptions={(opt): SelectEntry => opt}
         loading={isFetching}
-        open={optionsOpen}
         options={
           allowUniqOption ? uniqBy(getRenderedOptionText, options) : options
         }
         renderOption={renderOptions}
-        onChange={(_, value) => setAutocompleteChangedValue(value)}
+        onChange={(_, value) => {
+          setAutocompleteChangedValue(value);
+        }}
         onClose={(): void => setOptionsOpen(false)}
         onOpen={(): void => setOptionsOpen(true)}
         onTextChange={changeText}

package/src/api/buildListingEndpoint/getSearchQueryParameterValue.ts

@@ -93,8 +93,14 @@ const getConditionsSearchQueryParameterValue = (
       equals(listField, field)
     );
 
+    const globalOperator = filteredItems.every(({ operator }) =>
+      equals(operator, filteredItems[0].operator)
+    )
+      ? filteredItems[0].operator || '$or'
+      : '$or';
+
     return {
-      $or: flatten(
+      [globalOperator]: flatten(
         filteredItems.map(({ value, values }) => {
           if (!isNil(value)) {
             return [

package/src/api/buildListingEndpoint/models.ts

@@ -63,6 +63,7 @@ export interface ConditionsSearchParameter {
   field: string;
   value?: unknown;
   values?: ConditionValue;
+  operator?: '$and' | '$or';
 }
 
 type SearchPatterns = Array<{ [field: string]: { $rg: string } }>;