Merge pull request #2226 from frappe/develop

chore(release): dev to main

Author: RitvikSardana

.github/helpers/install.sh

@@ -50,5 +50,5 @@ bench setup requirements --dev
 wait $wkpid
 
 bench start &> bench_run_logs.txt &
-CI=Yes bench build --app frappe &
+CI=Yes bench build &
 bench --site test_site reinstall --yes

.github/workflows/server-tests.yml

@@ -114,33 +114,9 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app helpdesk --coverage'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app helpdesk'
         env:
           TYPE: server
           CI_BUILD_ID: ${{ github.run_id }}
           ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
 
-      - name: Upload coverage data
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage
-          path: /home/runner/frappe-bench/sites/coverage.xml
-
-  coverage:
-    name: Coverage
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v2
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v2
-        with:
-          name: MariaDB
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          verbose: true

.gitignore

@@ -32,6 +32,7 @@ share/python-wheels/
 
 helpdesk/docs/current
 helpdesk/public/desk
+helpdesk/public/frontend
 helpdesk/public/node_modules
 helpdesk/www/helpdesk/index.html
 desk/components.d.ts

desk/index.html

@@ -206,8 +206,6 @@
     <div id="popovers"></div>
     <script type="module" src="/src/main.js"></script>
     <script>
-      window.csrf_token = "{{ csrf_token }}";
-      window.site_name = "{{ site_name }}";
       window.favicon = "{{ favicon }}";
 
       document.querySelectorAll("link[rel='icon']").forEach((link) => {

desk/package.json

@@ -4,10 +4,8 @@
   "version": "0.0.0",
   "scripts": {
     "dev": "vite",
-    "preview": "vite preview",
-    "build": "vite build --base=/assets/helpdesk/desk/ && yarn copy-html-entry",
-    "serve": "vite preview",
-    "copy-html-entry": "cp ../helpdesk/public/desk/index.html ../helpdesk/www/helpdesk/index.html"
+    "build": "vite build",
+    "serve": "vite preview"
   },
   "dependencies": {
     "@headlessui/vue": "^1.7.22",
@@ -25,7 +23,7 @@
     "autoprefixer": "^10.4.13",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.1",
-    "frappe-ui": "0.1.105",
+    "frappe-ui": "0.1.119",
     "lodash": "^4.17.21",
     "lucide-static": "^0.276.0",
     "mime": "^3.0.0",
@@ -50,6 +48,8 @@
     "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
-    "vite-plugin-pwa": "^0.20.5"
+    "vite-plugin-pwa": "^0.20.5",
+    "typescript": "^5.0.2",
+    "prettier": "2.8.4"
   }
 }

desk/src/components/CannedResponseSelectorModal.vue

@@ -1,5 +1,11 @@
 <template>
-  <Dialog v-model="show" :options="{ title: 'Canned Responses', size: '4xl' }">
+  <Dialog
+    v-model="show"
+    :options="{
+      title: 'Canned Responses',
+      size: '4xl',
+    }"
+  >
     <template #body-content>
       <TextInput
         ref="searchInput"
@@ -40,6 +46,17 @@
           </div>
         </div>
       </div>
+      <div class="flex justify-end mt-4">
+        <Button
+          label="New Canned Response"
+          @click="
+            () => {
+              $router.push('/canned-responses#new');
+              templates.data = null;
+            }
+          "
+        />
+      </div>
     </template>
   </Dialog>
 </template>

desk/src/components/CommentBox.vue

@@ -50,7 +50,10 @@
     <div class="rounded bg-gray-50 px-4 py-3">
       <TextEditor
         ref="editorRef"
-        :editor-class="'prose-f shrink  text-p-sm transition-all duration-300 ease-in-out block w-full content'"
+        :editor-class="[
+          'prose-f shrink  text-p-sm transition-all duration-300 ease-in-out block w-full content',
+          getFontFamily(_content),
+        ]"
         :content="_content"
         :editable="editable"
         :bubble-menu="textEditorMenuButtons"
@@ -106,6 +109,7 @@ import {
   createToast,
   textEditorMenuButtons,
   isContentEmpty,
+  getFontFamily,
 } from "@/utils";
 import { AttachmentItem } from "@/components";
 import { useAuthStore } from "@/stores/auth";

desk/src/components/CommentTextEditor.vue

@@ -6,6 +6,7 @@
       'prose-sm max-w-none',
       editable &&
         'min-h-[7rem] mx-10 max-h-[50vh] overflow-y-auto border-t py-3',
+      getFontFamily(newComment),
     ]"
     :content="newComment"
     :starterkit-options="{ heading: { levels: [2, 3, 4, 5, 6] } }"
@@ -107,7 +108,7 @@ import { AttachmentItem } from "@/components/";
 import { useAgentStore } from "@/stores/agent";
 import { useStorage } from "@vueuse/core";
 import { PreserveVideoControls } from "@/tiptap-extensions";
-import { isContentEmpty, textEditorMenuButtons } from "@/utils";
+import { isContentEmpty, textEditorMenuButtons, getFontFamily } from "@/utils";
 
 const { agents: agentsList } = useAgentStore();
 onMounted(() => {

desk/src/components/EmailArea.vue

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

desk/src/components/EmailContent.vue

@@ -8,6 +8,7 @@
 
 <script setup>
 import { ref, watch } from "vue";
+import { getFontFamily } from "@/utils";
 
 const props = defineProps({
   content: {
@@ -230,7 +231,7 @@ watch(iframeRef, (iframe) => {
       const emailContent =
         iframe.contentWindow.document.querySelector(".email-content");
       let parent = emailContent.closest("html");
-
+      emailContent.classList.add(getFontFamily(_content.value));
       iframe.style.height = parent.offsetHeight + 1 + "px";
 
       let replyCollapsers = emailContent.querySelectorAll(".replyCollapser");