From 5bedc044d6f2b3a64d7cd01ad41f900f7726df37 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 23 Dec 2021 20:24:06 +0100
Subject: [PATCH] Update issue templates

---
 .github/ISSUE_TEMPLATE.md                     | 46 -------------------
 .github/ISSUE_TEMPLATE/new_device_support.md  | 21 ---------
 .../ISSUE_TEMPLATE/new_device_support.yaml    | 31 +++++++++++++
 3 files changed, 31 insertions(+), 67 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 delete mode 100644 .github/ISSUE_TEMPLATE/new_device_support.md
 create mode 100644 .github/ISSUE_TEMPLATE/new_device_support.yaml

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index df14c9ea..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Before submitting an issue make sure you've searched for a similar issue and read the documentation: https://www.zigbee2mqtt.io/.
-
-Rules (don't ignore these, your issue will be closed without further notice):
-- English only
-- Make sure you are on the latest Zigbee2MQTT version
-- Provide a clear description of the problem
-- DON'T copy logs directly here, post a link to https://hastebin.com/ or https://pastebin.com/.
-- Make sure you are running the latest firmware https://github.com/koenkk/z-stack-firmware.
-
-Did you read the FAQ?
-- https://www.zigbee2mqtt.io/guide/faq
-
-Zigbee2MQTT fails to start?
-- https://www.zigbee2mqtt.io/guide/installation/20_zigbee2mqtt-fails-to-start.html
-
-Having issues when using a CC2531?
-- Make sure the CC2531 is connected through a USB extension cable
-- Try the source routing firmware: https://github.com/Koenkk/Z-Stack-firmware/tree/master/coordinator/Z-Stack_Home_1.2/bin/source_routing
-- With larger networks (30/40+) devices, your CC2531 might not be powerful enough. This will cause weird issues, in this case it's advised to use a more powerful adapter: https://www.zigbee2mqtt.io/guide/adapters/
-
-Unsupported device?
-- https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html
-
-Device does not pair or interview fails?
-- https://www.zigbee2mqtt.io/guide/faq/#why-does-my-device-not-or-fail-to-pair
-
-Bug report?
-- If applicable, provide steps how to reproduce the problem.
-- Provide the herdsman debug logging: https://www.zigbee2mqtt.io/guide/usage/debug.html
-
--->
-
-<!--Start your bug report below this line-->
-
-# Bug Report
-## What happened
-
-## What did you expect to happen
-
-## How to reproduce it (minimal and precise)
-
-## Debug Info
-Zigbee2MQTT version:
-Adapter hardware: CC2531, CC2530, CC26X2R1 or CC1352P-2
-Adapter firmware version:
diff --git a/.github/ISSUE_TEMPLATE/new_device_support.md b/.github/ISSUE_TEMPLATE/new_device_support.md
deleted file mode 100644
index 9674ff04..00000000
--- a/.github/ISSUE_TEMPLATE/new_device_support.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: New device support request
-about: Request support for a new device
-title: ''
-labels: new device support
-assignees: ''
-
----
-
-<!--
-VERY IMPORTANT: Before submitting a request, first (try to) follow: https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html
-
-Dumping just the info about this device without actually attemping adding support yourself will likely lead into this issue being ignored.
-Clearly indicate what you tried and where you got stuck.
--->
-
-## Information about the device + link
-..
-
-## data/database.db entry of the device
-..
diff --git a/.github/ISSUE_TEMPLATE/new_device_support.yaml b/.github/ISSUE_TEMPLATE/new_device_support.yaml
new file mode 100644
index 00000000..da2af3fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new_device_support.yaml
@@ -0,0 +1,31 @@
+name: New device support request
+description: Request support for a new device
+title: ""
+labels: [new device support]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        *IMPORTANT:* Before submitting:
+        - Make sure this device is not already supported in the [latest dev branch](https://www.zigbee2mqtt.io/advanced/more/switch-to-dev-branch.html)
+        - Follow this [guide](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html)
+  - type: input
+    id: link
+    attributes:
+      label: Link
+      description: Link of this device (product page)
+    validations:
+      required: true
+  - type: input
+    id: database
+    attributes:
+      label: Database entry
+      description: Entry of this device in `data/database.db` after pairing it
+    validations:
+      required: true
+  - type: textarea
+    id: notes
+    attributes:
+      label: Comments
+      placeholder: I tried to follow the supporting new device page but got stuck at...
+