From e365300bee95808836bc5f9cdccc7e1bb2a91292 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Tue, 29 Oct 2024 11:47:13 -0400
Subject: [PATCH] ci: update issue templates

---
 .github/ISSUE_TEMPLATE/1.bug_report_v3.yml    | 11 +++---
 .github/ISSUE_TEMPLATE/2.design_issue.yml     | 39 +++++++++++++++++++
 .../{2.bug_report.yml => 3.bug_report_v2.yml} |  6 +--
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/2.design_issue.yml
 rename .github/ISSUE_TEMPLATE/{2.bug_report.yml => 3.bug_report_v2.yml} (90%)

diff --git a/.github/ISSUE_TEMPLATE/1.bug_report_v3.yml b/.github/ISSUE_TEMPLATE/1.bug_report_v3.yml
index 3667d27d3d8..8d1ac31f2ae 100644
--- a/.github/ISSUE_TEMPLATE/1.bug_report_v3.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug_report_v3.yml
@@ -1,6 +1,6 @@
-name: Bug Report v3
-description: Create a bug report for Payload v3 (beta)
-labels: ['status: needs-triage', 'v3']
+name: Functionality Bug
+description: '[REPRODUCTION REQUIRED] - Create a bug report'
+labels: ['status: needs-triage', 'v3', 'validate-reproduction']
 body:
 
   - type: textarea
@@ -14,8 +14,8 @@ body:
     attributes:
       label: Link to the code that reproduces this issue
       description: >-
-        Required: Please provide a link to your reproduction. Note, if the URL is invalid (404 or a private repository), we may close the issue.
-        Either use `npx create-payload-app@beta -t blank` or follow the [reproduction-guide](https://github.com/payloadcms/payload/blob/main/.github/reproduction-guide.md) for more information.
+        _REQUIRED_: Please provide a link to your reproduction. Note, if the URL is invalid (404 or a private repository), we may close the issue.
+        Either use `npx create-payload-app@beta -t blank` then push to a repo or follow the [reproduction-guide](https://github.com/payloadcms/payload/blob/main/.github/reproduction-guide.md) for more information.
     validations:
       required: true
 
@@ -33,6 +33,7 @@ body:
       options:
         - 'Not sure'
         - 'area: core'
+        - 'area: docs'
         - 'area: templates'
         - 'area: ui'
         - 'db-mongodb'
diff --git a/.github/ISSUE_TEMPLATE/2.design_issue.yml b/.github/ISSUE_TEMPLATE/2.design_issue.yml
new file mode 100644
index 00000000000..7f2bc950ce0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2.design_issue.yml
@@ -0,0 +1,39 @@
+name: Design Issue
+description: '[SCREENSHOT REQUIRED] - Create a design issue report'
+labels: ['status: needs-triage', 'v3', 'area: ui']
+body:
+
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Reproduction Steps
+      description: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue, based on the linked minimal reproduction. Screenshots can be provided in the issue body below. If using code blocks, make sure that [syntax highlighting is correct](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting) and double check that the rendered preview is not broken.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Environment Info
+      description: Paste output from `pnpm payload info` (>= beta.92) _or_ Payload, Node.js, and Next.js versions.
+      render: text
+      placeholder: |
+        Payload:
+        Node.js:
+        Next.js:
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: Before submitting the issue, go through the steps you've written down to make sure the steps provided are detailed and clear.
+  - type: markdown
+    attributes:
+      value: Contributors should be able to follow the steps provided in order to reproduce the bug.
+  - type: markdown
+    attributes:
+      value: These steps are used to add integration tests to ensure the same issue does not happen again. Thanks in advance!
diff --git a/.github/ISSUE_TEMPLATE/2.bug_report.yml b/.github/ISSUE_TEMPLATE/3.bug_report_v2.yml
similarity index 90%
rename from .github/ISSUE_TEMPLATE/2.bug_report.yml
rename to .github/ISSUE_TEMPLATE/3.bug_report_v2.yml
index cd3e825ff30..e4301e7eb00 100644
--- a/.github/ISSUE_TEMPLATE/2.bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/3.bug_report_v2.yml
@@ -1,11 +1,11 @@
-name: Bug Report
-description: Create a bug report for Payload
+name: v2 Bug Report
+description: Report a bug for Payload v2. ONLY CRITICAL bugs will be fixed in v2.
 labels: ['status: needs-triage', 'v2']
 body:
   - type: markdown
     attributes:
       value: |
-        *Note:* Feature requests should be opened as [discussions](https://github.com/payloadcms/payload/discussions/new?category=feature-requests-ideas).
+        ONLY CRITICAL bugs will be fixed in v2.
   - type: input
     id: reproduction-link
     attributes: