fix: give indexRule default value

Author: wwwzbwcom

__tests__/cls/cls.test.ts

@@ -16,16 +16,14 @@ describe('Scf Cls', () => {
     name: 'SCF_logset_zyIdCSDW',
     topic: 'SCF_logtopic_QExYJrDj',
     period: 7,
-    rule: {
-      full_text: {
-        case_sensitive: true,
+    indexRule: {
+      fullText: {
+        caseSensitive: true,
         tokenizer: '!@#%^&*()_="\', <>/?|\\;:\n\t\r[]{}',
       },
-      key_value: {
-        case_sensitive: true,
-        keys: ['SCF_RetMsg'],
-        types: ['text'],
-        tokenizers: [' '],
+      keyValue: {
+        caseSensitive: true,
+        keys: [{ key: 'SCF_RetMsg', type: 'text', tokenizer: '', sqlFlag: false }],
       },
     },
   };
@@ -75,16 +73,14 @@ describe('Normal Cls', () => {
     name: 'cls-test',
     topic: 'cls-topic-test',
     period: 7,
-    rule: {
-      full_text: {
-        case_sensitive: true,
+    indexRule: {
+      fullText: {
+        caseSensitive: true,
         tokenizer: '!@#%^&*()_="\', <>/?|\\;:\n\t\r[]{}',
       },
-      key_value: {
-        case_sensitive: true,
-        keys: ['SCF_RetMsg'],
-        types: ['text'],
-        tokenizers: [' '],
+      keyValue: {
+        caseSensitive: true,
+        keys: [{ key: 'SCF_RetMsg', type: 'text', sqlFlag: false }],
       },
     },
   };

src/modules/cls/index.ts

@@ -16,6 +16,7 @@ import { dtz, TIME_FORMAT, Dayjs } from '../../utils/dayjs';
 import { createLogset, createTopic, updateIndex, getSearchSql } from './utils';
 import Alarm from './alarm';
 import { ClsDashboard } from './dashboard';
+import { deepClone } from '../../utils';
 
 export default class Cls {
   credentials: CapiCredentials;
@@ -160,17 +161,20 @@ export default class Cls {
       let parsedKeyValue: any;
       if (fullText) {
         parsedFullText = {
-          case_sensitive: fullText.caseSensitive,
-          tokenizer: fullText.tokenizer,
+          case_sensitive: fullText.caseSensitive ?? false,
+          tokenizer: fullText.tokenizer ?? '',
         };
-        parsedKeyValue = {
+      }
+      if (keyValue) {
+        parsedKeyValue = deepClone({
           case_sensitive: keyValue?.caseSensitive!,
-          keys: keyValue?.keys?.map((v) => v.key) ?? [],
-          types: keyValue?.keys?.map((v) => v.type) ?? [],
-          sql_flags: keyValue?.keys?.map((v) => v.sqlFlag) ?? [],
-          tokenizers: keyValue?.keys.map((v) => v.tokenizer) ?? [],
-        };
+          keys: keyValue?.keys?.map((v) => v.key),
+          types: keyValue?.keys?.map((v) => v.type ?? 'text'),
+          sql_flags: keyValue?.keys?.map((v) => v.sqlFlag ?? true),
+          tokenizers: keyValue?.keys.map((v) => v.tokenizer ?? ''),
+        });
       }
+
       try {
         await updateIndex(this.clsClient, {
           topicId: inputs.topicId!,

src/modules/cls/interface.ts

@@ -163,16 +163,16 @@ export interface DeployIndexInputs {
   effective?: boolean;
   indexRule?: {
     fullText?: {
-      caseSensitive: boolean;
-      tokenizer: string;
+      caseSensitive?: boolean;
+      tokenizer?: string;
     };
     keyValue?: {
       caseSensitive: boolean;
       keys: {
         key: string;
         type: string;
-        sqlFlag: boolean;
-        tokenizer: string;
+        sqlFlag?: boolean;
+        tokenizer?: string;
       }[];
     };
   };