chore: merge task of jira

instill-ai · Jul 30, 2024 · 31febb9 · 31febb9
1 parent a07f0d9
commit 31febb9
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 104 deletions.
diff --git a/application/jira/v1/config/definition.json b/application/jira/v1/config/definition.json
@@ -7,7 +7,6 @@
     "TASK_GET_SPRINT",
     "TASK_CREATE_ISSUE",
     "TASK_UPDATE_ISSUE",
-    "TASK_MOVE_ISSUE_TO_EPIC",
     "TASK_CREATE_SPRINT",
     "TASK_UPDATE_SPRINT",
     "TASK_RANK_EPIC"

diff --git a/application/jira/v1/config/tasks.json b/application/jira/v1/config/tasks.json
@@ -1056,56 +1056,97 @@
         },
         "update": {
           "title": "Update",
-          "description": "The fields to update",
+          "description": "Update an issue in Jira",
           "instillUIOrder": 1,
-          "instillFormat": "array:structured/update-field",
-          "instillAcceptFormats": [
-            "array:structured/update-field"
-          ],
-          "instillUpstreamTypes": [
-            "value",
-            "reference",
-            "template"
-          ],
-          "type": "array",
-          "items": {
-            "instillFormat": "structured/update-field",
-            "properties": {
-              "action": {
-                "description": "The action to perform, can be: `add`, `copy`, `edit`, `remove`, `set`",
-                "enum": [
-                  "add",
-                  "copy",
-                  "edit",
-                  "remove",
-                  "set"
-                ],
-                "instillUIOrder": 3,
-                "instillFormat": "string",
-                "type": "string",
-                "title": "Content"
-              },
-              "field-name": {
-                "description": "The name of the field to update",
-                "instillUIOrder": 4,
-                "instillFormat": "string",
-                "type": "string",
-                "title": "Field Name"
-              },
-              "value": {
-                "description": "The value of the field to update",
-                "instillUIOrder": 5,
-                "instillFormat": "string",
-                "type": "string",
-                "title": "Value"
+          "additionalProperties": true,
+          "instillFormat": "object",
+          "type": "object",
+          "oneOf": [
+            {
+              "properties": {
+                "update": {
+                  "const": "Custom Update",
+                  "type": "string"
+                },
+                "update-fields": {
+                  "title": "Update Fields",
+                  "description": "The fields to update",
+                  "instillFormat": "array:structured/update-field",
+                  "instillAcceptFormats": [
+                    "array:structured/update-field"
+                  ],
+                  "instillUpstreamTypes": [
+                    "value",
+                    "reference",
+                    "template"
+                  ],
+                  "type": "array",
+                  "items": {
+                    "instillFormat": "structured/update-field",
+                    "properties": {
+                      "action": {
+                        "description": "The action to perform, can be: `add`, `copy`, `edit`, `remove`, `set`",
+                        "enum": [
+                          "add",
+                          "copy",
+                          "edit",
+                          "remove",
+                          "set"
+                        ],
+                        "instillUIOrder": 3,
+                        "instillFormat": "string",
+                        "type": "string",
+                        "title": "Action"
+                      },
+                      "field-name": {
+                        "description": "The name of the field to update",
+                        "instillUIOrder": 4,
+                        "instillFormat": "string",
+                        "type": "string",
+                        "title": "Field Name"
+                      },
+                      "value": {
+                        "description": "The value of the field to update",
+                        "instillUIOrder": 5,
+                        "instillFormat": "string",
+                        "type": "string",
+                        "title": "Value"
+                      }
+                    },
+                    "required": [
+                      "action",
+                      "field-name"
+                    ],
+                    "type": "object"
+                  }
+                }
               }
             },
-            "required": [
-              "action",
-              "field-name"
-            ],
-            "type": "object"
-          }
+            {
+              "properties": {
+                "update": {
+                  "const": "Move Issue to Epic",
+                  "type": "string"
+                },
+                "epic-key": {
+                  "title": "Epic Key",
+                  "description": "The key of the epic, e.g. `JRA-1330`",
+                  "instillShortDescription": "The key of the epic",
+                  "instillUIOrder": 11,
+                  "instillFormat": "string",
+                  "instillAcceptFormats": [
+                    "string"
+                  ],
+                  "instillUpstreamTypes": [
+                    "value",
+                    "reference",
+                    "template"
+                  ],
+                  "type": "string"
+                }
+              }
+            }
+          ]
         }
       },
       "required": [
@@ -1122,62 +1163,6 @@
       "type": "object"
     }
   },
-  "TASK_MOVE_ISSUE_TO_EPIC": {
-    "description": "Move an issue to an epic in Jira",
-    "instillShortDescription": "Move an issue to an epic in Jira",
-    "input": {
-      "description": "Move an issue to an epic in Jira",
-      "instillUIOrder": 0,
-      "instillEditOnNodeFields": [
-        "issue-key",
-        "epic-key"
-      ],
-      "properties": {
-        "issue-key": {
-          "$ref": "#/$defs/issue/properties/key",
-          "title": "Issue Key",
-          "instillUIOrder": 0
-        },
-        "epic-key": {
-          "title": "Epic Key",
-          "description": "The key of the epic, e.g. `JRA-1330`",
-          "instillShortDescription": "The key of the epic",
-          "instillUIOrder": 1,
-          "instillFormat": "string",
-          "instillAcceptFormats": [
-            "string"
-          ],
-          "instillUpstreamTypes": [
-            "value",
-            "reference",
-            "template"
-          ],
-          "type": "string"
-        }
-      },
-      "required": [
-        "issue-key",
-        "epic-key"
-      ],
-      "title": "Input",
-      "type": "object"
-    },
-    "output": {
-      "description": "Move an issue to an epic in Jira",
-      "instillUIOrder": 0,
-      "properties": {
-        "success": {
-          "description": "Whether the issue is moved to the epic",
-          "instillUIOrder": 0,
-          "title": "Success",
-          "instillFormat": "boolean",
-          "type": "boolean"
-        }
-      },
-      "title": "Output",
-      "type": "object"
-    }
-  },
   "TASK_CREATE_SPRINT": {
     "description": "Create a sprint in Jira",
     "instillShortDescription": "Create a sprint in Jira",