fix: change feedback to value of 0/1/2

frappe · Nov 25, 2024 · 1db79d3 · 1db79d3
1 parent 5d96b71
commit 1db79d3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 65 deletions.
diff --git a/desk/src/pages/KnowledgeBaseArticle.vue b/desk/src/pages/KnowledgeBaseArticle.vue
@@ -30,7 +30,7 @@
             shadow: editMode,
             'p-4': editMode,
           }"
-          editor-class="prose-f"
+          editor-class="prose-f mt-2"
           @change="articleContent = $event"
         >
           <template #top>
@@ -76,29 +76,23 @@
                   <Icon
                     class="w-6 h-6 cursor-pointer"
                     :icon="
-                      articleFeedback?.user_feedback == 'Like'
+                      userFeedback === 1
                         ? 'prime:thumbs-up-fill'
                         : 'prime:thumbs-up'
                     "
                     @click="handleFeedbackClick('Like')"
                   />
-                  <span class="text-p-md text-gray-700">{{
-                    articleFeedback?.total_likes
-                  }}</span>
                 </div>
                 <div class="flex items-center justify-center">
                   <Icon
                     class="w-6 h-6 cursor-pointer"
                     :icon="
-                      articleFeedback?.user_feedback == 'Dislike'
+                      userFeedback === 2
                         ? 'prime:thumbs-down-fill'
                         : 'prime:thumbs-down'
                     "
                     @click="handleFeedbackClick('Dislike')"
                   />
-                  <span class="text-p-md text-gray-700">{{
-                    articleFeedback?.total_dislikes
-                  }}</span>
                 </div>
               </div>
             </div>
@@ -139,7 +133,7 @@ import KnowledgeBaseArticleTopNew from "./knowledge-base/KnowledgeBaseArticleTop
 import KnowledgeBaseArticleTopView from "./knowledge-base/KnowledgeBaseArticleTopView.vue";
 import { PreserveIds } from "@/tiptap-extensions";
 import { Icon } from "@iconify/vue";
-import { ArticleFeedback, Feedback } from "@/types";
+import { FeedbackAction } from "@/types";
 const props = defineProps({
   articleId: {
     type: String,
@@ -260,15 +254,15 @@ const topComponent = computed(() => {
   return KnowledgeBaseArticleTopView;
 });
 
-const articleFeedback = ref<ArticleFeedback>(null);
+const userFeedback = ref<FeedbackAction>(null);
 const article = createResource({
   url: "helpdesk.helpdesk.doctype.hd_article.api.get_article",
   params: {
     name: props.articleId,
   },
   onSuccess(data) {
     articleTitle.value = data.title;
-    articleFeedback.value = data.feedback;
+    userFeedback.value = data.user_feedback;
     capture("article_viewed", {
       data: {
         user: authStore.userId,
@@ -296,43 +290,19 @@ const setFeedback = createResource({
   },
 });
 
-const userAction = ref<Feedback>("");
-function handleFeedbackClick(action: Feedback) {
-  if (
-    articleFeedback.value.user_feedback &&
-    articleFeedback.value.user_feedback === action
-  ) {
-    articleFeedback.value.user_feedback = null;
-
-    userAction.value = "";
-  } else {
-    articleFeedback.value.user_feedback = action;
-    userAction.value = action;
-  }
-  handleOptimisticUpdate(action);
+const userAction = ref();
+const feedbackMap = {
+  Remove: 0,
+  Like: 1,
+  Dislike: 2,
+};
 
+function handleFeedbackClick(action: string) {
+  userAction.value = feedbackMap[action];
+  userFeedback.value = feedbackMap[action];
   setFeedback.submit();
 }
 
-function handleOptimisticUpdate(action: Feedback) {
-  if (action === "Like" && action === articleFeedback.value.user_feedback) {
-    articleFeedback.value.total_likes++;
-    articleFeedback.value.total_dislikes > 0 &&
-      articleFeedback.value.total_dislikes--;
-  } else if (
-    action === "Dislike" &&
-    action === articleFeedback.value.user_feedback
-  ) {
-    articleFeedback.value.total_dislikes++;
-    articleFeedback.value.total_likes > 0 &&
-      articleFeedback.value.total_likes--;
-  } else if (action == "Like" && !articleFeedback.value.user_feedback) {
-    articleFeedback.value.total_likes--;
-  } else if (action == "Dislike" && !articleFeedback.value.user_feedback) {
-    articleFeedback.value.total_dislikes--;
-  }
-}
-
 const category = createDocumentResource({
   doctype: "HD Article Category",
   name: categoryId.value,

diff --git a/desk/src/types.ts b/desk/src/types.ts
@@ -247,10 +247,4 @@ export interface Category {
   children?: (Article | SubCategory)[];
 }
 
-export interface ArticleFeedback {
-  user_feedback: string;
-  total_likes: number;
-  total_dislikes: number;
-}
-
-export type Feedback = "Like" | "Dislike" | "";
+export type FeedbackAction = 0 | 1 | 2; // 0: neutral, 1: like, 2: dislike
diff --git a/helpdesk/helpdesk/doctype/hd_article/api.py b/helpdesk/helpdesk/doctype/hd_article/api.py
@@ -22,23 +22,18 @@ def get_article(name: str):
     # if not is_agent() and user != author.name:
     # frappe.db.set_value("HD Article", name, "views", article["views"] + 1)
 
-    feedback = {
-        "user_feedback": frappe.db.get_value(
+    user_feedback = int(
+        frappe.db.get_value(
             "HD Article Feedback", {"user": user, "article": name}, "feedback"
         )
-        or None,
-        "total_likes": frappe.db.count(
-            "HD Article Feedback", {"article": name, "feedback": "Like"}
-        ),
-        "total_dislikes": frappe.db.count(
-            "HD Article Feedback", {"article": name, "feedback": "Dislike"}
-        ),
-    }
+        or 0
+    )
+    print("\n\n", user_feedback, "\n\n")
 
     return {
         **article,
         "author": author,
         "category": category,
         "sub_category": sub_category,
-        "feedback": feedback,
+        "user_feedback": user_feedback,
     }
diff --git a/helpdesk/helpdesk/doctype/hd_article/hd_article.py b/helpdesk/helpdesk/doctype/hd_article/hd_article.py
@@ -54,6 +54,7 @@ def before_save(self):
 
     @frappe.whitelist()
     def set_feedback(self, value):
+        # 0 empty, 1 like, 2 dislike
         user = frappe.session.user
         feedback = frappe.db.exists(
             "HD Article Feedback", {"user": user, "article": self.name}

diff --git a/helpdesk/helpdesk/doctype/hd_article_feedback/hd_article_feedback.json b/helpdesk/helpdesk/doctype/hd_article_feedback/hd_article_feedback.json
@@ -22,7 +22,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Feedback",
-   "options": "\nLike\nDislike"
+   "options": "0\n1\n2"
   },
   {
    "fieldname": "article",
@@ -33,7 +33,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-25 13:02:57.975496",
+ "modified": "2024-11-25 14:00:41.166072",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Article Feedback",