fix: filter search records based on roles

frontend/components.d.ts

@@ -90,6 +90,8 @@ declare module 'vue' {
     LucideArrowDown: typeof import('~icons/lucide/arrow-down')['default']
     LucideArrowUp: typeof import('~icons/lucide/arrow-up')['default']
     LucideCornerDownLeft: typeof import('~icons/lucide/corner-down-left')['default']
+    LucideSearch: typeof import('~icons/lucide/search')['default']
+    LucideX: typeof import('~icons/lucide/x')['default']
     Members: typeof import('./src/components/Settings/Members.vue')['default']
     MobileLayout: typeof import('./src/components/MobileLayout.vue')['default']
     MultiSelect: typeof import('./src/components/Controls/MultiSelect.vue')['default']

frontend/src/components/CommandPalette/CommandPalette.vue

@@ -18,11 +18,17 @@
 
 				<div class="max-h-96 overflow-auto mb-2">
 					<div v-if="query.length" class="mt-5 space-y-5">
-						<CommandPaletteGroup :list="searchResults" />
+						<CommandPaletteGroup
+							:list="searchResults"
+							@navigateTo="navigateTo"
+						/>
 					</div>
 
 					<div v-else class="mt-5 space-y-5">
-						<CommandPaletteGroup :list="jumpToOptions" />
+						<CommandPaletteGroup
+							:list="jumpToOptions"
+							@navigateTo="navigateTo"
+						/>
 					</div>
 				</div>
 
@@ -61,7 +67,8 @@
 </template>
 <script setup lang="ts">
 import { createResource, debounce, Dialog } from 'frappe-ui'
-import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
+import { nextTick, onMounted, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
 import {
 	BookOpen,
 	Briefcase,
@@ -72,7 +79,6 @@ import {
 	Search,
 	Users,
 } from 'lucide-vue-next'
-import { useRouter } from 'vue-router'
 import CommandPaletteGroup from './CommandPaletteGroup.vue'
 
 const show = defineModel<boolean>({ required: true, default: false })
@@ -146,6 +152,13 @@ watch(
 	{ immediate: true }
 )
 
+watch(show, () => {
+	if (!show.value) {
+		query.value = ''
+		searchResults.value = []
+	}
+})
+
 onMounted(() => {
 	addKeyboardShortcuts()
 })

frontend/src/components/CommandPalette/CommandPaletteGroup.vue

@@ -8,6 +8,7 @@
 				v-for="item in result.items"
 				class="flex items-center justify-between p-2 rounded hover:bg-surface-gray-2 cursor-pointer"
 				:class="{ 'bg-surface-gray-2': item.isActive }"
+				@click="emit('navigateTo', item.route)"
 			>
 				<div class="flex items-center space-x-3">
 					<component
@@ -18,7 +19,7 @@
 					<div v-html="item.title"></div>
 				</div>
 				<div v-if="item.modified" class="text-ink-gray-5">
-					{{ item.modified }} {{ dayjs.unix(item.modified).fromNow(true) }}
+					{{ dayjs.unix(item.modified).fromNow(true) }}
 				</div>
 			</div>
 		</div>
@@ -26,9 +27,9 @@
 </template>
 <script lang="ts" setup>
 import { inject } from 'vue'
-import { dayjsLocal } from 'frappe-ui'
 
 const dayjs = inject<any>('$dayjs')
+const emit = defineEmits(['navigateTo'])
 
 const props = defineProps<{
 	list: Array<{

frontend/src/components/Sidebar/AppSidebar.vue

@@ -192,7 +192,6 @@ import PageModal from '@/components/Modals/PageModal.vue'
 import { capture } from '@/telemetry'
 import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { useRouter } from 'vue-router'
-import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import {
 	ref,
 	onMounted,
@@ -225,10 +224,10 @@ import {
 	minimize,
 	IntermediateStepModal,
 } from 'frappe-ui/frappe'
-import InviteIcon from './Icons/InviteIcon.vue'
+import InviteIcon from '@/components/Icons/InviteIcon.vue'
-import UserDropdown from '@/components/UserDropdown.vue'
+import UserDropdown from '@/components/Sidebar/UserDropdown.vue'
 import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
-import SidebarLink from '@/components/SidebarLink.vue'
+import SidebarLink from '@/components/Sidebar/SidebarLink.vue'
 import CommandPalette from '@/components/CommandPalette/CommandPalette.vue'
 
 const { user } = sessionStore()

frontend/src/components/Sidebar/Apps.vue

@@ -48,7 +48,7 @@ const apps = createResource({
 				name: 'frappe',
 				logo: '/assets/lms/images/desk.png',
 				title: __('Desk'),
-				route: '/app',
+				route: '/desk/lms',
 			},
 		]
 		data.map((app) => {

frontend/vite.config.js

@@ -65,6 +65,6 @@ export default defineConfig(({ mode }) => ({
 			'highlight.js',
 			'plyr',
 		],
-		exclude: mode === 'production' ? [] : ['frappe-ui'],
+		//exclude: mode === 'production' ? [] : ['frappe-ui'],
 	},
 }))

lms/command_palette.py

@@ -1,4 +1,5 @@
 import frappe
+from frappe.utils import nowdate
 
 
 @frappe.whitelist()
@@ -12,14 +13,20 @@ def search_sqlite(query: str):
 	except LearningSearchIndexMissingError:
 		return []
 
+	return prepare_search_results(result)
+
+
+def prepare_search_results(result):
+	roles = frappe.get_roles()
 	groups = {}
-	print(result)
+
 	for r in result["results"]:
 		doctype = r["doctype"]
-
+		if doctype == "LMS Course" and can_access_course(r, roles):
-		if doctype == "LMS Course":
+			r["author_info"] = get_author_info(r.get("author"))
 			groups.setdefault("Courses", []).append(r)
-		elif doctype == "LMS Batch":
+		elif doctype == "LMS Batch" and can_access_batch(r, roles):
+			r["author_info"] = get_author_info(r.get("author"))
 			groups.setdefault("Batches", []).append(r)
 
 	out = []
@@ -27,3 +34,31 @@ def search_sqlite(query: str):
 		out.append({"title": key, "items": groups[key]})
 
 	return out
+
+
+def can_access_course(course, roles):
+	if can_create_course(roles):
+		return True
+	elif course.get("published"):
+		return True
+	return False
+
+
+def can_access_batch(batch, roles):
+	if can_create_batch(roles):
+		return True
+	elif batch.get("published") and batch.get("start_date") >= nowdate():
+		return True
+	return False
+
+
+def can_create_course(roles):
+	return "Course Creator" in roles or "Moderator" in roles
+
+
+def can_create_batch(roles):
+	return "Batch Evaluator" in roles or "Moderator" in roles
+
+
+def get_author_info(owner):
+	return frappe.db.get_value("User", owner, ["full_name", "user_image", "username", "email"], as_dict=True)

lms/sqlite.py

@@ -2,15 +2,14 @@ from contextlib import suppress
 
 import frappe
 from frappe.search.sqlite_search import SQLiteSearch, SQLiteSearchIndexMissingError
-from frappe.utils import update_progress_bar
+from frappe.utils import nowdate
-from redis.exceptions import ResponseError
 
 
 class LearningSearch(SQLiteSearch):
 	INDEX_NAME = "learning.db"
 
 	INDEX_SCHEMA = {
-		"metadata_fields": ["category", "owner", "published"],
+		"metadata_fields": ["category", "owner", "published", "published_on", "start_date"],
 		"tokenizer": "unicode61 remove_diacritics 2 tokenchars '-_'",
 	}
 
@@ -64,31 +63,6 @@ class LearningSearch(SQLiteSearch):
 		],
 	}
 
-	def can_create_course(self, roles):
-		return "Course Creator" in roles or "Moderator" in roles
-
-	def can_create_batch(self, roles):
-		return "Batch Evaluator" in roles or "Moderator" in roles
-
-	def get_records(self, doctype):
-		records = []
-		roles = frappe.get_roles()
-		filters = {}
-
-		if doctype == "LMS Course":
-			if not self.can_create_course(roles):
-				filters = {"published": 1}
-
-		if doctype == "LMS Batch":
-			if not self.can_create_batch(roles):
-				filters = {"published": 1}
-
-		records = frappe.db.get_all(doctype, filters=filters, fields=self.DOCTYPE_FIELDS[doctype])
-		for record in records:
-			record["doctype"] = doctype
-
-		return records
-
 	def build_index(self):
 		try:
 			super().build_index()
@@ -96,11 +70,21 @@ class LearningSearch(SQLiteSearch):
 			frappe.throw(e)
 
 	def get_search_filters(self):
-		roles = frappe.get_roles()
-		if not (self.can_create_course(roles) and self.can_create_batch(roles)):
-			return {"published": 1}
 		return {}
 
+	@SQLiteSearch.scoring_function
+	def get_doctype_boost(self, row, query, query_words):
+		doctype = row["doctype"]
+		if doctype == "LMS Course":
+			if row["published"]:
+				return 1.3
+		elif doctype == "LMS Batch":
+			if row["published"] and row["start_date"] >= nowdate():
+				return 1.3
+			elif row["published"]:
+				return 1.2
+		return 1.0
+
 
 class LearningSearchIndexMissingError(SQLiteSearchIndexMissingError):
 	pass