Skip to content
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.

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

fix(search bar multiple): fix bug which crashes the catalogue #113

Merged
merged 1 commit into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@commitlint/config-conventional": "^19.1.0",
"@sveltejs/vite-plugin-svelte": "^2.5.3",
"@tsconfig/svelte": "^5.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"eslint": "^8.57.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

<script lang="ts">
import { writable } from "svelte/store";
import type { Category, Criteria } from "../../types/treeData";
import type {
AggregatedValue,
Category,
Criteria,
} from "../../types/treeData";
import {
addItemToQuery,
queryStore,
Expand All @@ -28,7 +32,6 @@
* @param treeData takes a Category tree to build the autocomplete items from
* @param noMatchesFoundMessage takes a string to display when no matches are found
*/
export let treeData: Category[] = [];
export let noMatchesFoundMessage: string = "No matches found";
export let placeholderText: string = "Type to filter conditions";
export let index: number = 0;
Expand All @@ -39,7 +42,6 @@
* Initialize the catalogue store with the given tree data
* watch for changes from other components
*/
$: $catalogue = treeData;

/**
* handles the focus state of the input element
Expand Down Expand Up @@ -182,13 +184,14 @@
id: uuidv4(),
name: inputItem.name,
key: inputItem.key,
type: "type" in inputItem && inputItem.type,
system: "system" in inputItem && inputItem.system,
type: "type" in inputItem ? inputItem.type : "",
system: "system" in inputItem ? inputItem.system : "",
values: [
{
value:
"aggregatedValue" in inputItem.criterion
? inputItem.criterion.aggregatedValue
? (inputItem.criterion
.aggregatedValue as AggregatedValue[][])
: inputItem.criterion.key,
name: inputItem.criterion.name,
description: inputItem.criterion.description,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@
import { buildAstFromQuery } from "../../helpers/ast-transformer";
import { queryStore } from "../../stores/query";
import { translateAstToCql } from "../../cql-translator-service/ast-to-cql-translator";

import { getCriteria } from "../../stores/catalogue";
getCriteria("diagnosis");
import { measureStore } from "../../stores/measures";
</script>

{#if $queryStore[0].length > 0}
{translateAstToCql(buildAstFromQuery($queryStore))}
{translateAstToCql(
buildAstFromQuery($queryStore),
false,
"DKTK_STRAT_DEF_IN_INITIAL_POPULATION",
$measureStore[0]?.measures,
)}
{/if}
<hr />
<pre>{@html JSON.stringify($queryStore, null, 2)}</pre>
<hr />
{#if $queryStore[0].length > 0}
<pre>{@html JSON.stringify(buildAstFromQuery($queryStore), null, 2)}</pre>
{/if}

Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const resolveOperation = (operation: AstElement): string => {

"children" in operation &&
operation.children.forEach((element: AstElement, index) => {
if (element === null) return;
if ("children" in element) {
expression += resolveOperation(element);
}
Expand Down
27 changes: 27 additions & 0 deletions packages/lib/src/styles/searchbars.css
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ lens-search-bar-multiple::part(info-button-icon) {
lens-search-bar::part(info-button-icon):hover,
lens-search-bar-multiple::part(info-button-icon):hover {
cursor: pointer;
filter: invert(41%) sepia(43%) saturate(4610%) hue-rotate(357deg) brightness(96%) contrast(90%);
}

lens-search-bar::part(info-button-dialogue),
Expand Down Expand Up @@ -242,6 +243,7 @@ lens-search-bar-multiple::part(query-delete-button-value) {
margin: 0 var(--gap-xs) 0 var(--gap-xxs);
background-color: var(--blue);
border: var(--white) 1px solid;
transform: translatey(-1px);
}

lens-search-bar::part(query-delete-button-item),
Expand All @@ -262,6 +264,31 @@ lens-search-bar-multiple::part(query-delete-button-group) {
border: solid 1px var(--white);
}

lens-search-bar::part(delete-button-icon-item),
lens-search-bar-multiple::part(delete-button-icon-item) {
filter: invert(41%) sepia(43%) saturate(4610%) hue-rotate(357deg) brightness(96%) contrast(90%);
transform: translate(-1px, -1px);
width: 20px;
}

lens-search-bar::part(delete-button-icon-group),
lens-search-bar-multiple::part(delete-button-icon-group) {
filter: invert(41%) sepia(43%) saturate(4610%) hue-rotate(357deg) brightness(96%) contrast(90%);
transform: translate(0px, 2px);
width: 20px;
}

lens-search-bar::part(delete-button-icon-value),
lens-search-bar-multiple::part(delete-button-icon-value) {
transform: translate(-1px, -1px);
width: 20px;
}

lens-search-bar::part(delete-button-icon):hover,
lens-search-bar-multiple::part(delete-button-icon-value):hover {
filter: invert(38%) sepia(78%) saturate(1321%) hue-rotate(352deg) brightness(92%) contrast(99%);
}


/**
* Lens search Button in multiple searchbar mode
Expand Down
Loading