Merge branch 'master' into UIPQB-47

folio-org · Sep 25, 2023 · 78f059f · 78f059f
2 parents 04b25f9 + 5b3f068
commit 78f059f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,5 +25,7 @@
 * [UIPQB-49](https://issues.folio.org/browse/UIPQB-49) Jest-related deps are used in development only.
 * [UIPQB-52](https://issues.folio.org/browse/UIPQB-52) *BREAKING* bump `react-intl` to `v6.4.4`.
 * [UIPQB-45](https://issues.folio.org/browse/UIPQB-45) Query builder dies when certain characters are used in combination with regex operators.
+* [UIPQB-46](https://issues.folio.org/browse/UIPQB-46) Incorrect text when no options available in the query builder's search bar.
 * [UIPQB-50](https://issues.folio.org/browse/UIPQB-50)Add 'in-progress' handling to plugin-query-builder
+* [UIPQB-48](https://issues.folio.org/browse/UIPQB-48) "Show columns" dropdown doesn't fit in the screen.
 * [UIPQB-47](https://issues.folio.org/browse/UIPQB-47) 400 error blocks save or further action in query builder.
diff --git a/src/QueryBuilder/QueryBuilder/QueryBuilderModal/RepeatableFields/RepeatableFields.js b/src/QueryBuilder/QueryBuilder/QueryBuilderModal/RepeatableFields/RepeatableFields.js
@@ -126,6 +126,7 @@ export const RepeatableFields = ({ source, setSource, getParamsSource, columns }
               <Col sm={4} className={css.rowCell}>
                 <Selection
                   id={`field-option-${index}`}
+                  emptyMessage={<></>}
                   placeholder={intl.formatMessage({ id: 'ui-plugin-query-builder.control.selection.placeholder' })}
                   dataOptions={row.field.options}
                   value={row.field.current}

diff --git a/src/QueryBuilder/QueryBuilder/TestQuery/ColumnsDropdown/ColumnsDropdown.js b/src/QueryBuilder/QueryBuilder/TestQuery/ColumnsDropdown/ColumnsDropdown.js
@@ -9,10 +9,11 @@ export const ColumnsDropdown = memo(({ columns, visibleColumns, onColumnChange }
     <Dropdown
       label={<FormattedMessage id="ui-plugin-query-builder.control.dropdown.showColumns" />}
       mame="test-query-preview-dropdown"
+      usePortal
     >
       <DropdownMenu
         role="menu"
-        overrideStyle={{ maxHeight: 400 }}
+        overrideStyle={{ maxHeight: 240 }}
       >
         <CheckboxFilter
           dataOptions={columns}