From dc6755d6f968ed53f02a9afc23a6f4dd43ee1a2d Mon Sep 17 00:00:00 2001
From: tada5hi <peter.placzek1996@gmail.com>
Date: Tue, 29 Oct 2024 10:27:56 +0100
Subject: [PATCH] feat: reorganized query filter store

---
 .../components/core/query/QueryFilterBox.vue  |  2 +-
 .../core/src/stores/query-filter/helper.ts    | 36 ++++++++++++
 .../core/src/stores/query-filter/index.ts     |  1 +
 .../core/src/stores/query-filter/module.ts    | 57 ++++++++++---------
 .../core/src/stores/query-filter/types.ts     |  8 ++-
 .../components/core/MMutationTabGroup.vue     |  6 +-
 .../core/MQuerySummaryTumorDiagnostics.vue    | 12 ++--
 .../MQueryCriteriaSummary.vue                 |  4 +-
 .../MQueryCriteriaSummaryBox.vue              |  6 +-
 .../MQueryPatientMatch.vue                    | 28 +++++++--
 .../MQueryPatientMatches.ts                   |  9 ++-
 .../core/{ => search}/MSearchCNVForm.vue      |  9 ++-
 .../core/{ => search}/MSearchForm.vue         | 13 ++++-
 .../core/{ => search}/MSearchFusionForm.vue   |  9 ++-
 .../{ => search}/MSearchMedicationForm.vue    |  0
 .../core/{ => search}/MSearchSNVForm.vue      |  9 ++-
 packages/mtb/src/runtime/pages/index.vue      |  2 +-
 .../src/runtime/pages/query/[id]/index.vue    |  8 ++-
 .../pages/query/[id]/index/patients.vue       |  4 +-
 packages/portal/core/navigation/module.ts     |  2 +-
 20 files changed, 163 insertions(+), 62 deletions(-)
 create mode 100644 packages/core/src/stores/query-filter/helper.ts
 rename packages/mtb/src/runtime/components/core/{ => query-criteria}/MQueryCriteriaSummary.vue (99%)
 rename packages/mtb/src/runtime/components/core/{ => query-criteria}/MQueryCriteriaSummaryBox.vue (96%)
 rename packages/mtb/src/runtime/components/core/{ => query-patient}/MQueryPatientMatch.vue (85%)
 rename packages/mtb/src/runtime/components/core/{ => query-patient}/MQueryPatientMatches.ts (82%)
 rename packages/mtb/src/runtime/components/core/{ => search}/MSearchCNVForm.vue (96%)
 rename packages/mtb/src/runtime/components/core/{ => search}/MSearchForm.vue (98%)
 rename packages/mtb/src/runtime/components/core/{ => search}/MSearchFusionForm.vue (96%)
 rename packages/mtb/src/runtime/components/core/{ => search}/MSearchMedicationForm.vue (100%)
 rename packages/mtb/src/runtime/components/core/{ => search}/MSearchSNVForm.vue (95%)

diff --git a/packages/core/src/components/core/query/QueryFilterBox.vue b/packages/core/src/components/core/query/QueryFilterBox.vue
index 75f96f68..d986501e 100644
--- a/packages/core/src/components/core/query/QueryFilterBox.vue
+++ b/packages/core/src/components/core/query/QueryFilterBox.vue
@@ -9,7 +9,7 @@ import { defineComponent, ref } from 'vue';
 
 export default defineComponent({
     setup() {
-        const extended = ref(false);
+        const extended = ref(true);
 
         const toggleExtended = () => {
             extended.value = !extended.value;
diff --git a/packages/core/src/stores/query-filter/helper.ts b/packages/core/src/stores/query-filter/helper.ts
new file mode 100644
index 00000000..7e304b1c
--- /dev/null
+++ b/packages/core/src/stores/query-filter/helper.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
+import { serializeCoding } from '../../domains';
+import type { QueryFilterGroup, QueryFilters } from './types';
+
+export function buildQueryFilterURLValue(items: QueryFilterGroup[]) {
+    const output = items
+        .map((group) => group
+            .map((el) => serializeCoding(el))
+            .join('+'));
+
+    if (output.length > 0) {
+        return output.join(',');
+    }
+
+    return undefined;
+}
+
+export function buildQueryFiltersURLRecord(items: QueryFilters) {
+    const output : Record<string, string> = {};
+
+    const keys = Object.keys(items);
+    for (let i = 0; i < keys.length; i++) {
+        const value = buildQueryFilterURLValue(items[keys[i]]);
+        if (value) {
+            output[keys[i]] = value;
+        }
+    }
+
+    return output;
+}
diff --git a/packages/core/src/stores/query-filter/index.ts b/packages/core/src/stores/query-filter/index.ts
index 2c9f5533..8f67af47 100644
--- a/packages/core/src/stores/query-filter/index.ts
+++ b/packages/core/src/stores/query-filter/index.ts
@@ -5,6 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+export * from './helper';
 export * from './install';
 export * from './module';
 export * from './singleton';
diff --git a/packages/core/src/stores/query-filter/module.ts b/packages/core/src/stores/query-filter/module.ts
index 89f04a3e..7b3f3fea 100644
--- a/packages/core/src/stores/query-filter/module.ts
+++ b/packages/core/src/stores/query-filter/module.ts
@@ -5,11 +5,13 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+import { isEqual } from 'smob';
 import { ref } from 'vue';
 import type { Coding } from '../../domains';
-import { serializeCoding } from '../../domains';
 import { QueryEventBusEventName } from '../../services';
 import type { StoreCreateOptions } from '../types';
+import { buildQueryFiltersURLRecord } from './helper';
+import type { QueryFilterGroup, QueryFilterGroupInput, QueryFilters } from './types';
 
 const toCoding = (input: string | Coding) : Coding => {
     if (typeof input === 'string') {
@@ -21,15 +23,31 @@ const toCoding = (input: string | Coding) : Coding => {
     return input;
 };
 
-type FilterGroupInput = string | Coding | string[] | Coding[];
+export function createQueryFilterStore(ctx: StoreCreateOptions) {
+    const items = ref<QueryFilters>({});
 
-type FilterGroup = Coding[];
-type Filters = Record<string, FilterGroup[]>;
+    const hasGroup = (key: string, input: QueryFilterGroupInput) => {
+        if (typeof items.value[key] === 'undefined' || items.value[key].length === 0) {
+            return false;
+        }
 
-export function createQueryFilterStore(ctx: StoreCreateOptions) {
-    const items = ref<Filters>({});
+        let data : Coding[];
+        if (Array.isArray(input)) {
+            data = input.map((el) => toCoding(el));
+        } else {
+            data = [toCoding(input)];
+        }
 
-    const addGroup = (key: string, input: FilterGroupInput) => {
+        for (let i = 0; i < items.value[key].length; i++) {
+            if (isEqual(items.value[key][i], data)) {
+                return true;
+            }
+        }
+
+        return false;
+    };
+
+    const addGroup = (key: string, input: QueryFilterGroupInput) => {
         let data : Coding[];
         if (Array.isArray(input)) {
             data = input.map((el) => toCoding(el));
@@ -48,7 +66,7 @@ export function createQueryFilterStore(ctx: StoreCreateOptions) {
         items.value[key] = [];
     };
 
-    const set = (key: string, input: FilterGroupInput[]) => {
+    const set = (key: string, input: QueryFilterGroupInput[]) => {
         reset(key);
 
         for (let i = 0; i < input.length; i++) {
@@ -58,7 +76,7 @@ export function createQueryFilterStore(ctx: StoreCreateOptions) {
         ctx.queryEventBus.emit(QueryEventBusEventName.FILTER_UPDATED, key);
     };
 
-    const get = (key: string) : FilterGroup[] => items.value[key] || [];
+    const get = (key: string) : QueryFilterGroup[] => items.value[key] || [];
 
     const resetAll = () => {
         items.value = {};
@@ -68,25 +86,12 @@ export function createQueryFilterStore(ctx: StoreCreateOptions) {
         ctx.queryEventBus.emit(QueryEventBusEventName.FILTERS_COMMITED);
     };
 
-    const buildURLRecord = () => {
-        const output : Record<string, string> = {};
-
-        const keys = Object.keys(items.value);
-        for (let i = 0; i < keys.length; i++) {
-            const groups : string[] = items.value[keys[i]]
-                .map((group) => group
-                    .map((el) => serializeCoding(el))
-                    .join('+'));
-
-            if (groups.length > 0) {
-                output[keys[i]] = groups.join(',');
-            }
-        }
-
-        return output;
-    };
+    const buildURLRecord = () => buildQueryFiltersURLRecord(items.value);
 
     return {
+        hasGroup,
+        addGroup,
+
         items,
         buildURLRecord,
 
diff --git a/packages/core/src/stores/query-filter/types.ts b/packages/core/src/stores/query-filter/types.ts
index bb4fd04d..8e5dc61c 100644
--- a/packages/core/src/stores/query-filter/types.ts
+++ b/packages/core/src/stores/query-filter/types.ts
@@ -10,8 +10,10 @@ import type {
     StoreDefinition as BaseStoreDefinition,
     Pinia,
     _ExtractActionsFromSetupStore,
-    _ExtractGettersFromSetupStore, _ExtractStateFromSetupStore,
+    _ExtractGettersFromSetupStore,
+    _ExtractStateFromSetupStore,
 } from 'pinia';
+import type { Coding } from '../../domains';
 
 import type { createQueryFilterStore } from './module';
 
@@ -33,3 +35,7 @@ _ExtractActionsFromSetupStore<StoreData>
 export type QueryFilterStoreInstallOptions = {
     pinia?: Pinia
 };
+
+export type QueryFilterGroupInput = string | Coding | string[] | Coding[];
+export type QueryFilterGroup = Coding[];
+export type QueryFilters = Record<string, QueryFilterGroup[]>;
diff --git a/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue b/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
index d653b542..1caaeb4a 100644
--- a/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
+++ b/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
@@ -8,9 +8,9 @@ import {
     defineComponent, markRaw, ref, toRef,
 } from 'vue';
 import { FormMutationType, type MutationDefinition } from '../../domains';
-import MSearchCNVForm from './MSearchCNVForm.vue';
-import MSearchFusionForm from './MSearchFusionForm.vue';
-import MSearchSNVForm from './MSearchSNVForm.vue';
+import MSearchCNVForm from './search/MSearchCNVForm.vue';
+import MSearchFusionForm from './search/MSearchFusionForm.vue';
+import MSearchSNVForm from './search/MSearchSNVForm.vue';
 
 export default defineComponent({
     components: { VCFormSelect },
diff --git a/packages/mtb/src/runtime/components/core/MQuerySummaryTumorDiagnostics.vue b/packages/mtb/src/runtime/components/core/MQuerySummaryTumorDiagnostics.vue
index 6380def1..0628bb61 100644
--- a/packages/mtb/src/runtime/components/core/MQuerySummaryTumorDiagnostics.vue
+++ b/packages/mtb/src/runtime/components/core/MQuerySummaryTumorDiagnostics.vue
@@ -1,7 +1,10 @@
 <script lang="ts">
 import {
     type Coding,
-    DKVChartTableSwitch, DQuerySummaryGrouped, DQuerySummaryNested, useQueryFilterStore,
+    DKVChartTableSwitch,
+    DQuerySummaryGrouped,
+    DQuerySummaryNested,
+    useQueryFilterStore,
 } from '@dnpm-dip/core';
 import { type PropType, defineComponent } from 'vue';
 import { navigateTo } from '#imports';
@@ -27,12 +30,9 @@ export default defineComponent({
         const queryFilterStore = useQueryFilterStore();
 
         const handleClick = (keys: Coding[]) => {
-            const old = queryFilterStore.get('diagnosis[code]');
-
             let hasChanged : boolean;
 
-            // todo: check if one group of old is equal to keys
-            if (old.length === 1) {
+            if (queryFilterStore.hasGroup('diagnosis[code]', keys)) {
                 hasChanged = false;
                 queryFilterStore.set('diagnosis[code]', []);
             } else {
@@ -70,7 +70,7 @@ export default defineComponent({
                             <DKVChartTableSwitch
                                 :coding-verbose-label="true"
                                 :data="items"
-                                :clickable="true"
+                                :clickable="false"
                                 @clicked="handleClick"
                             />
                         </template>
diff --git a/packages/mtb/src/runtime/components/core/MQueryCriteriaSummary.vue b/packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummary.vue
similarity index 99%
rename from packages/mtb/src/runtime/components/core/MQueryCriteriaSummary.vue
rename to packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummary.vue
index f584f55b..e05e47a5 100644
--- a/packages/mtb/src/runtime/components/core/MQueryCriteriaSummary.vue
+++ b/packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummary.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright (c) 2024.
+  - Copyright (c) 2024-2024.
   - Author Peter Placzek (tada5hi)
   - For the full copyright and license information,
   - view the LICENSE file that was distributed with this source code.
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { DCodingText } from '@dnpm-dip/core';
 import { type PropType, defineComponent } from 'vue';
-import type { QueryCriteria } from '../../domains';
+import type { QueryCriteria } from '../../../domains';
 
 export default defineComponent({
     components: { DCodingText },
diff --git a/packages/mtb/src/runtime/components/core/MQueryCriteriaSummaryBox.vue b/packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummaryBox.vue
similarity index 96%
rename from packages/mtb/src/runtime/components/core/MQueryCriteriaSummaryBox.vue
rename to packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummaryBox.vue
index 782c8e71..8cc68b3b 100644
--- a/packages/mtb/src/runtime/components/core/MQueryCriteriaSummaryBox.vue
+++ b/packages/mtb/src/runtime/components/core/query-criteria/MQueryCriteriaSummaryBox.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright (c) 2024.
+  - Copyright (c) 2024-2024.
   - Author Peter Placzek (tada5hi)
   - For the full copyright and license information,
   - view the LICENSE file that was distributed with this source code.
@@ -7,9 +7,9 @@
 <script lang="ts">
 import { BModal } from 'bootstrap-vue-next';
 import { type PropType, defineComponent, ref } from 'vue';
-import type { QuerySession } from '../../domains';
+import type { QuerySession } from '../../../domains';
 import MQueryCriteriaSummary from './MQueryCriteriaSummary.vue';
-import MSearchForm from './MSearchForm.vue';
+import MSearchForm from '../search/MSearchForm.vue';
 
 export default defineComponent({
     components: { BModal, MQueryCriteriaSummary, MSearchForm },
diff --git a/packages/mtb/src/runtime/components/core/MQueryPatientMatch.vue b/packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatch.vue
similarity index 85%
rename from packages/mtb/src/runtime/components/core/MQueryPatientMatch.vue
rename to packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatch.vue
index bd4039dc..28a5cd4d 100644
--- a/packages/mtb/src/runtime/components/core/MQueryPatientMatch.vue
+++ b/packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatch.vue
@@ -1,8 +1,15 @@
+<!--
+  - Copyright (c) 2024.
+  - Author Peter Placzek (tada5hi)
+  - For the full copyright and license information,
+  - view the LICENSE file that was distributed with this source code.
+  -->
+
 <script lang="ts">
 import type { PropType } from 'vue';
-import { defineComponent, ref } from 'vue';
-import type { PatientMatch } from '../../domains';
-import MQueryCriteriaSummary from './MQueryCriteriaSummary.vue';
+import { computed, defineComponent, ref } from 'vue';
+import type { PatientMatch } from '../../../domains';
+import MQueryCriteriaSummary from '../query-criteria/MQueryCriteriaSummary.vue';
 
 export default defineComponent({
     components: {
@@ -21,14 +28,23 @@ export default defineComponent({
             type: Number,
         },
     },
-    setup() {
-        const extended = ref(true);
+    setup(props) {
+        const extended = ref<boolean>(true);
 
         const toggleExtended = () => {
             extended.value = !extended.value;
         };
 
+        const id = computed(() => {
+            if (Number.isInteger(props.index)) {
+                return props.index + 1;
+            }
+
+            return props.entity.id;
+        });
+
         return {
+            id,
             toggleExtended,
             extended,
         };
@@ -39,7 +55,7 @@ export default defineComponent({
     <div class="entity-card w-100">
         <div class="d-flex flex-row">
             <div>
-                <strong># {{ Number.isInteger(index) ? index + 1 : entity.id }}</strong>
+                <strong># {{ id }}</strong>
             </div>
             <div class="ms-auto">
                 <button
diff --git a/packages/mtb/src/runtime/components/core/MQueryPatientMatches.ts b/packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatches.ts
similarity index 82%
rename from packages/mtb/src/runtime/components/core/MQueryPatientMatches.ts
rename to packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatches.ts
index cd3e99fb..d3699dea 100644
--- a/packages/mtb/src/runtime/components/core/MQueryPatientMatches.ts
+++ b/packages/mtb/src/runtime/components/core/query-patient/MQueryPatientMatches.ts
@@ -1,8 +1,15 @@
+/*
+ * Copyright (c) 2024.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
 import type { ObjectLiteral, PatientMatchBase, ResourceCollectionSlots } from '@dnpm-dip/core';
 import { createResourceCollectionManager } from '@dnpm-dip/core';
 import type { PropType, SlotsType } from 'vue';
 import { defineComponent, toRef } from 'vue';
-import { injectHTTPClient } from '../../core/http-client';
+import { injectHTTPClient } from '../../../core/http-client';
 
 export default defineComponent({
     props: {
diff --git a/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue b/packages/mtb/src/runtime/components/core/search/MSearchCNVForm.vue
similarity index 96%
rename from packages/mtb/src/runtime/components/core/MSearchCNVForm.vue
rename to packages/mtb/src/runtime/components/core/search/MSearchCNVForm.vue
index 742c3331..4a8b621d 100644
--- a/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue
+++ b/packages/mtb/src/runtime/components/core/search/MSearchCNVForm.vue
@@ -1,3 +1,10 @@
+<!--
+  - Copyright (c) 2024.
+  - Author Peter Placzek (tada5hi)
+  - For the full copyright and license information,
+  - view the LICENSE file that was distributed with this source code.
+  -->
+
 <script lang="ts">
 import {
     type CodeSystemConcept,
@@ -13,7 +20,7 @@ import type { FormSelectOption } from '@vuecs/form-controls';
 import {
     type PropType, computed, defineComponent, reactive, toRef, watch,
 } from 'vue';
-import type { QueryCNVCriteria } from '../../domains';
+import type { QueryCNVCriteria } from '../../../domains';
 
 export default defineComponent({
     components: {
diff --git a/packages/mtb/src/runtime/components/core/MSearchForm.vue b/packages/mtb/src/runtime/components/core/search/MSearchForm.vue
similarity index 98%
rename from packages/mtb/src/runtime/components/core/MSearchForm.vue
rename to packages/mtb/src/runtime/components/core/search/MSearchForm.vue
index a910114d..a80b1325 100644
--- a/packages/mtb/src/runtime/components/core/MSearchForm.vue
+++ b/packages/mtb/src/runtime/components/core/search/MSearchForm.vue
@@ -1,3 +1,10 @@
+<!--
+  - Copyright (c) 2024.
+  - Author Peter Placzek (tada5hi)
+  - For the full copyright and license information,
+  - view the LICENSE file that was distributed with this source code.
+  -->
+
 <script lang="ts">
 import {
     type Coding,
@@ -22,7 +29,7 @@ import {
 import type { FormSelectOption } from '@vuecs/form-controls';
 import type { PropType } from 'vue';
 import { defineComponent, ref } from 'vue';
-import { injectHTTPClient } from '../../core/http-client';
+import { injectHTTPClient } from '../../../core/http-client';
 import {
     FormMutationType,
     type MutationDefinition,
@@ -30,8 +37,8 @@ import {
     type QueryCriteria,
     type QueryFusionCriteria, type QueryMedicationCriteria,
     type QuerySNVCriteria, type QueryVariantCriteria,
-} from '../../domains';
-import MMutationTabGroup from './MMutationTabGroup.vue';
+} from '../../../domains';
+import MMutationTabGroup from '../MMutationTabGroup.vue';
 import MSearchMedicationForm from './MSearchMedicationForm.vue';
 
 export default defineComponent({
diff --git a/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue b/packages/mtb/src/runtime/components/core/search/MSearchFusionForm.vue
similarity index 96%
rename from packages/mtb/src/runtime/components/core/MSearchFusionForm.vue
rename to packages/mtb/src/runtime/components/core/search/MSearchFusionForm.vue
index 7d61e47e..5f460312 100644
--- a/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue
+++ b/packages/mtb/src/runtime/components/core/search/MSearchFusionForm.vue
@@ -1,3 +1,10 @@
+<!--
+  - Copyright (c) 2024.
+  - Author Peter Placzek (tada5hi)
+  - For the full copyright and license information,
+  - view the LICENSE file that was distributed with this source code.
+  -->
+
 <script lang="ts">
 import {
     type CodeSystemConcept,
@@ -10,7 +17,7 @@ import { VCFormSelectSearch } from '@vuecs/form-controls';
 import {
     type PropType, computed, defineComponent, reactive, toRef, watch,
 } from 'vue';
-import type { QueryFusionCriteria } from '../../domains';
+import type { QueryFusionCriteria } from '../../../domains';
 
 export default defineComponent({
     components: {
diff --git a/packages/mtb/src/runtime/components/core/MSearchMedicationForm.vue b/packages/mtb/src/runtime/components/core/search/MSearchMedicationForm.vue
similarity index 100%
rename from packages/mtb/src/runtime/components/core/MSearchMedicationForm.vue
rename to packages/mtb/src/runtime/components/core/search/MSearchMedicationForm.vue
diff --git a/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue b/packages/mtb/src/runtime/components/core/search/MSearchSNVForm.vue
similarity index 95%
rename from packages/mtb/src/runtime/components/core/MSearchSNVForm.vue
rename to packages/mtb/src/runtime/components/core/search/MSearchSNVForm.vue
index 24a0e4b2..f482f79f 100644
--- a/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue
+++ b/packages/mtb/src/runtime/components/core/search/MSearchSNVForm.vue
@@ -1,3 +1,10 @@
+<!--
+  - Copyright (c) 2024.
+  - Author Peter Placzek (tada5hi)
+  - For the full copyright and license information,
+  - view the LICENSE file that was distributed with this source code.
+  -->
+
 <script lang="ts">
 import {
     type CodeSystemConcept,
@@ -10,7 +17,7 @@ import {
     type PropType, computed, defineComponent, reactive, toRef, watch,
 } from 'vue';
 import { VCFormSelectSearch } from '@vuecs/form-controls';
-import type { QuerySNVCriteria } from '../../domains';
+import type { QuerySNVCriteria } from '../../../domains';
 
 export default defineComponent({
     components: {
diff --git a/packages/mtb/src/runtime/pages/index.vue b/packages/mtb/src/runtime/pages/index.vue
index b3b203a8..9a9bf0bc 100644
--- a/packages/mtb/src/runtime/pages/index.vue
+++ b/packages/mtb/src/runtime/pages/index.vue
@@ -2,7 +2,7 @@
 import { PageMetaKey, useToast } from '@dnpm-dip/core';
 import type { ClientError } from 'hapic';
 import { defineNuxtComponent, definePageMeta, navigateTo } from '#imports';
-import SearchForm from '../components/core/MSearchForm.vue';
+import SearchForm from '../components/core/search/MSearchForm.vue';
 import { PermissionName, type QuerySession } from '../domains';
 
 export default defineNuxtComponent({
diff --git a/packages/mtb/src/runtime/pages/query/[id]/index.vue b/packages/mtb/src/runtime/pages/query/[id]/index.vue
index c5a49484..90d46200 100644
--- a/packages/mtb/src/runtime/pages/query/[id]/index.vue
+++ b/packages/mtb/src/runtime/pages/query/[id]/index.vue
@@ -6,10 +6,10 @@ import { QueryEventBusEventName } from '@dnpm-dip/core/services/query-event-bus/
 import { BModal } from 'bootstrap-vue-next';
 import type { PropType } from 'vue';
 import { defineNuxtComponent, useRoute } from '#imports';
-import MQueryCriteriaSummary from '../../../components/core/MQueryCriteriaSummary.vue';
-import MQueryCriteriaSummaryBox from '../../../components/core/MQueryCriteriaSummaryBox.vue';
+import MQueryCriteriaSummary from '../../../components/core/query-criteria/MQueryCriteriaSummary.vue';
+import MQueryCriteriaSummaryBox from '../../../components/core/query-criteria/MQueryCriteriaSummaryBox.vue';
 import MQueryDiagnosisFilter from '../../../components/core/MQueryDiagnosisFilter.vue';
-import MSearchForm from '../../../components/core/MSearchForm.vue';
+import MSearchForm from '../../../components/core/search/MSearchForm.vue';
 import type { QuerySession } from '../../../domains';
 
 export default defineNuxtComponent({
@@ -119,9 +119,11 @@ export default defineNuxtComponent({
                         :available="entity.filters.patient"
                     />
 
+                    <!--
                     <MQueryDiagnosisFilter
                         :available="entity.filters.diagnosis?.code"
                     />
+                    -->
                 </div>
             </div>
         </div>
diff --git a/packages/mtb/src/runtime/pages/query/[id]/index/patients.vue b/packages/mtb/src/runtime/pages/query/[id]/index/patients.vue
index 6fcb58be..de88d0ac 100644
--- a/packages/mtb/src/runtime/pages/query/[id]/index/patients.vue
+++ b/packages/mtb/src/runtime/pages/query/[id]/index/patients.vue
@@ -7,8 +7,8 @@ import {
 } from 'vue';
 import { inject, ref } from 'vue';
 import { defineNuxtComponent } from '#imports';
-import QueryPatientMatchEntity from '../../../../components/core/MQueryPatientMatch.vue';
-import QueryPatientMatchList from '../../../../components/core/MQueryPatientMatches';
+import QueryPatientMatchEntity from '../../../../components/core/query-patient/MQueryPatientMatch.vue';
+import QueryPatientMatchList from '../../../../components/core/query-patient/MQueryPatientMatches';
 import type { QuerySession } from '../../../../domains';
 
 export default defineNuxtComponent({
diff --git a/packages/portal/core/navigation/module.ts b/packages/portal/core/navigation/module.ts
index c5e500af..d68e59f1 100644
--- a/packages/portal/core/navigation/module.ts
+++ b/packages/portal/core/navigation/module.ts
@@ -150,7 +150,7 @@ export class Navigation {
         let canPass = true;
 
         if (item.meta.requirePermissions) {
-            let permissions : string[] = [];
+            let permissions : string[];
             if (Array.isArray(item.meta.requirePermissions)) {
                 permissions = item.meta.requirePermissions;
             } else {