diff --git a/packages/ui/Release.md b/packages/ui/Release.md index a3330a72..6a27e2e8 100644 --- a/packages/ui/Release.md +++ b/packages/ui/Release.md @@ -1,3 +1,6 @@ +### 10.10.8 2024-10-16 +- fix: CLIN-3284 fix error 500 query + ### 10.10.7 2024-10-11 - feat: CLIN-2989 Filter flag dropdown and querybuilder not includes tablefitler diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json index dae7f05a..94f1417e 100644 --- a/packages/ui/package-lock.json +++ b/packages/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ferlab/ui", - "version": "10.10.7", + "version": "10.10.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ferlab/ui", - "version": "10.10.7", + "version": "10.10.8", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@ant-design/icons": "^4.7.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 6cd4720b..1dcf9cdd 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@ferlab/ui", - "version": "10.10.7", + "version": "10.10.8", "description": "Core components for scientific research data portals", "publishConfig": { "access": "public" diff --git a/packages/ui/src/components/QueryBuilder/utils/helper.ts b/packages/ui/src/components/QueryBuilder/utils/helper.ts index 3aaec2c0..b171eae3 100644 --- a/packages/ui/src/components/QueryBuilder/utils/helper.ts +++ b/packages/ui/src/components/QueryBuilder/utils/helper.ts @@ -28,18 +28,29 @@ export const removeIgnoreFieldFromQueryContent = ( ): ISyntheticSqon => { const queryToRemove = query.content.filter((c) => { let toKeep = false; - if (((c as IValueFilter).content as unknown as IValueContent[]).length !== 0) { - if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) { + if (!Array.isArray((c as IValueFilter).content)) { + if ((c as IValueFilter).content) { + if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) { + toKeep = true; + } + } else { toKeep = true; } - if (Array.isArray((c as IValueFilter).content)) { - const { field } = ((c as IValueFilter).content as unknown as IValueFilter[])[0] - .content as IValueContent; - if (filterQueryToIgnore?.includes(field)) { - toKeep = false; + } else { + if (((c as IValueFilter).content as unknown as IValueContent[]).length !== 0) { + if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) { + toKeep = true; + } + if (Array.isArray((c as IValueFilter).content)) { + const { field } = ((c as IValueFilter).content as unknown as IValueFilter[])[0] + .content as IValueContent; + if (filterQueryToIgnore?.includes(field)) { + toKeep = false; + } } } } + return toKeep; }); return {