From b9340efa607074ed960b4d458103bff7c575d514 Mon Sep 17 00:00:00 2001
From: Sumit Bhanushali <sumit.bhanushali63@gmail.com>
Date: Thu, 16 May 2024 01:59:21 +0530
Subject: [PATCH] fix(KB): form cleanup, removed dead code, idx counter back to
 working

---
 .../src/components/desk/kb/ArticleDetails.vue | 155 ------------
 .../desk/kb/ArticleTitleAndContent.vue        | 148 ------------
 .../components/desk/kb/CategorySelector.vue   | 198 ----------------
 desk/src/pages/desk/kb/Articles.vue           | 221 ------------------
 desk/src/pages/desk/kb/KnowledgeBase.vue      |  11 -
 .../knowledge-base/KnowledgeBaseArticle.vue   |   2 -
 .../KnowledgeBaseArticleTopView.vue           |  52 -----
 .../KnowledgeBasePublicSearch.vue             |   1 -
 .../KnowledgeBaseSubcategory.vue              |   5 -
 .../helpdesk/doctype/hd_article/hd_article.js |  40 +---
 .../doctype/hd_article/hd_article.json        |  44 +---
 .../helpdesk/doctype/hd_article/hd_article.py |  24 +-
 12 files changed, 18 insertions(+), 883 deletions(-)
 delete mode 100644 desk/src/components/desk/kb/ArticleDetails.vue
 delete mode 100644 desk/src/components/desk/kb/ArticleTitleAndContent.vue
 delete mode 100644 desk/src/components/desk/kb/CategorySelector.vue
 delete mode 100644 desk/src/pages/desk/kb/Articles.vue
 delete mode 100644 desk/src/pages/desk/kb/KnowledgeBase.vue

diff --git a/desk/src/components/desk/kb/ArticleDetails.vue b/desk/src/components/desk/kb/ArticleDetails.vue
deleted file mode 100644
index cd5b8f05f..000000000
--- a/desk/src/components/desk/kb/ArticleDetails.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-	<div class="flex flex-col rounded shadow p-5 text-base space-y-[12px]">
-		<div class="font-semibold">Details</div>
-		<div class="border-b w-full"></div>
-		<RouterLink
-			:to="`/knowledge-base/articles/${article.name}`"
-			target="_blank"
-			v-if="article.published_on"
-			class="flex flex-row justify-between items-center"
-		>
-			<div>
-				Published
-				{{
-					$dayjs.shortFormating(
-						$dayjs(article.published_on).fromNow(),
-						true
-					)
-				}}
-			</div>
-			<FeatherIcon name="external-link" class="h-4 w-4" />
-		</RouterLink>
-		<div v-if="$resources.users.data" class="flex flex-col">
-			<span class="block mb-2 text-sm leading-4 text-gray-700">
-				Author
-			</span>
-			<Autocomplete
-				:options="
-					$resources.users.data.map((x) => {
-						return { label: x.name, value: x.name }
-					})
-				"
-				placeholder="Choose author"
-				:value="isNew ? articleTempValues?.author : article.author"
-				@change="
-					(item) => {
-						if (!item) return
-						setArticleDetail('author', item.value)
-					}
-				"
-			/>
-			<ErrorMessage :message="articleInputErrors.author" />
-		</div>
-		<div>
-			<CategorySelector
-				:selectedCategory="
-					isNew ? articleTempValues?.category : article.category
-				"
-				@selection="
-					(category) => {
-						setArticleDetail('category', category.name)
-					}
-				"
-			/>
-			<ErrorMessage :message="articleInputErrors.category" />
-		</div>
-		<div
-			class="flex flex-row items-center text-sm text-gray-700"
-			v-if="!isNew"
-		>
-			<div class="flex flex-row items-center space-x-[6px]">
-				<FeatherIcon name="eye" class="w-[16px] stroke-gray-500" />
-				<div class="w-[28px] text-left">
-					{{ article.views || 0 }}
-				</div>
-			</div>
-			<div class="flex flex-row items-center space-x-[6px]">
-				<FeatherIcon name="smile" class="w-[14px] stroke-gray-500" />
-				<div class="w-[28px] text-left">
-					{{ article.helpful || 0 }}
-				</div>
-			</div>
-			<div class="flex flex-row items-center space-x-[6px]">
-				<FeatherIcon name="frown" class="w-[14px] stroke-gray-500" />
-				<div class="w-[28px] text-left">
-					{{ article.not_helpful || 0 }}
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import { FeatherIcon, ErrorMessage } from "frappe-ui"
-import Autocomplete from "@/components/global/Autocomplete.vue"
-import { inject } from "vue"
-import CategorySelector from "@/components/desk/kb/CategorySelector.vue"
-
-export default {
-	name: "ArticleDetails",
-	props: {
-		article: {
-			type: Object,
-			default: null,
-		},
-		articleResource: {
-			type: Object,
-			default: null,
-		},
-		isNew: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	components: {
-		FeatherIcon,
-		ErrorMessage,
-		Autocomplete,
-		CategorySelector,
-	},
-	setup() {
-		const updateArticleTempValues = inject("updateArticleTempValues")
-		const articleTempValues = inject("articleTempValues")
-		const articleInputErrors = inject("articleInputErrors")
-
-		return {
-			updateArticleTempValues,
-			articleTempValues,
-			articleInputErrors,
-		}
-	},
-	resources: {
-		users() {
-			return {
-				url: "helpdesk.extends.client.get_list",
-				params: {
-					doctype: "User",
-					fields: ["name", "full_name"],
-					filters: {
-						enabled: 1,
-					},
-					limit: 9999,
-				},
-				auto: true,
-			}
-		},
-	},
-	methods: {
-		setArticleDetail(field, value) {
-			if (!this.isNew) {
-				let params = {}
-				params[field] = value
-				this.articleResource.setValue.submit(params).then(() => {
-					if (field === "category") {
-						// This Refreshes the breadcrumbs
-						// TODO: Find a better way to do this
-						this.$router.go()
-					}
-				})
-			} else {
-				this.updateArticleTempValues({ field, value })
-			}
-		},
-	},
-}
-</script>
diff --git a/desk/src/components/desk/kb/ArticleTitleAndContent.vue b/desk/src/components/desk/kb/ArticleTitleAndContent.vue
deleted file mode 100644
index 8ee982800..000000000
--- a/desk/src/components/desk/kb/ArticleTitleAndContent.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-	<div class="flex h-full flex-col space-y-[16px]">
-		<div>
-			<div v-if="editMode" class="flex flex-col">
-				<Input
-					label="Title"
-					type="text"
-					:value="article.title"
-					@input="onTitleInput"
-				/>
-				<ErrorMessage :message="articleInputErrors.title" />
-			</div>
-			<div v-else class="text-[24px] font-semibold">
-				{{ article.title }}
-			</div>
-		</div>
-		<div>
-			<div class="flex flex-col">
-				<div
-					v-if="editMode"
-					class="mb-2 block text-sm leading-4 text-gray-700"
-				>
-					Content
-				</div>
-				<TextEditor
-					:class="editMode ? 'bg-gray-100' : ''"
-					ref="textEditor"
-					:editor-class="
-						!editable
-							? 'flex flex-col'
-							: editMode
-							? 'min-h-[20rem] overflow-y-auto max-h-[73vh] w-full px-3'
-							: 'min-h-[20rem] overflow-y-auto max-h-[85vh]'
-					"
-					:content="article.content"
-					:starterkit-options="{
-						heading: { levels: [2, 3, 4, 5, 6] },
-					}"
-					@change="onContentInput"
-					:editable="editMode"
-				>
-					<template v-slot:top>
-						<div v-if="editMode">
-							<TextEditorFixedMenu
-								class="m-3 overflow-x-auto"
-								:buttons="textEditorMenuButtons"
-							/>
-						</div>
-					</template>
-				</TextEditor>
-				<ErrorMessage :message="articleInputErrors.content" />
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-// import TextEditor from "@/components/global/TextEditor.vue"
-import { ErrorMessage, debounce, TextEditor } from "frappe-ui"
-import { TextEditorFixedMenu } from "frappe-ui/src/components/TextEditor"
-import { inject } from "vue"
-
-export default {
-	name: "ArticleTitleAndContent",
-	props: ["article", "editable", "editMode"],
-	components: {
-		ErrorMessage,
-		TextEditor,
-		TextEditorFixedMenu,
-	},
-	setup() {
-		const updateArticleTempValues = inject("updateArticleTempValues")
-		const articleInputErrors = inject("articleInputErrors")
-
-		return {
-			articleInputErrors,
-			updateArticleTempValues,
-		}
-	},
-	watch: {
-		editMode(val) {
-			if (!val) {
-				// TODO: can be done in a better way
-				this.$refs.textEditor.editor.commands.setContent(
-					this.article.content
-				)
-			}
-		},
-	},
-	computed: {
-		textEditorMenuButtons() {
-			return [
-				"Paragraph",
-				[
-					"Heading 2",
-					"Heading 3",
-					"Heading 4",
-					"Heading 5",
-					"Heading 6",
-				],
-				"Separator",
-				"Bold",
-				"Italic",
-				"Separator",
-				"Bullet List",
-				"Numbered List",
-				"Separator",
-				"Align Left",
-				"Align Center",
-				"Align Right",
-				"Separator",
-				"Image",
-				"Video",
-				"Link",
-				"Blockquote",
-				"Code",
-				"Horizontal Rule",
-				[
-					"InsertTable",
-					"AddColumnBefore",
-					"AddColumnAfter",
-					"DeleteColumn",
-					"AddRowBefore",
-					"AddRowAfter",
-					"DeleteRow",
-					"MergeCells",
-					"SplitCell",
-					"ToggleHeaderColumn",
-					"ToggleHeaderRow",
-					"ToggleHeaderCell",
-					"DeleteTable",
-				],
-				"Separator",
-				"Undo",
-				"Redo",
-			]
-		},
-	},
-	methods: {
-		onTitleInput: debounce(function (value) {
-			this.updateArticleTempValues({ field: "title", value })
-		}, 300),
-		onContentInput: debounce(function (value) {
-			this.updateArticleTempValues({ field: "content", value })
-		}, 300),
-	},
-}
-</script>
diff --git a/desk/src/components/desk/kb/CategorySelector.vue b/desk/src/components/desk/kb/CategorySelector.vue
deleted file mode 100644
index 2b09280c2..000000000
--- a/desk/src/components/desk/kb/CategorySelector.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-	<div>
-		<slot
-			name="selector-main"
-			:show="
-				() => {
-					showDialog = true
-				}
-			"
-			:selectedCategoryName="selectedCategoryName"
-		>
-			<Input
-				id="input"
-				label="Category"
-				@click="
-					() => {
-						showDialog = true
-					}
-				"
-				placeholder="Choose Category"
-				role="button"
-				:value="selectedCategoryName"
-			/>
-		</slot>
-		<Dialog
-			:options="{ title: 'Select a Category' }"
-			:show="showDialog"
-			@close="
-				() => {
-					currentCategory = null
-				}
-			"
-			v-model="showDialog"
-		>
-			<template #body-main>
-				<div class="flex flex-col space-y-3 p-5">
-					<div class="rounded border border-gray-200 p-2">
-						<Breadcrumbs
-							docType="Category"
-							:docName="currentCategory?.name"
-							:isRoot="!currentCategory"
-							:overrideInteraction="
-								(val, isRoot) => {
-									if (isRoot) {
-										currentCategory = null
-									} else {
-										currentCategory = val
-									}
-								}
-							"
-						>
-						</Breadcrumbs>
-					</div>
-					<div class="h-[200px] overflow-y-auto">
-						<div
-							class="flex flex-col"
-							v-if="categoriesInCurrentLevel.length > 0"
-						>
-							<div
-								v-for="category in categoriesInCurrentLevel"
-								:key="category.name"
-							>
-								<div
-									@click="
-										() => {
-											currentCategory = category
-										}
-									"
-									class="select-none py-3 flex flex-row items-center w-full rounded-sm px-2 border-gray-200 hover:bg-gray-50 border-b"
-									role="button"
-								>
-									<div class="grow line-clamp-1 text-base">
-										{{ category.category_name }}
-									</div>
-									<FeatherIcon
-										name="chevron-right"
-										class="h-5 w-5 stroke-gray-500"
-									/>
-								</div>
-							</div>
-						</div>
-						<div v-else class="text-base text-gray-700">
-							Its empty here
-						</div>
-					</div>
-				</div>
-			</template>
-			<template #actions>
-				<Button
-					appearance="primary"
-					:disabled="isRoot"
-					@click="
-						() => {
-							showDialog = false
-							$emit('selection', currentCategory)
-							selectedCategoryName = currentCategory.category_name
-							currentCategory = null
-						}
-					"
-				>
-					Select
-				</Button>
-			</template>
-		</Dialog>
-	</div>
-</template>
-
-<script>
-import { ref } from "vue"
-import Breadcrumbs from "@/components/global/kb/Breadcrumbs.vue"
-import { FeatherIcon } from "frappe-ui"
-
-export default {
-	name: "CategorySelector",
-	props: {
-		selectedCategory: {
-			type: String,
-			default: null,
-		},
-	},
-	components: {
-		Breadcrumbs,
-		FeatherIcon,
-	},
-	emits: ["category-selected", "update:show"],
-	setup() {
-		const currentCategory = ref(null)
-		const showDialog = ref(false)
-
-		const selectedCategoryName = ref(null)
-
-		return {
-			currentCategory,
-			showDialog,
-			selectedCategoryName,
-		}
-	},
-	mounted() {
-		this.fetchSubCategoriesInCategory(this.currentCategory?.name)
-
-		// removes edit cursor from input when clicked on
-		const input = document.getElementById("input")
-		if (input) {
-			input.addEventListener("focus", (event) => {
-				input.blur()
-			})
-		}
-	},
-	computed: {
-		isRoot() {
-			return !this.currentCategory
-		},
-		categoriesInCurrentLevel() {
-			return this.$resources.categoriesInCurrentLevel.data || []
-		},
-	},
-	watch: {
-		currentCategory(val) {
-			this.fetchSubCategoriesInCategory(val?.name)
-		},
-	},
-	resources: {
-		categoriesInCurrentLevel() {
-			return {
-				url: "helpdesk.extends.client.get_list",
-			}
-		},
-		selectedCategory() {
-			if (!this.selectedCategory) return
-			return {
-				url: "frappe.client.get",
-				params: {
-					doctype: "HD Article Category",
-					name: this.selectedCategory,
-				},
-				auto: true,
-				onSuccess: (data) => {
-					this.selectedCategoryName = data.category_name
-				},
-			}
-		},
-	},
-	methods: {
-		fetchSubCategoriesInCategory(category) {
-			this.$resources.categoriesInCurrentLevel.fetch({
-				doctype: "HD Article Category",
-				fields: ["name", "category_name", "parent_category"],
-				filters: {
-					parent_category: category || "",
-					status: "Published",
-				},
-				order_by: "idx desc",
-				limit: 999,
-			})
-		},
-	},
-}
-</script>
diff --git a/desk/src/pages/desk/kb/Articles.vue b/desk/src/pages/desk/kb/Articles.vue
deleted file mode 100644
index 10abdbed7..000000000
--- a/desk/src/pages/desk/kb/Articles.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-	<div class="flex flex-col">
-		<ListManager
-			ref="articleList"
-			:options="{
-				doctype: 'HD Article',
-				order_by: 'modified DESC',
-				limit: 20,
-			}"
-		>
-			<template #body="{ manager }">
-				<ListViewer
-					:options="{
-						fields: {
-							title: {
-								label: 'Title',
-								width: '5',
-								priority: 1,
-							},
-							category_name: {
-								label: 'Category',
-								width: '3',
-								priority: 1,
-							},
-							status: {
-								label: 'Status',
-								width: '2',
-								priority: 1,
-							},
-							views: {
-								label: 'Views',
-								width: '1',
-								priority: 3,
-							},
-							modified: {
-								label: 'Modified',
-								width: '1',
-								priority: 2,
-								align: 'right',
-							},
-						},
-					}"
-					class="h-[calc(100vh-6.5rem)] text-base"
-					@add-item="
-						() => {
-							$router.push('/kb/articles/new');
-						}
-					"
-				>
-					<template #top-sub-section-1>
-						<TabButtons
-							v-model="activeTab"
-							:buttons="[
-								{ label: 'Articles', active: true },
-								{ label: 'Webview' },
-							]"
-						/>
-					</template>
-					<template #bulk-actions="{ selectedItems }">
-						<div class="flex flex-row space-x-2">
-							<CategorySelector
-								@selection="
-									(category) => {
-										$resources.moveArticlesToCategory
-											.submit({
-												articles: Object.keys(selectedItems),
-												category: category.name,
-											})
-											.then(() => {
-												manager.unselect();
-											});
-									}
-								"
-							>
-								<template #selector-main="{ show }">
-									<Button @click="show">Move to</Button>
-								</template>
-							</CategorySelector>
-							<Dropdown
-								placement="right"
-								:options="[
-									{
-										label: 'Draft',
-										onClick: () => {
-											$resources.setStatusForArticles
-												.submit({
-													articles: Object.keys(selectedItems),
-													status: 'Draft',
-												})
-												.then(() => {
-													manager.unselect();
-												});
-										},
-									},
-									{
-										label: 'Published',
-										onClick: () => {
-											$resources.setStatusForArticles
-												.submit({
-													articles: Object.keys(selectedItems),
-													status: 'Published',
-												})
-												.then(() => {
-													manager.unselect();
-												});
-										},
-									},
-								]"
-							>
-								<template #default="{ toggleDropdown }">
-									<Button
-										:loading="$resources.setStatusForArticles.loading"
-										icon-right="chevron-down"
-										class="ml-2"
-										@click="toggleDropdown"
-									>
-										Mark as
-									</Button>
-								</template>
-							</Dropdown>
-							<!-- <Button @click="() => {}">Add to FAQ</Button> -->
-							<Button
-								@click="
-									() => {
-										$resources.deleteArticles
-											.submit({
-												articles: Object.keys(selectedItems),
-											})
-											.then(() => {
-												manager.unselect();
-												manager.reload();
-											});
-									}
-								"
-								>Delete</Button
-							>
-						</div>
-					</template>
-					<template #field-title="{ value, row }">
-						<RouterLink
-							:to="{
-								path: `/kb/articles/${row.name}`,
-							}"
-							class="cursor-pointer text-gray-600 hover:text-gray-900"
-							>{{ value }}</RouterLink
-						>
-					</template>
-					<template #field-status="{ value }">
-						<div
-							:class="
-								value === 'Published' ? 'text-green-500' : 'text-gray-500'
-							"
-						>
-							{{ value }}
-						</div>
-					</template>
-					<template #field-views="{ value }">
-						<div>{{ value }}</div>
-					</template>
-					<template #field-modified="{ value }">
-						<div>
-							{{ $dayjs.shortFormating($dayjs(value).fromNow(), false) }}
-						</div>
-					</template>
-				</ListViewer>
-			</template>
-		</ListManager>
-	</div>
-</template>
-
-<script>
-import ListManager from "@/components/global/ListManager.vue";
-import ListViewer from "@/components/global/ListViewer.vue";
-import CategorySelector from "@/components/desk/kb/CategorySelector.vue";
-import { Dropdown } from "frappe-ui";
-import TabButtons from "@/components/global/TabButtons.vue";
-
-export default {
-	name: "Articles",
-	components: {
-		ListManager,
-		ListViewer,
-		CategorySelector,
-		Dropdown,
-		TabButtons,
-	},
-	props: {
-		categoryId: {
-			type: String,
-			default: "",
-		},
-	},
-	data() {
-		return {
-			activeTab: "Articles",
-		};
-	},
-	resources: {
-		moveArticlesToCategory() {
-			return {
-				url: "helpdesk.api.kb.move_articles_to_category",
-			}
-		},
-		setStatusForArticles() {
-			return {
-				url: "helpdesk.api.kb.set_status_for_articles",
-			}
-		},
-		deleteArticles() {
-			return {
-				url: "helpdesk.api.kb.delete_articles",
-			}
-		},
-		knowledgeBase() {
-			if (this.activeTab == "Webview") {
-				this.$router.push({ path: "/kb" })
-			}
-		},
-	},
-};
-</script>
diff --git a/desk/src/pages/desk/kb/KnowledgeBase.vue b/desk/src/pages/desk/kb/KnowledgeBase.vue
deleted file mode 100644
index c3df8a5e0..000000000
--- a/desk/src/pages/desk/kb/KnowledgeBase.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-	<div class="mx-auto w-full h-screen p-4">
-		<router-view class="grow" />
-	</div>
-</template>
-
-<script>
-export default {
-	name: "KnowledgeBase",
-}
-</script>
diff --git a/desk/src/pages/knowledge-base/KnowledgeBaseArticle.vue b/desk/src/pages/knowledge-base/KnowledgeBaseArticle.vue
index e527a6e7b..18b19324d 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBaseArticle.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBaseArticle.vue
@@ -182,8 +182,6 @@ const options__ = computed(() => ({
   categoryName:
     article.data?.category.category_name || category?.doc?.category_name,
   creation: article.data?.creation,
-  dislikes: article.data?.not_helpful,
-  likes: article.data?.helpful,
   modified: article.data?.modified,
   status: article.data?.status,
   subCategoryId: subCategoryId.value,
diff --git a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
index 02c7b0f49..1bca1eae5 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
@@ -19,17 +19,6 @@
         {{ status }}
       </Badge>
     </div>
-    <div class="flex items-center gap-2 text-gray-600">
-      <IconThumbsUp class="h-4 w-4" />
-      <div class="text-base">
-        {{ likes }}
-      </div>
-      <div class="text-base text-gray-300">|</div>
-      <IconThumbsDown class="h-4 w-4" />
-      <div class="text-base">
-        {{ dislikes }}
-      </div>
-    </div>
   </div>
   <div class="border-b pb-3">
     <div class="text-3xl font-semibold text-gray-900">
@@ -39,18 +28,9 @@
 </template>
 
 <script setup lang="ts">
-import { useRouter } from "vue-router";
 import { Avatar } from "frappe-ui";
 import { dayjs } from "@/dayjs";
-import {
-  AGENT_PORTAL_KNOWLEDGE_BASE_CATEGORY,
-  AGENT_PORTAL_KNOWLEDGE_BASE_SUB_CATEGORY,
-} from "@/router";
-import IconChevronRight from "~icons/lucide/chevron-right";
 import IconDot from "~icons/lucide/dot";
-import IconThumbsDown from "~icons/lucide/thumbs-down";
-import IconThumbsUp from "~icons/lucide/thumbs-up";
-import { toRefs } from "vue";
 
 const props = defineProps({
   categoryName: {
@@ -93,37 +73,5 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  likes: {
-    type: Number,
-    required: false,
-    default: 0,
-  },
-  dislikes: {
-    type: Number,
-    required: false,
-    default: 0,
-  },
 });
-
-const router = useRouter();
-const { categoryId, subCategoryId } = toRefs(props);
-
-function toCategory() {
-  router.push({
-    name: AGENT_PORTAL_KNOWLEDGE_BASE_CATEGORY,
-    params: {
-      categoryId: categoryId.value,
-    },
-  });
-}
-
-function toSubCategory() {
-  router.push({
-    name: AGENT_PORTAL_KNOWLEDGE_BASE_SUB_CATEGORY,
-    params: {
-      categoryId: categoryId.value,
-      subCategoryId: subCategoryId.value,
-    },
-  });
-}
 </script>
diff --git a/desk/src/pages/knowledge-base/KnowledgeBasePublicSearch.vue b/desk/src/pages/knowledge-base/KnowledgeBasePublicSearch.vue
index dbedd9c63..8e56fcee9 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBasePublicSearch.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBasePublicSearch.vue
@@ -87,7 +87,6 @@ const articles = createListResource({
   filters: {
     status: "Published",
   },
-  orderBy: "views desc",
   pageLength: 99999,
   debounce: 500,
   auto: false,
diff --git a/desk/src/pages/knowledge-base/KnowledgeBaseSubcategory.vue b/desk/src/pages/knowledge-base/KnowledgeBaseSubcategory.vue
index a4f1eed18..dce4cca52 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBaseSubcategory.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBaseSubcategory.vue
@@ -155,11 +155,6 @@ const columns = [
     key: "title",
     width: "w-96",
   },
-  {
-    label: "Views",
-    key: "views",
-    width: "w-12",
-  },
   {
     label: "Status",
     key: "status",
diff --git a/helpdesk/helpdesk/doctype/hd_article/hd_article.js b/helpdesk/helpdesk/doctype/hd_article/hd_article.js
index ee85744da..4af52d2b3 100644
--- a/helpdesk/helpdesk/doctype/hd_article/hd_article.js
+++ b/helpdesk/helpdesk/doctype/hd_article/hd_article.js
@@ -1,38 +1,8 @@
-// Copyright (c) 2021, Frappe Technologies and contributors
+// Copyright (c) 2023, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("HD Article", {
-	refresh: function (frm) {
-		show_content_wrt_type(frm)
+// frappe.ui.form.on("HD Article", {
+// 	refresh(frm) {
 
-		frm.dashboard.clear_headline()
-		frm.dashboard.set_headline_alert(`
-			<div class="row">
-				<div class="col-md-4 col-xs-12">
-					<span class="indicator whitespace-nowrap red">
-						<span>Views: ${frm.doc.views || 0}</span>
-					</span>
-				</div>
-				<div class="col-md-4 col-xs-12">
-					<span class="indicator whitespace-nowrap green">
-						<span>Helpful: ${frm.doc.helpful || 0}</span>
-					</span>
-				</div>
-				<div class="col-md-4 col-xs-12">
-					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful: ${frm.doc.not_helpful || 0}</span>
-					</span>
-				</div>
-			</div>
-		`)
-	},
-
-	content_type: function (frm) {
-		show_content_wrt_type(frm)
-	},
-})
-
-function show_content_wrt_type(frm) {
-	frm.toggle_display("content_md", frm.doc.content_type === "Markdown")
-	frm.toggle_display("content", frm.doc.content_type === "Rich Text")
-}
+// 	},
+// });
diff --git a/helpdesk/helpdesk/doctype/hd_article/hd_article.json b/helpdesk/helpdesk/doctype/hd_article/hd_article.json
index c2cf8ad13..d9b9907de 100644
--- a/helpdesk/helpdesk/doctype/hd_article/hd_article.json
+++ b/helpdesk/helpdesk/doctype/hd_article/hd_article.json
@@ -7,18 +7,15 @@
  "engine": "InnoDB",
  "field_order": [
   "title",
-  "title_slug",
   "category",
-  "idx",
   "status",
-  "column_break_7",
   "published_on",
+  "title_slug",
+  "column_break_7",
   "author",
+  "idx",
   "content_section",
-  "content",
-  "views",
-  "helpful",
-  "not_helpful"
+  "content"
  ],
  "fields": [
   {
@@ -39,27 +36,6 @@
    "label": "Category",
    "options": "HD Article Category"
   },
-  {
-   "default": "0",
-   "fieldname": "views",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "Views"
-  },
-  {
-   "default": "0",
-   "fieldname": "helpful",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "Helpful"
-  },
-  {
-   "default": "0",
-   "fieldname": "not_helpful",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "Not Helpful"
-  },
   {
    "allow_in_quick_entry": 1,
    "fieldname": "content_section",
@@ -69,7 +45,7 @@
   {
    "allow_in_quick_entry": 1,
    "fieldname": "content",
-   "fieldtype": "Text",
+   "fieldtype": "Text Editor",
    "label": "Content"
   },
   {
@@ -81,10 +57,11 @@
    "read_only": 1
   },
   {
-   "depends_on": "eval:doc.published",
+   "depends_on": "eval:doc.status === \"Published\"",
    "fieldname": "published_on",
    "fieldtype": "Datetime",
-   "label": "Published On"
+   "label": "Published On",
+   "read_only": 1
   },
   {
    "fieldname": "column_break_7",
@@ -92,8 +69,9 @@
   },
   {
    "default": "-1",
+   "description": "Position of article in ascending order",
    "fieldname": "idx",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Index"
   },
   {
@@ -111,7 +89,7 @@
   }
  ],
  "links": [],
- "modified": "2023-08-13 14:43:24.002737",
+ "modified": "2024-05-16 01:43:17.042347",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Article",
diff --git a/helpdesk/helpdesk/doctype/hd_article/hd_article.py b/helpdesk/helpdesk/doctype/hd_article/hd_article.py
index 6836077c2..94af66f7e 100644
--- a/helpdesk/helpdesk/doctype/hd_article/hd_article.py
+++ b/helpdesk/helpdesk/doctype/hd_article/hd_article.py
@@ -21,7 +21,6 @@ def get_list_filters(query):
 			.select(
 				QBArticle.title,
 				QBArticle.status,
-				QBArticle.views,
 				QBArticle.author,
 				QBArticle.modified,
 			)
@@ -48,7 +47,7 @@ def before_save(self):
 		if self.status == "Published" and self.idx == -1:
 			self.idx = cint(
 				frappe.db.count(
-					"HD Article", {"category": self.category}, {"status": "Published"}
+					"HD Article", {"category": self.category, "status": "Published"},
 				)
 			)
 
@@ -75,23 +74,4 @@ def get_breadcrumbs(self):
 			breadcrumbs.append(
 				{"name": current_category.name, "label": current_category.category_name}
 			)
-		return breadcrumbs[::-1]
-
-
-@frappe.whitelist(allow_guest=True)
-def add_feedback(hd_article, helpful):
-	# TODO: use a base 5 or 10 rating system instead of a boolean
-	field = "helpful" if helpful else "not_helpful"
-
-	value = cint(frappe.db.get_value("HD Article", hd_article, field))
-	frappe.db.set_value(
-		"HD Article", hd_article, field, value + 1, update_modified=False
-	)
-
-
-@frappe.whitelist(allow_guest=True)
-def increment_view(hd_article):
-	value = cint(frappe.db.get_value("HD Article", hd_article, "views"))
-	frappe.db.set_value(
-		"HD Article", hd_article, "views", value + 1, update_modified=False
-	)
+		return breadcrumbs[::-1]
\ No newline at end of file