fix: [Trigger] The search function for trigger execution records is not working. (#4727)

Author: shaohuzhang1

apps/trigger/serializers/trigger_task.py

@@ -76,19 +76,25 @@ def get_execution_details(self, is_valid=True):
 class TriggerTaskRecordQuerySerializer(serializers.Serializer):
     trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
     workspace_id = serializers.CharField(required=True, label=_('workspace id'))
-    state = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger task'))
-    name = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger task'))
+    state = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger state'))
+    name = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger name'))
+    order = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('Order field'))
 
     def get_query_set(self):
         trigger_query_set = QuerySet(
             model=get_dynamics_model({
+                'ett.create_time': models.DateTimeField(),
                 'ett.state': models.CharField(),
                 'sdc.name': models.CharField(),
                 'ett.workspace_id': models.CharField(),
                 'ett.trigger_id': models.UUIDField(),
             }))
         trigger_query_set = trigger_query_set.filter(
             **{'ett.trigger_id': self.data.get("trigger_id")})
+        if self.data.get("order"):
+            trigger_query_set = trigger_query_set.order_by(self.data.get("order"))
+        else:
+            trigger_query_set = trigger_query_set.order_by("-ett.create_time")
         if self.data.get('state'):
             trigger_query_set = trigger_query_set.filter(**{'ett.state': self.data.get('state')})
         if self.data.get("name"):

ui/src/views/trigger/execution-record/TriggerTaskRecordDrawer.vue

@@ -19,15 +19,15 @@
         </el-select>
         <el-input
           v-if="searchType === 'name'"
-          v-model="query.resource_name"
+          v-model="query.name"
           :placeholder="$t('common.search')"
           style="width: 220px"
           clearable
           @change="getList(true)"
         />
         <el-select
           v-else-if="searchType === 'state'"
-          v-model="query.source_type"
+          v-model="query.state"
           @change="getList(true)"
           filterable
           clearable
@@ -51,6 +51,8 @@
       :pagination-config="paginationConfig"
       @sizeChange="changeSize"
       @changePage="getList(true)"
+      :default-sort="{ prop: 'create_time', order: 'descending' }"
+      @sort-change="handleSortChange"
       :maxTableHeight="200"
       :row-key="(row: any) => row.id"
       v-loading="loading"
@@ -129,6 +131,7 @@
         </template>
       </el-table-column>
       <el-table-column
+        sortable
         prop="create_time"
         :label="$t('chat.executionDetails.createTime')"
         width="180"
@@ -181,6 +184,7 @@ const tableData = ref<Array<any>>([])
 const query = ref<any>({
   state: '',
   name: '',
+  order: '',
 })
 const loading = ref<boolean>(false)
 const current_trigger_id = ref<string>()
@@ -210,7 +214,10 @@ const changeSize = () => {
   paginationConfig.current_page = 1
   getList()
 }
-
+function handleSortChange({ prop, order }: { prop: string; order: string }) {
+  query.value.order = order === 'ascending' ? `ett.${prop}` : `-ett.${prop}`
+  getList()
+}
 const getList = (isLoading?: boolean) => {
   if (current_trigger_id.value) {
     return triggerAPI