fix: Trigger button display and resource trigger api error

Author: zhanweizhang7

ui/src/api/system-resource-management/trigger.ts

@@ -108,7 +108,7 @@ const putResourceTrigger: (
   data: TriggerData,
   loading?: Ref<boolean>,
 ) => Promise<Result<any>> = (source_type, source_id, trigger_id, data, loading) => {
-  return post(
+  return put(
     `${prefix}/${source_type}/${source_id}/trigger/${trigger_id}`,
     data,
     undefined,

ui/src/views/application/index.vue

@@ -253,9 +253,7 @@
                             <el-dropdown-item
                               @click.stop="openTriggerDrawer(item)"
                               v-if="
-                                apiType === 'workspace' &&
-                                item.is_publish &&
-                                permissionPrecise.trigger_read(item.id)
+                                apiType === 'workspace' && permissionPrecise.trigger_read(item.id)
                               "
                             >
                               <AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>

ui/src/views/system-resource-management/ApplicationResourceIndex.vue

@@ -286,7 +286,7 @@
                   </el-dropdown-item>
                   <el-dropdown-item
                     @click.stop="openTriggerDrawer(row)"
-                    v-if="row.is_publish && permissionPrecise.trigger_read()"
+                    v-if="permissionPrecise.trigger_read()"
                   >
                     <AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
                     {{ $t('views.trigger.title') }}
@@ -355,7 +355,8 @@ const MoreFilledPermission = () => {
   return (
     permissionPrecise.value.export() ||
     permissionPrecise.value.delete() ||
-    permissionPrecise.value.auth()
+    permissionPrecise.value.auth() ||
+    permissionPrecise.value.trigger_read()
   )
 }
 

ui/src/views/system-resource-management/ToolResourceIndex.vue

@@ -332,11 +332,7 @@
 
                   <el-dropdown-item
                     @click.stop="openTriggerDrawer(row)"
-                    v-if="
-                      row.tool_type === 'CUSTOM' &&
-                      permissionPrecise.trigger_read() &&
-                      row.is_active
-                    "
+                    v-if="row.tool_type === 'CUSTOM' && permissionPrecise.trigger_read()"
                   >
                     <AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
                     {{ $t('views.trigger.title') }}
@@ -474,6 +470,7 @@ const MoreFilledPermission = (row: any) => {
     permissionPrecise.value.delete() ||
     permissionPrecise.value.auth() ||
     permissionPrecise.value.relate_map() ||
+    permissionPrecise.value.trigger_read() ||
     (row.init_field_list?.length > 0 && permissionPrecise.value.edit())
   )
 }

ui/src/views/trigger/ResourceTriggerDrawer.vue

@@ -97,13 +97,20 @@ const emit = defineEmits(['refresh'])
 
 const createTrigger = (trigger: any) => {
   if (toolId.value) {
-    return triggerAPI.postResourceTrigger(props.source, toolId.value, trigger)
+    return loadSharedApi({ type: 'trigger', systemType: apiType.value }).postResourceTrigger(
+      props.source,
+      toolId.value,
+      trigger,
+    )
   }
   return Promise.resolve<any>({})
 }
 const editTrigger = (trigger_id: string, trigger: any) => {
   if (toolId.value) {
-    return triggerAPI.putResourceTrigger(props.source, toolId.value, trigger_id, trigger)
+    return loadSharedApi({
+      type: 'trigger',
+      systemType: apiType.value,
+    }).putResourceTrigger(props.source, toolId.value, trigger_id, trigger)
   }
   return Promise.resolve<any>({})
 }

ui/src/views/trigger/TriggerDrawer.vue

@@ -504,6 +504,7 @@ import Result from '@/request/Result'
 import { hasPermission } from '@/utils/permission'
 import permissionMap from '@/permission'
 import { PermissionConst, RoleConst } from '@/utils/permission/data'
+import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 
 const emit = defineEmits(['refresh'])
 const props = withDefaults(
@@ -573,9 +574,11 @@ const applicationRefresh = (application_selected: any) => {
   application_list
     .filter((id) => !existApplicationIds.includes(id))
     .map((id) => {
-      return applicationAPI.getApplicationDetail(id).then((ok) => {
-        applicationDetailsDict.value[ok.data.id] = ok.data
-      })
+      return loadSharedApi({ type: 'application', systemType: apiType.value })
+        .getApplicationDetail(id)
+        .then((ok: any) => {
+          applicationDetailsDict.value[ok.data.id] = ok.data
+        })
     })
   const task_source_id_list = form.value.trigger_task
     .filter((task: any) => task.source_type === 'APPLICATION')
@@ -613,9 +616,11 @@ const toolRefresh = (tool_selected: any) => {
   tool_ids
     .filter((id) => !existToolIds.includes(id))
     .map((id) => {
-      toolAPI.getToolById(id).then((ok) => {
-        toolDetailsDict.value[ok.data.id] = ok.data
-      })
+      loadSharedApi({ type: 'tool', systemType: apiType.value })
+        .getToolById(id)
+        .then((ok: any) => {
+          toolDetailsDict.value[ok.data.id] = ok.data
+        })
     })
   const task_source_id_list = form.value.trigger_task
     .filter((task: any) => task.source_type === 'TOOL')