Merge branch 'main' into release/2024.08.07

vbatr · web-flow · commit ca15d15e83cd · 2024-08-07T12:39:58.000+03:00
diff --git a/manifests/server/development/manifest.json b/manifests/server/development/manifest.json
@@ -180,6 +180,28 @@
             "compose",
             "commandBox",
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "summary",
+              "title": "Issue summary"
+            },
+            {
+              "name": "description",
+              "title": "Issue description"
+            },
+            {
+              "name": "issueType",
+              "title": "Issue type"
+            },
+            {
+              "name": "assignee",
+              "title": "Issue assignee"
+            },
+            {
+              "name": "priority",
+              "title": "Issue priority"
+            }
           ]
         },
         {
@@ -190,6 +212,16 @@
           "fetchTask": true,
           "context": [
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "comment",
+              "title": "Issue comment"
+            },
+            {
+              "name": "issueUrl",
+              "title": "Issue url"
+            }
           ]
         }
       ]
diff --git a/manifests/server/integration/manifest.json b/manifests/server/integration/manifest.json
@@ -1,6 +1,6 @@
 ﻿{
-  "$schema": "https://developer.microsoft.com/json-schemas/teams/v1.7/MicrosoftTeams.schema.json",
-  "manifestVersion": "1.7",
+  "$schema": "https://developer.microsoft.com/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
+  "manifestVersion": "1.16",
   "version": "255.255.255",
   "id": "a3955064-f94d-4848-93d5-7fefac2b4c6d",
   "packageName": "com.msteams-atlassian.jira-server-integration",
@@ -180,6 +180,28 @@
             "compose",
             "commandBox",
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "summary",
+              "title": "Issue summary"
+            },
+            {
+              "name": "description",
+              "title": "Issue description"
+            },
+            {
+              "name": "issueType",
+              "title": "Issue type"
+            },
+            {
+              "name": "assignee",
+              "title": "Issue assignee"
+            },
+            {
+              "name": "priority",
+              "title": "Issue priority"
+            }
           ]
         },
         {
@@ -190,6 +212,16 @@
           "fetchTask": true,
           "context": [
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "comment",
+              "title": "Issue comment"
+            },
+            {
+              "name": "issueUrl",
+              "title": "Issue url"
+            }
           ]
         }
       ]
diff --git a/manifests/server/production/manifest.json b/manifests/server/production/manifest.json
@@ -194,6 +194,28 @@
             "compose",
             "commandBox",
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "summary",
+              "title": "Issue summary"
+            },
+            {
+              "name": "description",
+              "title": "Issue description"
+            },
+            {
+              "name": "issueType",
+              "title": "Issue type"
+            },
+            {
+              "name": "assignee",
+              "title": "Issue assignee"
+            },
+            {
+              "name": "priority",
+              "title": "Issue priority"
+            }
           ]
         },
         {
@@ -204,6 +226,16 @@
           "fetchTask": true,
           "context": [
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "comment",
+              "title": "Issue comment"
+            },
+            {
+              "name": "issueUrl",
+              "title": "Issue url"
+            }
           ]
         }
       ]
diff --git a/manifests/server/staging/manifest.json b/manifests/server/staging/manifest.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/teams/v1.7/MicrosoftTeams.schema.json",
-  "manifestVersion": "1.7",
+  "$schema": "https://developer.microsoft.com/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
+  "manifestVersion": "1.16",
   "version": "255.255.255",
   "id": "e52889b0-9b26-4f1c-b3db-4211be72d164",
   "packageName": "com.msteams-atlassian.jira-server-staging",
@@ -179,6 +179,28 @@
             "compose",
             "commandBox",
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "summary",
+              "title": "Issue summary"
+            },
+            {
+              "name": "description",
+              "title": "Issue description"
+            },
+            {
+              "name": "issueType",
+              "title": "Issue type"
+            },
+            {
+              "name": "assignee",
+              "title": "Issue assignee"
+            },
+            {
+              "name": "priority",
+              "title": "Issue priority"
+            }
           ]
         },
         {
@@ -189,6 +211,16 @@
           "fetchTask": true,
           "context": [
             "message"
+          ],
+          "parameters": [
+            {
+              "name": "comment",
+              "title": "Issue comment"
+            },
+            {
+              "name": "issueUrl",
+              "title": "Issue url"
+            }
           ]
         }
       ]
diff --git a/src/MicrosoftTeamsIntegration.Jira/ClientApp/package.json b/src/MicrosoftTeamsIntegration.Jira/ClientApp/package.json
@@ -77,6 +77,7 @@
     "tough-cookie": "4.1.4",
     "minimatch": "3.1.2",
     "micromatch": "4.0.7"
+    "unset-value": "2.0.1"
   },
   "engines": {
     "node": "16"
diff --git a/src/MicrosoftTeamsIntegration.Jira/Services/BotMessagesService.cs b/src/MicrosoftTeamsIntegration.Jira/Services/BotMessagesService.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
diff --git a/src/MicrosoftTeamsIntegration.Jira/Services/MessagingExtensionService.cs b/src/MicrosoftTeamsIntegration.Jira/Services/MessagingExtensionService.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
diff --git a/src/MicrosoftTeamsIntegration.Jira/TypeConverters/JiraIssueToAdaptiveCardTypeConverter.cs b/src/MicrosoftTeamsIntegration.Jira/TypeConverters/JiraIssueToAdaptiveCardTypeConverter.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using AdaptiveCards;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text.RegularExpressions;`