Feat/improve search options (#26)

Resolves https://redmine.openatlas.eu/issues/2427 by reducing the search
categories to:

- Name
- ID
- Before (Begin before)
- After (Begin after)
- Type name
- Description

components/data-map-view.vue

@@ -6,7 +6,7 @@ import * as v from "valibot";
 
 import type { SearchFormData } from "@/components/search-form.vue";
 import type { EntityFeature } from "@/composables/use-create-entity";
-import { categories } from "@/composables/use-get-search-results";
+import { categories, operatorMap } from "@/composables/use-get-search-results";
 import type { GeoJsonFeature } from "@/utils/create-geojson-feature";
 
 import { project } from "../config/project.config";
@@ -22,8 +22,6 @@ const searchFiltersSchema = v.object({
 	search: v.fallback(v.string(), ""),
 });
 
-const idCategories = ["entityID", "typeID", "valueTypeID", "typeIDWithSubs"];
-
 const entitySelectionSchema = v.object({
 	selection: v.fallback(v.array(v.string()), []),
 });
@@ -60,7 +58,7 @@ const { data, isPending, isPlaceholderData } = useGetSearchResults(
 	computed(() => {
 		const { search, category, ...params } = searchFilters.value;
 
-		const operator = idCategories.includes(category) ? "equal" : "like";
+		const operator = operatorMap[category];
 
 		return {
 			...params,

components/data-view.vue

@@ -12,7 +12,7 @@ import {
 	PaginationListItem,
 	PaginationNext,
 } from "@/components/ui/pagination";
-import { categories, columns, isColumn } from "@/composables/use-get-search-results";
+import { categories, columns, isColumn, operatorMap } from "@/composables/use-get-search-results";
 
 const router = useRouter();
 const route = useRoute();
@@ -40,8 +40,6 @@ const searchFiltersSchema = v.object({
 	),
 });
 
-const idCategories = ["entityID", "typeID", "valueTypeID", "typeIDWithSubs"];
-
 const searchFilters = computed(() => {
 	return v.parse(searchFiltersSchema, route.query);
 });
@@ -84,7 +82,7 @@ const { data, isPending, isPlaceholderData } = useGetSearchResults(
 	computed(() => {
 		const { search, category, ...params } = searchFilters.value;
 
-		const operator = idCategories.includes(category) ? "equal" : "like";
+		const operator = operatorMap[category];
 
 		const searchQuery =
 			search && search.length > 0

components/search-form.vue

@@ -45,7 +45,13 @@ const searchLabelId = "search-field";
 					<SelectValue :placeholder="t('SearchForm.select-filter')" />
 				</SelectTrigger>
 				<SelectContent>
-					<SelectItem v-for="category of categories" :key="category" :value="category">
+					<SelectItem
+						v-for="category of categories.toSorted((a, b) =>
+							t(`SearchForm.filters.${a}`).localeCompare(t(`SearchForm.filters.${b}`)),
+						)"
+						:key="category"
+						:value="category"
+					>
 						{{ t(`SearchForm.filters.${category}`) }}
 					</SelectItem>
 				</SelectContent>

composables/use-get-search-results.ts

@@ -8,21 +8,21 @@ import type { LinkedPlace } from "@/types/api";
 export const categories = [
 	"beginFrom",
 	"beginTo",
-	"endFrom",
-	"endTo",
-	"entityAliases",
-	"entityCidocClass",
 	"entityDescription",
 	"entityID",
 	"entityName",
-	"entitySystemClass",
-	"relationToID",
-	"typeID",
-	"typeIDWithSubs",
 	"typeName",
-	"valueTypeID",
 ] as const;
 
+export const operatorMap = {
+	beginFrom: "greaterThanEqual",
+	beginTo: "lesserThanEqual",
+	entityDescription: "like",
+	entityID: "equal",
+	entityName: "like",
+	typeName: "like",
+} as const;
+
 /**
  * The columns that can be sorted on.
  * @id apiColumns

messages/de/common.json

@@ -155,8 +155,8 @@
 	"SearchForm": {
 		"filter": "Filter",
 		"filters": {
-			"beginFrom": "Beginn von",
-			"beginTo": "Beginn bis",
+			"beginFrom": "Beginn nach",
+			"beginTo": "Beginn vor",
 			"endFrom": "Ende von",
 			"endTo": "Ende bis",
 			"entityAliases": "Alias",

messages/en/common.json

@@ -155,8 +155,8 @@
 	"SearchForm": {
 		"filter": "Filter",
 		"filters": {
-			"beginFrom": "Begin from",
-			"beginTo": "Begin to",
+			"beginFrom": "Begin before",
+			"beginTo": "Begin after",
 			"endFrom": "End from",
 			"endTo": "End to",
 			"entityAliases": "Alias",