Skip to content

Add tree filter - General Anatomic Site #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
EkaterinaPoddubskaya wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Add tree filter - General Anatomic Site #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
878d940
Fix appending item counts to filter labels to prevent accidental modi…
EkaterinaPoddubskaya Mar 13, 2026
68835c8
Run npm audit, remove unused dependency
EkaterinaPoddubskaya Mar 13, 2026
8b04f3a
Select child options in suggest when parent is selected and search ma…
EkaterinaPoddubskaya Mar 16, 2026
fdd7a39
Add general anatomic site tree filter, unify tree filters
EkaterinaPoddubskaya Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29,863 changes: 17,995 additions & 11,868 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@babel/preset-env": "^7.15.8",
"babel-jest": "^27.2.5",
"babel-loader": "^8.2.2",
"copy-webpack-plugin": "^9.0.1",
"copy-webpack-plugin": "^14.0.0",
"css-loader": "^5.2.7",
"dotenv": "^8.6.0",
"dotenv-webpack": "^7.0.3",
Expand All @@ -30,7 +30,7 @@
"eslint-plugin-import": "^2.25.1",
"html-loader": "^5.0.0",
"html-webpack-plugin": "^5.3.2",
"jest": "^27.2.5",
"jest": "^30.3.0",
"less": "^3.13.1",
"less-loader": "^10.1.0",
"mini-css-extract-plugin": "^2.4.2",
Expand All @@ -42,13 +42,12 @@
"dependencies": {
"@babel/polyfill": "^7.12.1",
"@resonant/oauth-client": "^1.0.2",
"aws-sdk": "^2.910.0",
"axios": "^1.6.1",
"core-js": "^3.38.0",
"data-collection": "^1.1.6",
"file-saver": "^1.3.8",
"hint.css": "^2.6.0",
"markdown-it": "^13.0.1",
"markdown-it": "^14.1.1",
"markdown-it-attrs": "^4.1.6",
"markdown-it-bracketed-spans": "^1.0.1",
"markdown-it-container": "^3.0.0",
Expand Down
112 changes: 48 additions & 64 deletions sources/models/appliedFilters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import constants from "../constants";
import util from "../utils/util";
import state from "./state";
import {TREE_MODELS_CONFIG} from "./treeModels";

const appliedFilters = new webix.DataCollection();
const appliedFilterBySearch = new webix.DataCollection();
Expand Down Expand Up @@ -372,17 +373,17 @@ function _groupFiltersByKey() {
break;
}
case constants.FILTER_ELEMENT_TYPE.TREE_CHECKBOX: {
let itemFromResult = result.find(comparedItem => comparedItem.key === `${item.key}_${item.diagnosisLevel}`, true);
let itemFromResult = result.find(comparedItem => comparedItem.key === `${item.key}_${item.nestingLevel}`, true);
if (!itemFromResult) {
itemFromResult = {
view: item.view,
key: `${item.key}_${item.diagnosisLevel}`,
key: `${item.key}_${item.nestingLevel}`,
datatype: item.datatype,
values: []
};
result.push(itemFromResult);
}
itemFromResult.values.push(_prepareOptionNameForApi(item.value, `${item.key}_${item.diagnosisLevel}`));
itemFromResult.values.push(_prepareOptionNameForApi(item.value, `${item.key}_${item.nestingLevel}`));
break;
}
default:
Expand Down Expand Up @@ -418,68 +419,51 @@ function _prepareCondition(filter) {

// see conditions example in the bottom of this file
function getConditionsForApi() {
const conditions = {};
conditions.operands = [];
const diagnosisRegex = /^diagnosis_\d$/;
const diagnosisFilters = _groupFiltersByKey().filter(f => diagnosisRegex.test(f.key));
const groupedFilters = _groupFiltersByKey()
.filter(groupedFilter => groupedFilter.key !== constants.COLLECTION_KEY
&& !diagnosisRegex.test(groupedFilter.key));
if (diagnosisFilters.length !== 0) {
conditions.operator = diagnosisFilters.length > 1 ? "OR" : "";
diagnosisFilters.forEach((d) => {
conditions.operands.push(..._prepareCondition(d));
});
}
let query = diagnosisFilters.length > 0 ? "(" : "";
conditions.operands.forEach((itemOfConditions, paramIndex) => {
if (paramIndex > 0) {
if (itemOfConditions.operator.toUpperCase() === "OR") {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? ` ${itemOfConditions.operator.toUpperCase()} ${itemOfConditions.key}:${itemOfConditions.value}${itemOfConditions.closingBracket}`
: ` ${itemOfConditions.operator.toUpperCase()} ${itemOfConditions.key}:"${itemOfConditions.value}"${itemOfConditions.closingBracket}`;
}
else {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? ` ${conditions.operator.toUpperCase()} ${itemOfConditions.openingBracket}${itemOfConditions.key}:${itemOfConditions.value}`
: ` ${conditions.operator.toUpperCase()} ${itemOfConditions.openingBracket}${itemOfConditions.key}:"${itemOfConditions.value}"`;
}
}
else {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? `${itemOfConditions.openingBracket}${itemOfConditions.key}:${itemOfConditions.value}${itemOfConditions.closingBracket}`
: `${itemOfConditions.openingBracket}${itemOfConditions.key}:"${itemOfConditions.value}"${itemOfConditions.closingBracket}`;
}
const allGroupedFilters = _groupFiltersByKey();

const treeFiltersByModel = Object.values(TREE_MODELS_CONFIG).reduce((acc, config) => {
acc[config.key] = allGroupedFilters.filter(f => config.regex.test(f.key));
return acc;
}, {});

const otherFilters = allGroupedFilters.filter(f => f.key !== constants.COLLECTION_KEY
&& !Object.values(TREE_MODELS_CONFIG).some(config => config.regex.test(f.key)));

const groupQueries = [
...Object.values(treeFiltersByModel)
.filter(filters => filters.length > 0)
.map(filters => buildGroupQuery(filters, "OR")),
...(otherFilters.length ? [buildGroupQuery(otherFilters, "AND")]: [])
];

return groupQueries.join(" AND ");
}

function buildGroupQuery(filters, groupOperator) {
const conditions = filters.flatMap(f => _prepareCondition(f));
if (conditions.length === 0) return "";

const terms = conditions.map((cond) => {
const needsQuote = !(cond.type === "number" || cond.type === "boolean" || cond.value.includes("["));
const term = needsQuote ? `${cond.key}:"${cond.value}"` : `${cond.key}:${cond.value}`;
return `${cond.openingBracket}${term}${cond.closingBracket}`;
});
query += query === "" ? "" : ")";
conditions.operands.length = 0;
if (groupedFilters.length !== 0) {
query += query === "" ? "" : " AND ";
conditions.operator = groupedFilters.length > 1 ? "AND" : "";
groupedFilters.forEach((groupedFilter) => {
conditions.operands.push(..._prepareCondition(groupedFilter));

if (conditions.length === 1) return terms[0];

const operators = conditions
.slice(1)
.map((cond) => {
const op = cond.operator?.toUpperCase();
return op === "OR" ? op : groupOperator;
});
}
conditions.operands.forEach((itemOfConditions, paramIndex) => {
if (paramIndex > 0) {
if (itemOfConditions.operator.toUpperCase() === "OR") {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? ` ${itemOfConditions.operator.toUpperCase()} ${itemOfConditions.key}:${itemOfConditions.value}${itemOfConditions.closingBracket}`
: ` ${itemOfConditions.operator.toUpperCase()} ${itemOfConditions.key}:"${itemOfConditions.value}"${itemOfConditions.closingBracket}`;
}
else {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? ` ${conditions.operator.toUpperCase()} ${itemOfConditions.openingBracket}${itemOfConditions.key}:${itemOfConditions.value}`
: ` ${conditions.operator.toUpperCase()} ${itemOfConditions.openingBracket}${itemOfConditions.key}:"${itemOfConditions.value}"`;
}
}
else {
query += itemOfConditions.type === "number" || itemOfConditions.type === "boolean" || itemOfConditions.value.includes("[")
? `${itemOfConditions.openingBracket}${itemOfConditions.key}:${itemOfConditions.value}${itemOfConditions.closingBracket}`
: `${itemOfConditions.openingBracket}${itemOfConditions.key}:"${itemOfConditions.value}"${itemOfConditions.closingBracket}`;
}
});
return query;

const groupQuery = terms.reduce((acc, term, i) => {
if (i === 0) return term;
return `${acc} ${operators[i - 1]} ${term}`;
}, "");

return `(${groupQuery})`;
}

function count() {
Expand Down Expand Up @@ -592,7 +576,7 @@ function getFiltersChangeTreeItemData(data, item, datatype, remove) {
filtersChangedData.value = getTreeOptionValueById(item.id);
filtersChangedData.status = "equals";
filtersChangedData.treeCheckboxFlag = true;
filtersChangedData.diagnosisLevel = item.$level;
filtersChangedData.nestingLevel = item.$level;
filtersChangedData.optionId = item.id;
filtersChangedData.viewId = `treeTable-${data.id}`;
filtersChangedData.remove = remove;
Expand Down
138 changes: 0 additions & 138 deletions sources/models/diagnosis.js
View file
Open in desktop

This file was deleted.

Loading
Loading