Merge pull request #166 from frappe/develop

chore: Merge develop to main

frontend/src/components/Layouts/AppSidebar.vue

@@ -77,12 +77,6 @@
       </div>
     </div>
     <div class="m-2 flex flex-col gap-1">
-      <SidebarLink
-        label="Docs"
-        :isCollapsed="isSidebarCollapsed"
-        icon="book-open"
-        @click="() => openDocs()"
-      />
       <SidebarLink
         :label="isSidebarCollapsed ? 'Expand' : 'Collapse'"
         :isCollapsed="isSidebarCollapsed"
@@ -231,8 +225,4 @@ function getIcon(routeName) {
       return PinIcon
   }
 }
-
-function openDocs() {
-  window.open('https://docs.frappe.io/crm', '_blank')
-}
 </script>

frontend/src/components/Modals/DealModal.vue

@@ -207,7 +207,7 @@ const sections = computed(() => {
         label: 'Status',
         name: 'status',
         type: 'select',
-        options: statusOptions('deal'),
+        options: dealStatuses.value,
         prefix: getDealStatus(deal.status).iconColorClass,
       },
       {
@@ -222,6 +222,14 @@ const sections = computed(() => {
   return fields
 })
 
+const dealStatuses = computed(() => {
+  let statuses = statusOptions('deal')
+  if (!deal.status) {
+    deal.status = statuses[0].value
+  }
+  return statuses
+})
+
 function createDeal() {
   createResource({
     url: 'crm.fcrm.doctype.crm_deal.crm_deal.create_deal',

frontend/src/components/Modals/LeadModal.vue

@@ -12,7 +12,12 @@
     </template>
     <template #actions>
       <div class="flex flex-row-reverse gap-2">
-        <Button variant="solid" :label="__('Save')" @click="createNewLead" />
+        <Button
+          variant="solid"
+          :label="__('Create')"
+          :loading="isLeadCreating"
+          @click="createNewLead"
+        />
       </div>
     </template>
   </Dialog>
@@ -158,7 +163,7 @@ const sections = computed(() => {
           label: 'Status',
           name: 'status',
           type: 'select',
-          options: statusOptions('lead'),
+          options: leadStatuses.value,
           prefix: getLeadStatus(lead.status).iconColorClass,
         },
         {
@@ -185,6 +190,14 @@ const createLead = createResource({
   },
 })
 
+const leadStatuses = computed(() => {
+  let statuses = statusOptions('lead')
+  if (!lead.status) {
+    lead.status = statuses[0].value
+  }
+  return statuses
+})
+
 function createNewLead() {
   createLead.submit(lead, {
     validate() {

frontend/src/components/UserDropdown.vue

@@ -67,14 +67,36 @@ const user = computed(() => getUser() || {})
 
 let dropdownOptions = ref([
   {
-    icon: 'corner-up-left',
+    group: 'Manage',
-    label: computed(() => __('Switch to Desk')),
+    hideLabel: true,
-    onClick: () => window.location.replace('/app'),
+    items: [
+      {
+        icon: 'corner-up-left',
+        label: computed(() => __('Switch to Desk')),
+        onClick: () => window.location.replace('/app'),
+      },
+      {
+        icon: 'life-buoy',
+        label: computed(() => __('Support')),
+        onClick: () => window.open('https://t.me/frappecrm', '_blank'),
+      },
+      {
+        icon: 'book-open',
+        label: computed(() => __('Docs')),
+        onClick: () => window.open('https://docs.frappe.io/crm', '_blank'),
+      },
+    ],
   },
   {
-    icon: 'log-out',
+    group: 'Logout',
-    label: computed(() => __('Log out')),
+    hideLabel: true,
-    onClick: () => logout.submit(),
+    items: [
+      {
+        icon: 'log-out',
+        label: computed(() => __('Log out')),
+        onClick: () => logout.submit(),
+      },
+    ],
   },
 ])
 </script>

frontend/src/stores/statuses.js

@@ -97,6 +97,7 @@ export const statusesStore = defineStore('crm-statuses', () => {
     for (const status in statusesByName) {
       options.push({
         label: statusesByName[status].name,
+        value: statusesByName[status].name,
         icon: () =>
           h(IndicatorIcon, {
             class: statusesByName[status].iconColorClass,