Skip to content

Commit

Permalink
Merge branch 'master' into Fix-format
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeYvas authored Oct 23, 2024
2 parents 61f4600 + f47790f commit ca36054
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
* [UIPQB-125](https://folio-org.atlassian.net/browse/UIPQB-125) Add support for FQM _version
* [FOLIO-4086](https://folio-org.atlassian.net/browse/FOLIO-4086) Fix GitHub Actions workflow not running for tags
* [UIPQB-133](https://folio-org.atlassian.net/browse/UIPQB-133) Add getFilteredOptions function for enhanced option filtering
* [UIPQB-137](https://folio-org.atlassian.net/browse/UIPQB-137) Spell out query builder operators
* [UIPQB-140](https://folio-org.atlassian.net/browse/UIPQB-140) fix preview to display records when result is more than 100

## [1.1.4](https://github.com/folio-org/ui-plugin-query-builder/tree/v1.1.4) (2024-04-02)

Expand Down
8 changes: 4 additions & 4 deletions src/constants/operators.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ export const BOOLEAN_OPERATORS_MAP = {
export const OPERATORS_LABELS = {
EQUAL: 'equals',
NOT_EQUAL: 'not equal to',
GREATER_THAN: '>',
LESS_THAN: '<',
GREATER_THAN_OR_EQUAL: '>=',
LESS_THAN_OR_EQUAL: '<=',
GREATER_THAN: 'greater than',
LESS_THAN: 'less than',
GREATER_THAN_OR_EQUAL: 'greater than or equal to',
LESS_THAN_OR_EQUAL: 'less than or equal to',
IN: 'in',
NOT_IN: 'not in',
CONTAINS: 'contains',
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useAsyncDataSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const structuralSharing = (queryClient, key, newData) => {
let data = newData;
const { data: cachedData } = queryClient.getQueryState(key) || {};

if (cachedData?.status && cachedData?.content && !newData?.content) {
if (cachedData?.status && cachedData?.content && !newData?.content?.length) {
data = {
...newData,
content: cachedData.content,
Expand Down

0 comments on commit ca36054

Please sign in to comment.