Combine content comments in advanced search

Closes #1096

Author: bkis

Tekst-API/openapi.json

@@ -9991,7 +9991,7 @@
             "maxLength": 512,
             "minLength": 0,
             "title": "Cmt",
-            "description": "Comment search query",
+            "description": "Author's/editor's comment search query",
             "default": "",
             "optionalNullable": true
           }

Tekst-API/tekst/resources/__init__.py

@@ -115,7 +115,7 @@ class CommonResourceSearchQueryData(ModelBase):
         ),
         Field(
             alias="cmt",
-            description="Comment search query",
+            description="Author's/editor's comment search query",
         ),
         SchemaOptionalNullable,
     ] = ""
@@ -198,7 +198,10 @@ def index_doc(
         """
         return dict(
             native=native,
-            comment=content.authors_comment,
+            comment=" ".join(
+                [content.authors_comment or "", content.editors_comment or ""]
+            ).strip()
+            or None,
             **(cls._rtype_index_doc(content) or {}),
         )
 

Tekst-Web/src/api/schema.d.ts

@@ -2442,7 +2442,7 @@ export interface components {
       res: string;
       /**
        * Cmt
-       * @description Comment search query
+       * @description Author's/editor's comment search query
        * @default
        */
       cmt?: string;

Tekst-Web/src/forms/formRules.ts

@@ -467,7 +467,7 @@ export const contentFormRules: Record<string, Record<string, FormItemRule[]>> =
 
 export const searchFormRules: Record<string, Record<string, FormItemRule[]>> = {
   common: {
-    authorsComment: [minMaxCharsRule(0, 512, 'blur')],
+    comment: [minMaxCharsRule(0, 512, 'blur')],
   },
   plainText: {
     text: [minMaxCharsRule(0, 512, 'blur')],

Tekst-Web/src/forms/resources/search/CommonSearchFormItems.vue

@@ -9,16 +9,17 @@ defineProps<{
   queryIndex: number;
 }>();
 
-const authorsComment =
+const comment =
   defineModel<NonNullable<AdvancedSearchRequestBody['q']>[number]['cmn']['cmt']>('comment');
 </script>
 
 <template>
   <n-form-item
-    :label="$t('resources.types.common.contentFields.authorsComment')"
+    ignore-path-change
+    :label="$t('common.comment', 2)"
     :path="`queries[${queryIndex}].cmn.cmt`"
-    :rule="searchFormRules.common.authorsComment"
+    :rule="searchFormRules.common.comment"
   >
-    <osk-input v-model="authorsComment" :placeholder="$t('common.comment')" />
+    <osk-input v-model="comment" :placeholder="$t('common.comment')" />
   </n-form-item>
 </template>