From 4c425a7af899b0263b9a05ad0f74acfd07ffd8a3 Mon Sep 17 00:00:00 2001
From: James Carppe <85850129+jamescarppe@users.noreply.github.com>
Date: Thu, 27 Jul 2023 16:57:32 +1200
Subject: [PATCH] Discussions updates (#9730)

* Update bug template: versions to dropdown, add license types to editions, set render on command used

* Update docs URL in help template
---
 .github/DISCUSSION_TEMPLATE/help.yaml |  2 +-
 .github/ISSUE_TEMPLATE/bug_report.yml | 29 ++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/DISCUSSION_TEMPLATE/help.yaml b/.github/DISCUSSION_TEMPLATE/help.yaml
index 14eac78e9..8a7aa138a 100644
--- a/.github/DISCUSSION_TEMPLATE/help.yaml
+++ b/.github/DISCUSSION_TEMPLATE/help.yaml
@@ -2,7 +2,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before asking a question, make sure it hasn't been already asked and answered. You can search our [discussions](https://github.com/orgs/portainer/discussions) and [bug reports](https://github.com/portainer/portainer/issues) in GitHub.  Also, be sure to check our [knowledge base](https://portal.portainer.io/knowledge) and [documentation](https://documentation.portainer.io/) first.
+        Before asking a question, make sure it hasn't been already asked and answered. You can search our [discussions](https://github.com/orgs/portainer/discussions) and [bug reports](https://github.com/portainer/portainer/issues) in GitHub.  Also, be sure to check our [knowledge base](https://portal.portainer.io/knowledge) and [documentation](https://docs.portainer.io/) first.
 
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d23fff0ae..a5542235c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -87,21 +87,35 @@ body:
 
         Tell us a bit about your Portainer environment.
 
-  - type: input
+    - type: dropdown
     attributes:
-      label: Enter your Portainer version
-      description: |
-        Enter a valid Portainer version. Example: 2.18.4
-        We only provide support for the most recent version of Portainer and the previous 3 versions. If you are on an older version of Portainer we recommend [upgrading first](https://docs.portainer.io/start/upgrade) in case your bug has already been fixed.
+      label: Portainer version
+      description: We only provide support for the most recent version of Portainer and the previous 3 versions. If you are on an older version of Portainer we recommend [upgrading first](https://docs.portainer.io/start/upgrade) in case your bug has already been fixed.
+      multiple: false
+      options:
+        - '2.18.4'
+        - '2.18.3'
+        - '2.18.2'
+        - '2.18.1'
+        - '2.17.1'
+        - '2.17.0'
+        - '2.16.2'
+        - '2.16.1'
+        - '2.16.0'
+        - '2.15.1'
+        - '2.15.0'
     validations:
-      required: false
+      required: true
 
   - type: dropdown
     attributes:
       label: Portainer Edition
       multiple: false
       options:
-        - 'Business Edition (BE/EE)'
+        - 'Business Edition (BE/EE) with 5NF / 3NF license'
+        - 'Business Edition (BE/EE) with Home & Student license'
+        - 'Business Edition (BE/EE) with Starter license'
+        - 'Business Edition (BE/EE) with Professional or Enterprise license'
         - 'Community Edition (CE)'
     validations:
       required: true
@@ -138,6 +152,7 @@ body:
       description: |
         Example: `docker run -d -p 8000:8000 -p 9443:9443 --name portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer-ce:latest`
         If you deployed Portainer using a compose file or manifest you can provide this here as well.
+      render: bash
     validations:
       required: false