Merge pull request #2189 from frappe/develop

chore(release): dev to main

Author: RitvikSardana

Diff for: desk/index.html

@@ -207,8 +207,6 @@
     <script type="module" src="/src/main.js"></script>
     <script>
       window.csrf_token = "{{ csrf_token }}";
-      window.frappe_version = "{{ frappe_version }}";
-      window.helpdesk_version = "{{ helpdesk_version }}";
       window.site_name = "{{ site_name }}";
       window.favicon = "{{ favicon }}";
 

Diff for: desk/package.json

@@ -25,7 +25,7 @@
     "autoprefixer": "^10.4.13",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.1",
-    "frappe-ui": "^0.1.53",
+    "frappe-ui": "0.1.105",
     "lodash": "^4.17.21",
     "lucide-static": "^0.276.0",
     "mime": "^3.0.0",
@@ -43,6 +43,7 @@
     "vue-echarts": "^6.5.4",
     "vue-router": "^4.2.2",
     "vuedraggable": "^4.1.0",
+    "gemoji": "^8.1.0",
     "zod": "^3.21.4"
   },
   "resolutions": {

Diff for: desk/src/components/ColumnSettings.vue

@@ -55,7 +55,10 @@
                   @click="openFileSelector()"
                 >
                   <template #icon>
-                    <AttachmentIcon class="h-4" />
+                    <AttachmentIcon
+                      class="h-4"
+                      style="color: #000000; stroke-width: 1.5 !important"
+                    />
                   </template>
                 </Button>
               </template>
@@ -91,7 +94,7 @@
   </TextEditor>
 </template>
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, ref, onMounted } from "vue";
 import {
   TextEditorFixedMenu,
   TextEditor,
@@ -104,10 +107,12 @@ import { AttachmentItem } from "@/components/";
 import { useAgentStore } from "@/stores/agent";
 import { useStorage } from "@vueuse/core";
 import { PreserveVideoControls } from "@/tiptap-extensions";
-import { textEditorMenuButtons } from "@/utils";
+import { isContentEmpty, textEditorMenuButtons } from "@/utils";
 
 const { agents: agentsList } = useAgentStore();
-
+onMounted(() => {
+  agentsList.fetch();
+});
 const props = defineProps({
   placeholder: {
     type: String,
@@ -123,12 +128,12 @@ const props = defineProps({
   },
 });
 
-const doc = defineModel();
-const attachments = ref([]);
 const emit = defineEmits(["submit", "discard"]);
-const newComment = useStorage("commentBoxContent", "");
+const doc = defineModel();
+const attachments = useStorage("commentBoxAttachments" + doc.value.name, []);
+const newComment = useStorage("commentBoxContent" + doc.value.name, "");
 const commentEmpty = computed(() => {
-  return !newComment.value || newComment.value === "<p></p>";
+  return isContentEmpty(newComment.value);
 });
 const loading = ref(false);
 
@@ -146,6 +151,9 @@ function removeAttachment(attachment) {
 }
 
 async function submitComment() {
+  if (isContentEmpty(newComment.value)) {
+    return;
+  }
   const comment = createResource({
     url: "run_doc_method",
     makeParams: () => ({
@@ -160,6 +168,8 @@ async function submitComment() {
     onSuccess: () => {
       emit("submit");
       loading.value = false;
+      attachments.value = null;
+      newComment.value = null;
     },
     onError: () => {
       loading.value = false;
@@ -168,4 +178,7 @@ async function submitComment() {
 
   comment.submit();
 }
+defineExpose({
+  submitComment,
+});
 </script>

Diff for: desk/src/components/CommentTextEditor.vue

@@ -27,8 +27,13 @@
         </Button>
       </div>
     </div>
-    <div v-show="showCommentBox">
+    <div
+      v-show="showCommentBox"
+      @keydown.ctrl.enter.capture.stop="submitComment"
+      @keydown.meta.enter.capture.stop="submitComment"
+    >
       <CommentTextEditor
+        ref="commentTextEditorRef"
         v-model="doc"
         v-model:attachments="attachments"
         :editable="showCommentBox"
@@ -83,13 +88,16 @@ import { ref } from "vue";
 import { EmailEditor, CommentTextEditor } from "@/components";
 import { EmailIcon, CommentIcon } from "@/components/icons/";
 
+const emit = defineEmits(["update"]);
 const content = defineModel("content");
+const doc = defineModel();
+
 const showEmailBox = ref(false);
 const showCommentBox = ref(false);
-const doc = defineModel();
 const attachments = ref([]);
-const emit = defineEmits(["update"]);
+
 const emailEditorRef = ref(null);
+const commentTextEditorRef = ref(null);
 
 function toggleEmailBox() {
   if (showCommentBox.value) {
@@ -105,6 +113,16 @@ function toggleCommentBox() {
   showCommentBox.value = !showCommentBox.value;
 }
 
+function submitEmail() {
+  emailEditorRef.value.submitMail();
+  emit("update");
+}
+
+function submitComment() {
+  commentTextEditorRef.value.submitComment();
+  emit("update");
+}
+
 function replyToEmail(data: object) {
   showEmailBox.value = true;
   emailEditorRef.value.addToReply(

Diff for: desk/src/components/CommunicationArea.vue

@@ -34,7 +34,7 @@
           @click="
             emit('reply', {
               content: content,
-              to: to ?? sender.name,
+              to: to && sender.name,
             })
           "
         >

Diff for: desk/src/components/EmailArea.vue

@@ -220,6 +220,7 @@ const htmlContent = `
   <body>
 	  <div ref="emailContentRef" class="email-content prose-f">${_content.value}</div>
   </body>
+  <base target="_blank" />
   </html>
   `;