fix: article list view page

frappe · Jan 14, 2025 · c3f9fab · c3f9fab
1 parent 7858d30
commit c3f9fab
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 11 deletions.
diff --git a/desk/src/components/knowledge-base/CategoryFolder.vue b/desk/src/components/knowledge-base/CategoryFolder.vue
@@ -1,7 +1,12 @@
 <template>
-  <div
+  <router-link
     class="flex flex-col gap-2 rounded-lg border p-3 w-[162px] sm:w-[172px] border-gray-200 cursor-pointer hover:shadow-xl"
-    @click="console.log('a')"
+    :to="{
+      name: 'Articles',
+      params: {
+        categoryId: category.name,
+      },
+    }"
   >
     <Tooltip :text="category.category_name">
       <div>
@@ -19,7 +24,7 @@
         </span>
       </div>
     </Tooltip>
-  </div>
+  </router-link>
 </template>
 
 <script setup lang="ts">

diff --git a/desk/src/components/knowledge-base/CategoryFolderContainer.vue b/desk/src/components/knowledge-base/CategoryFolderContainer.vue
@@ -10,7 +10,7 @@ import { createListResource } from "frappe-ui";
 
 const categories = createListResource({
   doctype: "HD Article Category",
-  fields: ["name", "category_name", "modified", "creation"],
+  fields: ["name", "category_name", "modified"],
   auto: true,
 });
 </script>

diff --git a/desk/src/pages/knowledge-base/Articles.vue b/desk/src/pages/knowledge-base/Articles.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="p-5 px-10 w-full overflow-scroll items-center">
+    <LayoutHeader>
+      <template #left-header>
+        <div class="text-lg font-medium text-gray-900">Knowledge base</div>
+      </template>
+    </LayoutHeader>
+    <div class="max-w-4xl pt-4 sm:px-5 w-full flex flex-col gap-2">
+      {{ categoryId }}
+    </div>
+    <div v-if="articles.data" class="text-wrap flex-1">
+      {{ articles.data }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { createListResource } from "frappe-ui";
+import LayoutHeader from "@/components/LayoutHeader.vue";
+const props = defineProps({
+  categoryId: {
+    required: true,
+    type: String,
+  },
+});
+
+const articles = createListResource({
+  doctype: "HD Article",
+  fields: ["author", "title", "modified"],
+  filters: {
+    category: props.categoryId,
+    status: "Published",
+  },
+  auto: true,
+});
+</script>
+
+<style scoped></style>
diff --git a/desk/src/pages/ticket/TicketNewArticles.vue b/desk/src/pages/ticket/TicketNewArticles.vue
@@ -8,7 +8,7 @@
       <RouterLink
         class="group cursor-pointer space-x-1 hover:text-gray-900"
         :to="{
-          name: 'KnowledgeBasePublicNew',
+          name: 'CustomerKnowledgeBase',
         }"
         target="_blank"
       >
@@ -24,7 +24,7 @@
         <RouterLink
           class="group cursor-pointer hover:text-gray-900 flex flex-col gap-2"
           :to="{
-            name: 'KBArticlePublicNew',
+            name: 'ArticlePublic',
             params: {
               articleId: a.name.split('#')[0],
             },

diff --git a/desk/src/router/index.ts b/desk/src/router/index.ts
@@ -97,13 +97,13 @@ const routes = [
       },
       {
         path: "kb-public/:categoryId",
-        name: "CustomerKnowledgeBaseArticles",
-        component: () =>
-          import("@/pages/knowledge-base/KnowledgeBaseCustomer.vue"),
+        name: "Articles",
+        component: () => import("@/pages/knowledge-base/Articles.vue"),
+        props: true,
       },
       {
-        path: "kb/articles/:articleId",
-        name: "Article",
+        path: "kb-public/articles/:articleId",
+        name: "ArticlePublic",
         component: () => import("@/pages/knowledge-base/Article.vue"),
         props: true,
       },