From a20f8f8fa7408632c1ea70096bf2b4f506f1dc8f Mon Sep 17 00:00:00 2001 From: UladzislauKutarkin <72550466+UladzislauKutarkin@users.noreply.github.com> Date: Wed, 16 Oct 2024 12:40:34 +0400 Subject: [PATCH 1/2] UIPQB-137: Spell out query builder operators (#163) --- CHANGELOG.md | 1 + src/constants/operators.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5de3c5b..85efd1a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * [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 ## [1.1.4](https://github.com/folio-org/ui-plugin-query-builder/tree/v1.1.4) (2024-04-02) diff --git a/src/constants/operators.js b/src/constants/operators.js index 856efdfa..a9542d4e 100644 --- a/src/constants/operators.js +++ b/src/constants/operators.js @@ -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', From f47790fc5adc1532dbb2f15f34fd9f247756f399 Mon Sep 17 00:00:00 2001 From: Mikita Siadykh Date: Wed, 16 Oct 2024 17:07:06 +0300 Subject: [PATCH 2/2] UIPQB-140 fix preview to display records when result is more than 100 (#164) --- CHANGELOG.md | 1 + src/hooks/useAsyncDataSource.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85efd1a8..15dc8169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * [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) diff --git a/src/hooks/useAsyncDataSource.js b/src/hooks/useAsyncDataSource.js index 8194b6ff..67475c3f 100644 --- a/src/hooks/useAsyncDataSource.js +++ b/src/hooks/useAsyncDataSource.js @@ -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,