Merge pull request #343 from EyeSeeTea/feature/use-feedback-component

Feature/use feedback component
EyeSeeTea · Feb 4, 2025 · 5158366 · 5158366
2 parents 53a1250 + f99a086
commit 5158366
Show file tree

Hide file tree

Showing 17 changed files with 925 additions and 172 deletions.
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
         "@dhis2/ui-widgets": "6.24.0",
         "@eyeseetea/d2-api": "1.11.0",
         "@eyeseetea/d2-ui-components": "2.7.0-beta.3",
+        "@eyeseetea/feedback-component": "0.1.2",
         "@eyeseetea/xlsx-populate": "4.2.1-beta.1",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.2",

diff --git a/public/app-config-default.json b/public/app-config-default.json
@@ -4,16 +4,19 @@
         "showShareButton": true
     },
     "feedback": {
-        "createIssue": false,
-        "sendToDhis2UserGroups": [],
-        "clickUp": {
-            "apiUrl": "https://dev.eyeseetea.com/clickup",
-            "listId": "170646821",
-            "title": "[User feedback] {title}",
-            "body": "## dhis2\n\nUsername: {username}\n\n{body}",
-            "status": "Misc"
+        "repositories": {
+            "clickUp": {
+                "apiUrl": "https://dev.eyeseetea.com/clickup",
+                "listId": "170646821",
+                "title": "[User feedback] {title}",
+                "body": "## dhis2\n\nUsername: {username}\n\n{body}",
+                "status": "Misc"
+            },
+            "dhis2": {
+                "sendToDhis2UserGroups": []
+            }
         },
-        "feedbackOptions": {
+        "layoutOptions": {
             "showContact": false,
             "descriptionTemplate": "## Summary\n\n## Steps to reproduce\n\n## Actual results\n\n## Expected results\n\n"
         }

diff --git a/public/app-config-who.json b/public/app-config-who.json
@@ -4,16 +4,19 @@
         "showShareButton": false
     },
     "feedback": {
-        "createIssue": true,
-        "sendToDhis2UserGroups": ["Administrators"],
-        "clickUp": {
-            "apiUrl": "https://dev.eyeseetea.com/clickup",
-            "listId": "170646821",
-            "title": "[User feedback] {title}",
-            "body": "## dhis2\n\nUsername: {username}\n\n{body}",
-            "status": "Misc"
+        "repositories": {
+            "clickUp": {
+                "apiUrl": "https://dev.eyeseetea.com/clickup",
+                "listId": "170646821",
+                "title": "[User feedback] {title}",
+                "body": "## dhis2\n\nUsername: {username}\n\n{body}",
+                "status": "Misc"
+            },
+            "dhis2": {
+                "sendToDhis2UserGroups": ["Administrators"]
+            }
         },
-        "feedbackOptions": {
+        "layoutOptions": {
             "showContact": false,
             "descriptionTemplate": "## Summary\n\n## Steps to reproduce\n\n## Actual results\n\n## Expected results\n\n"
         }

diff --git a/public/app-config.json b/public/app-config.json
@@ -4,16 +4,19 @@
         "showShareButton": true
     },
     "feedback": {
-        "createIssue": false,
-        "sendToDhis2UserGroups": [],
-        "clickUp": {
-            "apiUrl": "https://dev.eyeseetea.com/clickup",
-            "listId": "170646821",
-            "title": "[User feedback] {title}",
-            "body": "## dhis2\n\nUsername: {username}\n\n{body}",
-            "status": "Misc"
+        "repositories": {
+            "clickUp": {
+                "apiUrl": "https://dev.eyeseetea.com/clickup",
+                "listId": "170646821",
+                "title": "[User feedback] {title}",
+                "body": "## dhis2\n\nUsername: {username}\n\n{body}",
+                "status": "Misc"
+            },
+            "dhis2": {
+                "sendToDhis2UserGroups": []
+            }
         },
-        "feedbackOptions": {
+        "layoutOptions": {
             "showContact": false,
             "descriptionTemplate": "## Summary\n\n## Steps to reproduce\n\n## Actual results\n\n## Expected results\n\n"
         }

diff --git a/public/feedback-tool/feedback-clickup.min.js b/public/feedback-tool/feedback-clickup.min.js
diff --git a/public/feedback-tool/feedback-dhis2.min.js b/public/feedback-tool/feedback-dhis2.min.js
diff --git a/public/feedback-tool/feedback-github.min.js b/public/feedback-tool/feedback-github.min.js
diff --git a/public/feedback-tool/feedback.min.css b/public/feedback-tool/feedback.min.css
diff --git a/public/feedback-tool/feedback.min.js b/public/feedback-tool/feedback.min.js