From 05ebe4b78747786cb483cff246964d5171f752ec Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Aug 2024 20:09:56 +0530
Subject: [PATCH] fix: lesson structure issue

---
 frontend/src/components/CourseOutline.vue        |  1 +
 frontend/src/components/Discussions.vue          |  4 ++--
 .../src/components/Modals/DiscussionModal.vue    |  4 ++--
 frontend/src/utils/index.js                      | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/CourseOutline.vue b/frontend/src/components/CourseOutline.vue
index e5d3a98b..59da7574 100644
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -41,6 +41,7 @@
 				<DisclosurePanel>
 					<Draggable
 						:list="chapter.lessons"
+						:disabled="!allowEdit"
 						item-key="name"
 						group="items"
 						@end="updateOutline"
diff --git a/frontend/src/components/Discussions.vue b/frontend/src/components/Discussions.vue
index f88e86e2..32a68fba 100644
--- a/frontend/src/components/Discussions.vue
+++ b/frontend/src/components/Discussions.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
-			{{ __('New {0}').format(title) }}
+			{{ __('New {0}').format(singularize(title)) }}
 		</Button>
 		<div class="text-xl font-semibold">
 			{{ __(title) }}
@@ -65,7 +65,7 @@
 <script setup>
 import { createResource, Button } from 'frappe-ui'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { timeAgo } from '../utils'
+import { singularize, timeAgo } from '../utils'
 import { ref, onMounted, inject } from 'vue'
 import DiscussionReplies from '@/components/DiscussionReplies.vue'
 import DiscussionModal from '@/components/Modals/DiscussionModal.vue'
diff --git a/frontend/src/components/Modals/DiscussionModal.vue b/frontend/src/components/Modals/DiscussionModal.vue
index d2e35f4e..0d0bd3f2 100644
--- a/frontend/src/components/Modals/DiscussionModal.vue
+++ b/frontend/src/components/Modals/DiscussionModal.vue
@@ -1,7 +1,7 @@
 <template>
 	<Dialog
 		:options="{
-			title: props.title,
+			title: singularize(props.title),
 			size: '2xl',
 			actions: [
 				{
@@ -36,7 +36,7 @@
 <script setup>
 import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
 import { reactive, defineModel, computed } from 'vue'
-import { showToast } from '@/utils'
+import { showToast, singularize } from '@/utils'
 
 const topics = defineModel('reloadTopics')
 
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 2123d981..d44e3974 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -483,3 +483,19 @@ export function getLineStartPosition(string, position) {
 
 	return position
 }
+
+export function singularize(word) {
+    const endings = {
+        ves: 'fe',
+        ies: 'y',
+        i: 'us',
+        zes: 'ze',
+        ses: 's',
+        es: 'e',
+        s: ''
+    };
+    return word.replace(
+        new RegExp(`(${Object.keys(endings).join('|')})$`), 
+        r => endings[r]
+    );
+}
\ No newline at end of file