fixed missing structures in KWIC.

+ new Query-Store-persistence-name since the structure changed

src/components/DataDisplay/DataDisplayKeywordInContext.vue

@@ -75,7 +75,9 @@ function open(item: KeywordInContext) {
 
 const selectedKWIC: Ref<KeywordInContext | null> = ref(null);
 
-const columns = getKWICColumns(t as unknown as (s: string) => string, open);
+const columns = computed(() => {
+	return getKWICColumns(t as unknown as (s: string) => string, open);
+});
 </script>
 
 <template>

src/components/KWIC/KWICAttributeSelect.vue

@@ -11,6 +11,24 @@ const props = defineProps<{ query: CorpusQuery }>();
 const queryStore = useQueryStore();
 
 const _query = queryStore.queries.find((q) => q.id === props.query.id);
+
+const structureOptions = computed(() => {
+	const options: Array<string> = [];
+	_query?.KWICAttrsStructsOptions.structures.forEach((structure) => {
+		if (!structure.name) return;
+		options.push(structure.name);
+		if (structure.attributes && _query.KWICAttrsStructs.structures.includes(structure.name)) {
+			structure.attributes.forEach((attribute) => {
+				options.push(`${structure.name}.${attribute.name}`);
+			});
+		}
+	});
+	return options ?? [];
+});
+
+const attributeOptions = computed(
+	() => _query?.KWICAttrsStructsOptions.attributes.map((structure) => structure.name) ?? [],
+);
 </script>
 
 <template>
@@ -20,28 +38,45 @@ const _query = queryStore.queries.find((q) => q.id === props.query.id);
 			<VAutocomplete
 				v-model="_query.KWICAttrsStructs.attributes"
 				chips
+				class="flex-1"
 				closable-chips
-				dese
+				density="compact"
 				item-title="name"
-				:items="_query.KWICAttrsStructsOptions.attributes"
+				:items="attributeOptions"
 				:label="t('Attributes')"
 				multiple
 				placeholer="please select"
-				return-object
-			/>
+			>
+				<template #item="{ props, item }">
+					<VListItem
+						:class="{ 'ml-4': item.raw.includes('.') }"
+						density="compact"
+						v-bind="props"
+					></VListItem>
+				</template>
+			</VAutocomplete>
 
 			<VAutocomplete
 				v-model="_query.KWICAttrsStructs.structures"
 				chips
+				class="flex-1"
 				closable-chips
-				dese
+				density="compact"
 				item-title="name"
-				:items="_query.KWICAttrsStructsOptions.structures"
+				:items="structureOptions"
 				:label="t('Structures')"
 				multiple
 				placeholer="please select"
-				return-object
-			/>
+			>
+				<template #item="{ props, item }">
+					<VListItem
+						checkbox
+						:class="{ 'ml-4': item.raw.includes('.') }"
+						density="compact"
+						v-bind="props"
+					></VListItem>
+				</template>
+			</VAutocomplete>
 		</div>
 	</div>
 </template>

src/stores/query.ts

@@ -18,7 +18,7 @@ const emptySelectedCorpusKWICViewInfo: KWICAttrsStructs = {
 };
 
 export const useQueryStore = defineStore(
-	"newQueryStore",
+	"QueryStoreWithNewStructure",
 	() => {
 		const nextQueryId = ref(0);
 		const queries = ref([]) as Ref<Array<CorpusQuery>>;
@@ -85,8 +85,8 @@ export const useQueryStore = defineStore(
 		}
 
 		const getKWICqueryAttrStrcs = (query: CorpusQuery) => ({
-			attrs: query.KWICAttrsStructs.attributes.map((attr) => attr.name).join(","),
-			structs: query.KWICAttrsStructs.structures.map((struct) => struct.name).join(","),
+			attrs: query.KWICAttrsStructs.attributes.join(","),
+			structs: query.KWICAttrsStructs.structures.join(","),
 		});
 
 		const getQueryWithFacetting = (query: CorpusQuery) => {

src/types/query.d.ts

@@ -62,10 +62,14 @@ interface KWICStructure {
 	size?: number | undefined;
 }
 interface KWICAttrsStructs {
+	attributes: Array<string>;
+	structures: Array<string>;
+}
+
+interface KWICAttrsStructsOptions {
 	attributes: Array<KWICAttribute>;
 	structures: Array<KWICStructure>;
 }
-
 type ConcordanceQuery = Record<"queryselector", CorpusQueryType> &
 	Record<CorpusQueryTypeValue, string>;
 
@@ -87,7 +91,7 @@ interface CorpusQuery {
 	subCorpus: string;
 	concordance_query: ConcordanceQuery;
 	KWICAttrsStructs: KWICAttrsStructs;
-	KWICAttrsStructsOptions: KWICAttrsStructs; // ToDo: this might be refactored to come via requesat whenever needed.
+	KWICAttrsStructsOptions: KWICAttrsStructsOptions; // ToDo: this might be refactored to come via requesat whenever needed.
 	facettingValues: FacettingValues;
 	loading: {
 		yearlyFrequencies: boolean;