feat: Task source trigger permission

apps/trigger/serializers/task_source_trigger.py

@@ -107,7 +107,7 @@ def one(self, with_valid=True):
             return {
                 **TriggerModelSerializer(trigger).data,
                 'trigger_task': trigger_task,
-                'application_task': tool_task,
+                'tool_task': tool_task,
             }
 
     @transaction.atomic
@@ -137,7 +137,7 @@ def edit(self, instance: Dict, with_valid=True):
 
         if need_redeploy:
             if trigger.is_active:
-                deploy(ToolModelSerializer(trigger).data, **{})
+                deploy(TriggerModelSerializer(trigger).data, **{})
             else:
                 undeploy(TriggerModelSerializer(trigger).data, **{})
 

ui/src/api/trigger/trigger.ts

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

ui/src/layout/layout-header/top-about/index.vue

@@ -9,7 +9,20 @@
       <AppIcon iconName="app-pricing" class="mr-8"></AppIcon>
       {{ $t('common.upgrade') }}
     </el-button>
-    <el-tooltip effect="dark" :content="$t('views.trigger.title')" placement="top">
+    <el-tooltip
+      v-if="
+        hasPermission(
+          [
+            RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+            PermissionConst.TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
+          ],
+          'OR',
+        )
+      "
+      effect="dark"
+      :content="$t('views.trigger.title')"
+      placement="top"
+    >
       <el-button
         text
         @click="router.push({ name: 'trigger' })"
@@ -68,7 +81,8 @@
 </template>
 <script setup lang="ts">
 import useStore from '@/stores'
-import { EditionConst, RoleConst } from '@/utils/permission/data'
+import { hasPermission } from '@/utils/permission'
+import { EditionConst, PermissionConst, RoleConst } from '@/utils/permission/data'
 import { useRoute, useRouter } from 'vue-router'
 const route = useRoute()
 const router = useRouter()

ui/src/permission/application/system-manage.ts

@@ -32,6 +32,38 @@ const systemManage = {
             ],
             'OR'
     ),
+    trigger_read: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_APPLICATION_TRIGGER_READ
+            ],
+            'OR'
+    ),
+    trigger_create: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_APPLICATION_TRIGGER_CREATE
+            ],
+            'OR'
+    ),
+    trigger_edit: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_APPLICATION_TRIGGER_EDIT
+            ],
+            'OR'
+    ),
+    trigger_delete: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_APPLICATION_TRIGGER_DELETE
+            ],
+            'OR'
+    ),
     debug: () =>
         hasPermission(
             [

ui/src/permission/application/workspace.ts

@@ -93,6 +93,46 @@ const workspace = {
             ],
             'OR'
     ),
+    trigger_read: (source_id:string) => 
+        hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.APPLICATION_TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.APPLICATION_TRIGGER_READ.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+        trigger_create: (source_id:string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.APPLICATION_TRIGGER_CREATE.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.APPLICATION_TRIGGER_CREATE.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+            trigger_edit: (source_id:string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.APPLICATION_TRIGGER_EDIT.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.APPLICATION_TRIGGER_EDIT.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+                trigger_delete: (source_id:string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.APPLICATION_TRIGGER_DELETE.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.APPLICATION_TRIGGER_DELETE.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
     auth: (source_id:string) => 
         hasPermission(
             [

ui/src/permission/tool/system-manage.ts

@@ -30,6 +30,38 @@ const systemManage = {
       ],
       'OR',
     ),
+  trigger_read: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_TOOL_TRIGGER_READ
+            ],
+            'OR'
+    ),
+  trigger_create: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_TOOL_TRIGGER_CREATE
+            ],
+            'OR'
+    ),
+  trigger_edit: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_TOOL_TRIGGER_EDIT
+            ],
+            'OR'
+    ),
+  trigger_delete: () =>
+        hasPermission(
+            [
+              RoleConst.ADMIN,
+              PermissionConst.RESOURCE_TOOL_TRIGGER_DELETE
+            ],
+            'OR'
+    ),
   create: () => false,
   import: () => false,
   switch: () =>

ui/src/permission/tool/workspace.ts

@@ -102,6 +102,46 @@ const workspace = {
       ],
       'OR',
     ),
+  trigger_read: (source_id:string) => 
+        hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.TOOL_TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.TOOL_TRIGGER_READ.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+  trigger_create: (source_id:string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.TOOL_TRIGGER_CREATE.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.TOOL_TRIGGER_CREATE.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+  trigger_edit: (source_id: string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.TOOL_TRIGGER_EDIT.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.TOOL_TRIGGER_EDIT.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
+  trigger_delete: (source_id:string) => 
+    hasPermission(
+            [
+              new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
+              RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+              PermissionConst.TOOL_TRIGGER_DELETE.getWorkspacePermissionWorkspaceManageRole,
+              PermissionConst.TOOL_TRIGGER_DELETE.getApplicationWorkspaceResourcePermission(source_id)  
+            ],
+            'OR'
+    ),
   switch: (source_id:string) =>
     hasPermission(
       [

ui/src/router/modules/trigger.ts

@@ -5,10 +5,8 @@ const ModelRouter = {
   meta: {
     title: 'views.trigger.title',
     permission: [
-      RoleConst.USER.getWorkspaceRole,
       RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
-      PermissionConst.TOOL_READ.getWorkspacePermission,
-      PermissionConst.TOOL_READ.getWorkspacePermissionWorkspaceManageRole,
+      PermissionConst.TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
     ],
     group: 'workspace',
     order: 5,

ui/src/views/application/index.vue

@@ -247,7 +247,11 @@
                             </el-dropdown-item>
                             <el-dropdown-item
                               @click.stop="openTriggerDrawer(item)"
-                              v-if="apiType === 'workspace'"
+                              v-if="
+                                apiType === 'workspace' &&
+                                item.is_publish &&
+                                permissionPrecise.trigger_read(item.id)
+                              "
                             >
                               <AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
                               {{ $t('views.trigger.title') }}

ui/src/views/trigger/ResourceTriggerDrawer.vue

@@ -7,7 +7,12 @@
       <h4 class="title-decoration-1 mb-16 mt-16">
         {{ $t('views.trigger.title') }}
       </h4>
-      <el-button link type="primary" @click="openCreateTriggerDrawer()">
+      <el-button
+        v-if="permissionPrecise.trigger_create(toolId)"
+        link
+        type="primary"
+        @click="openCreateTriggerDrawer()"
+      >
         <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
         {{ $t('common.add') }}
       </el-button>
@@ -30,7 +35,11 @@
               </el-button>
             </span>
 
-            <el-button text @click="removeTrigger(item)">
+            <el-button
+              v-if="permissionPrecise.trigger_delete(toolId)"
+              text
+              @click="removeTrigger(item)"
+            >
               <el-icon><Close /></el-icon>
             </el-button>
           </div>
@@ -54,23 +63,29 @@ import { ref, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 import TriggerDrawer from '@/views/trigger/TriggerDrawer.vue'
+import permissionMap from '@/permission'
 import triggerAPI from '@/api/trigger/trigger'
 import { getTriggerCycleLabel } from '@/utils/trigger'
-const route = useRoute()
 
 const props = defineProps<{
   source: string
 }>()
+
+const route = useRoute()
 const apiType = computed(() => {
-  if (route.path.includes('shared')) {
-    return 'systemShare'
-  } else if (route.path.includes('resource-management')) {
+  if (route.path.includes('resource-management')) {
     return 'systemManage'
   } else {
     return 'workspace'
   }
 })
 
+const permissionPrecise = computed(() => {
+  return permissionMap[props.source.toLowerCase() as 'application' | 'tool'][
+    apiType.value as 'workspace' | 'systemManage'
+  ]
+})
+
 const toolId = ref<string>('')
 const visible = ref<boolean>(false)
 const loading = ref<boolean>(false)
@@ -97,7 +112,7 @@ const openCreateTriggerDrawer = () => {
   triggerDrawerRef.value?.open(undefined, props.source, toolId.value)
 }
 const openEditTriggerDrawer = (trigger: any) => {
-  triggerDrawerRef.value?.open(trigger.id)
+  triggerDrawerRef.value?.open(trigger.id, props.source, toolId.value)
 }
 
 function getTriggerList() {