From 1ca4d0bd4bb8a591aa8731ec25bcd649a26596ee Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 19 Feb 2025 11:38:19 +0530 Subject: [PATCH 01/13] fix: added default view field in fcrm settings --- crm/fcrm/doctype/fcrm_settings/fcrm_settings.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json index f445541d..f2aa7b83 100644 --- a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json +++ b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json @@ -6,6 +6,8 @@ "engine": "InnoDB", "field_order": [ "defaults_tab", + "default_view", + "column_break_jeeh", "restore_defaults", "branding_tab", "brand_name", @@ -56,12 +58,21 @@ "fieldname": "favicon", "fieldtype": "Attach", "label": "Favicon" + }, + { + "fieldname": "default_view", + "fieldtype": "Data", + "label": "Default View" + }, + { + "fieldname": "column_break_jeeh", + "fieldtype": "Column Break" } ], "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-01-19 14:23:05.981355", + "modified": "2025-02-18 17:05:39.440396", "modified_by": "Administrator", "module": "FCRM", "name": "FCRM Settings", From dc61df171768929794c707f6115992ecd4c4b5b5 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 19 Feb 2025 11:40:49 +0530 Subject: [PATCH 02/13] fix: get default view api --- crm/api/views.py | 9 +++++++-- frontend/src/stores/views.js | 14 +++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/crm/api/views.py b/crm/api/views.py index f70246e1..ece602a1 100644 --- a/crm/api/views.py +++ b/crm/api/views.py @@ -8,9 +8,14 @@ def get_views(doctype): query = ( frappe.qb.from_(View) .select("*") - .where(Criterion.any([View.user == '', View.user == frappe.session.user])) + .where(Criterion.any([View.user == "", View.user == frappe.session.user])) ) if doctype: query = query.where(View.dt == doctype) views = query.run(as_dict=True) - return views \ No newline at end of file + return views + + +@frappe.whitelist() +def get_default_view(): + return frappe.db.get_single_value("FCRM Settings", "default_view") or None diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js index 487870ce..3cded530 100644 --- a/frontend/src/stores/views.js +++ b/frontend/src/stores/views.js @@ -6,7 +6,14 @@ export const viewsStore = defineStore('crm-views', (doctype) => { let viewsByName = reactive({}) let pinnedViews = ref([]) let publicViews = ref([]) - let defaultView = ref({}) + let standardViews = ref({}) + + // Default view + const defaultView = createResource({ + url: 'crm.api.views.get_default_view', + cache: 'crm-default-view', + auto: true, + }) // Views const views = createResource({ @@ -28,7 +35,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => { publicViews.value?.push(view) } if (view.is_default && view.dt) { - defaultView.value[view.dt + ' ' + view.type] = view + standardViews.value[view.dt + ' ' + view.type] = view } } return views @@ -38,7 +45,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => { function getView(view, type, doctype = null) { type = type || 'list' if (!view && doctype) { - return defaultView.value[doctype + ' ' + type] || null + return standardViews.value[doctype + ' ' + type] || null } return viewsByName[view] } @@ -60,6 +67,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => { return { views, defaultView, + standardViews, getPinnedViews, getPublicViews, reload, From 7f21d473f4fa13703f980f7b4dcda2ed12c20c3d Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 19 Feb 2025 11:42:06 +0530 Subject: [PATCH 03/13] fix: set as default view --- .../crm_view_settings/crm_view_settings.py | 51 +++++++++++-------- frontend/src/components/ViewControls.vue | 49 ++++++++++++++++-- frontend/src/stores/views.js | 37 ++++++++++++++ 3 files changed, 114 insertions(+), 23 deletions(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index e0cf53d5..13d08686 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -1,6 +1,7 @@ # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt import json + import frappe from frappe.model.document import Document, get_controller from frappe.utils import parse_json @@ -9,15 +10,16 @@ from frappe.utils import parse_json class CRMViewSettings(Document): pass + @frappe.whitelist() def create(view): view = frappe._dict(view) view.filters = parse_json(view.filters) or {} - view.columns = parse_json(view.columns or '[]') - view.rows = parse_json(view.rows or '[]') - view.kanban_columns = parse_json(view.kanban_columns or '[]') - view.kanban_fields = parse_json(view.kanban_fields or '[]') + view.columns = parse_json(view.columns or "[]") + view.rows = parse_json(view.rows or "[]") + view.kanban_columns = parse_json(view.kanban_columns or "[]") + view.kanban_fields = parse_json(view.kanban_fields or "[]") default_rows = sync_default_rows(view.doctype) view.rows = view.rows + default_rows if default_rows else view.rows @@ -31,7 +33,7 @@ def create(view): doc = frappe.new_doc("CRM View Settings") doc.name = view.label doc.label = view.label - doc.type = view.type or 'list' + doc.type = view.type or "list" doc.icon = view.icon doc.dt = view.doctype doc.user = frappe.session.user @@ -49,6 +51,7 @@ def create(view): doc.insert() return doc + @frappe.whitelist() def update(view): view = frappe._dict(view) @@ -65,7 +68,7 @@ def update(view): doc = frappe.get_doc("CRM View Settings", view.name) doc.label = view.label - doc.type = view.type or 'list' + doc.type = view.type or "list" doc.icon = view.icon doc.route_name = view.route_name or "" doc.load_default_columns = view.load_default_columns or False @@ -81,11 +84,13 @@ def update(view): doc.save() return doc + @frappe.whitelist() def delete(name): if frappe.db.exists("CRM View Settings", name): frappe.delete_doc("CRM View Settings", name) + @frappe.whitelist() def public(name, value): if frappe.session.user != "Administrator" and "Sales Manager" not in frappe.get_roles(): @@ -98,15 +103,18 @@ def public(name, value): doc.user = "" if value else frappe.session.user doc.save() + @frappe.whitelist() def pin(name, value): doc = frappe.get_doc("CRM View Settings", name) doc.pinned = value doc.save() + def remove_duplicates(l): return list(dict.fromkeys(l)) + def sync_default_rows(doctype, type="list"): list = get_controller(doctype) rows = [] @@ -116,6 +124,7 @@ def sync_default_rows(doctype, type="list"): return rows + def sync_default_columns(view): list = get_controller(view.doctype) columns = [] @@ -136,15 +145,22 @@ def sync_default_columns(view): return columns +@frappe.whitelist() +def set_as_default(name=None, type=None, doctype=None): + if not name: + name = type + "_" + doctype + frappe.db.set_single_value("FCRM Settings", "default_view", name) + + @frappe.whitelist() def create_or_update_default_view(view): view = frappe._dict(view) filters = parse_json(view.filters) or {} - columns = parse_json(view.columns or '[]') - rows = parse_json(view.rows or '[]') - kanban_columns = parse_json(view.kanban_columns or '[]') - kanban_fields = parse_json(view.kanban_fields or '[]') + columns = parse_json(view.columns or "[]") + rows = parse_json(view.rows or "[]") + kanban_columns = parse_json(view.kanban_columns or "[]") + kanban_fields = parse_json(view.kanban_fields or "[]") default_rows = sync_default_rows(view.doctype, view.type) rows = rows + default_rows if default_rows else rows @@ -157,17 +173,12 @@ def create_or_update_default_view(view): doc = frappe.db.exists( "CRM View Settings", - { - "dt": view.doctype, - "type": view.type or 'list', - "is_default": True, - "user": frappe.session.user - }, + {"dt": view.doctype, "type": view.type or "list", "is_default": True, "user": frappe.session.user}, ) if doc: doc = frappe.get_doc("CRM View Settings", doc) doc.label = view.label - doc.type = view.type or 'list' + doc.type = view.type or "list" doc.route_name = view.route_name or "" doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) @@ -182,10 +193,10 @@ def create_or_update_default_view(view): doc.save() else: doc = frappe.new_doc("CRM View Settings") - label = 'Group By View' if view.type == 'group_by' else 'List View' + label = "Group By View" if view.type == "group_by" else "List View" doc.name = view.label or label doc.label = view.label or label - doc.type = view.type or 'list' + doc.type = view.type or "list" doc.dt = view.doctype doc.user = frappe.session.user doc.route_name = view.route_name or "" @@ -200,4 +211,4 @@ def create_or_update_default_view(view): doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) doc.is_default = True - doc.insert() \ No newline at end of file + doc.insert() diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index 12f021ca..56a84669 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -215,6 +215,7 @@ import QuickFilterField from '@/components/QuickFilterField.vue' import RefreshIcon from '@/components/Icons/RefreshIcon.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import DuplicateIcon from '@/components/Icons/DuplicateIcon.vue' +import CheckIcon from '@/components/Icons/CheckIcon.vue' import PinIcon from '@/components/Icons/PinIcon.vue' import UnpinIcon from '@/components/Icons/UnpinIcon.vue' import ViewModal from '@/components/Modals/ViewModal.vue' @@ -263,7 +264,7 @@ const props = defineProps({ const { brand } = getSettings() const { $dialog } = globalStore() -const { reload: reloadView, getView } = viewsStore() +const { reload: reloadView, getDefaultView, getView } = viewsStore() const { isManager } = usersStore() const list = defineModel() @@ -887,9 +888,20 @@ function updatePageLength(value, loadMore = false) { // View Actions const viewActions = (view) => { - let isDefault = typeof view.name === 'string' + let isStandard = typeof view.name === 'string' let _view = getView(view.name) + if (isStandard) { + _view = getView(null, view.name, props.doctype) + } + + if (!_view) { + _view = { + type: view.name, + dt: props.doctype, + } + } + let actions = [ { group: __('Default Views'), @@ -904,7 +916,15 @@ const viewActions = (view) => { }, ] - if (!isDefault && (!_view.public || isManager())) { + if (!isStandardView(_view, isStandard)) { + actions[0].items.unshift({ + label: __('Set as default'), + icon: () => h(CheckIcon, { class: 'h-4 w-4' }), + onClick: () => setAsDefault(_view), + }) + } + + if (!isStandard && (!_view.public || isManager())) { actions[0].items.push({ label: __('Edit'), icon: () => h(EditIcon, { class: 'h-4 w-4' }), @@ -961,6 +981,18 @@ const viewActions = (view) => { return actions } +function isStandardView(v, isStandard) { + let defaultView = getDefaultView() + + if (!defaultView) return false + + if (isStandard && !v.name) { + return defaultView == v.type + '_' + v.dt + } + + return defaultView == v.name +} + const viewModalObj = ref({}) function createView() { @@ -972,6 +1004,17 @@ function createView() { showViewModal.value = true } +function setAsDefault(v) { + call('crm.fcrm.doctype.crm_view_settings.crm_view_settings.set_as_default', { + name: v.name, + type: v.type, + doctype: v.dt, + }).then(() => { + reloadView() + list.value.reload() + }) +} + function duplicateView(v) { v.label = v.label + __(' (New)') viewModalObj.value = v diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js index 3cded530..011a9e38 100644 --- a/frontend/src/stores/views.js +++ b/frontend/src/stores/views.js @@ -42,6 +42,42 @@ export const viewsStore = defineStore('crm-views', (doctype) => { }, }) + function getDefaultView(routeName = false) { + let view = defaultView.data + if (!view) return null + + if (typeof view === 'string' && !isNaN(view)) { + view = parseInt(view) + } + + if (routeName) { + let viewObj = getView(view) || { + type: view.split('_')[0], + dt: view.split('_')[1], + } + + let routeName = viewObj.dt + + if (routeName.startsWith('CRM ')) { + routeName = routeName.slice(4) + } + + if (!routeName.endsWith('s')) { + routeName += 's' + } + + let viewName = viewObj.is_default ? null : viewObj.name + + return { + name: routeName, + type: viewObj.type, + view: viewName, + } + } + + return view + } + function getView(view, type, doctype = null) { type = type || 'list' if (!view && doctype) { @@ -68,6 +104,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => { views, defaultView, standardViews, + getDefaultView, getPinnedViews, getPublicViews, reload, From d34da301ac139cac6a7045eac9ebf1186db4ad8e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 19 Feb 2025 11:43:05 +0530 Subject: [PATCH 04/13] feat: load default view instead of leads --- frontend/src/router.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/router.js b/frontend/src/router.js index 7ce0f110..4a0dde5f 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -1,11 +1,11 @@ import { createRouter, createWebHistory } from 'vue-router' import { userResource } from '@/stores/user' import { sessionStore } from '@/stores/session' +import { viewsStore } from '@/stores/views' const routes = [ { path: '/', - redirect: { name: 'Leads' }, name: 'Home', }, { @@ -113,7 +113,17 @@ router.beforeEach(async (to, from, next) => { isLoggedIn && (await userResource.promise) if (to.name === 'Home' && isLoggedIn) { - next({ name: 'Leads' }) + const { getDefaultView, defaultView } = viewsStore() + await defaultView.promise + + let { name, type, view } = getDefaultView(true) + name = name || 'Leads' + + if (view) { + next({ name, params: { viewType: type }, query: { view } }) + } else { + next({ name, params: { viewType: type } }) + } } else if (!isLoggedIn) { window.location.href = '/login?redirect-to=/crm' } else if (to.matched.length === 0) { From a171f817389f7feb04fd629fe754ac326071c0f0 Mon Sep 17 00:00:00 2001 From: Muhammed Raihan P A <99407382+pu-raihan@users.noreply.github.com> Date: Wed, 19 Feb 2025 00:49:59 -0800 Subject: [PATCH 05/13] fix: prevent unnecessary notification reloads for all users - Emit WebSocket event only to the intended recipient instead of broadcasting - Improves performance by reducing unnecessary API calls and WebSocket traffic --- crm/fcrm/doctype/crm_notification/crm_notification.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crm/fcrm/doctype/crm_notification/crm_notification.py b/crm/fcrm/doctype/crm_notification/crm_notification.py index 69aa127d..dbc075a1 100644 --- a/crm/fcrm/doctype/crm_notification/crm_notification.py +++ b/crm/fcrm/doctype/crm_notification/crm_notification.py @@ -8,7 +8,8 @@ from frappe.model.document import Document class CRMNotification(Document): def on_update(self): - frappe.publish_realtime("crm_notification") + if self.to_user: + frappe.publish_realtime("crm_notification", user= self.to_user) def notify_user(args): """ @@ -33,4 +34,4 @@ def notify_user(args): if frappe.db.exists("CRM Notification", values): return - frappe.get_doc(values).insert(ignore_permissions=True) \ No newline at end of file + frappe.get_doc(values).insert(ignore_permissions=True) From 0f5c45c265ad5b00dea300699b03454ae17484c1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 19 Feb 2025 15:46:52 +0530 Subject: [PATCH 06/13] fix: redirect to leads if default view is not set --- frontend/src/router.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/router.js b/frontend/src/router.js index 4a0dde5f..e6af1562 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -116,7 +116,14 @@ router.beforeEach(async (to, from, next) => { const { getDefaultView, defaultView } = viewsStore() await defaultView.promise - let { name, type, view } = getDefaultView(true) + let _defaultView = getDefaultView(true) + + if (!_defaultView) { + next({ name: 'Leads' }) + return + } + + let { name, type, view } = _defaultView name = name || 'Leads' if (view) { From 4d3a90cf3c6a0b4149244dcf624bcb354798e115 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 12:51:35 +0530 Subject: [PATCH 07/13] fix: renamed is_default to is_standard --- crm/api/doc.py | 2 +- .../crm_view_settings/crm_view_settings.json | 16 ++++++------ .../crm_view_settings/crm_view_settings.py | 6 ++--- frontend/src/components/ViewControls.vue | 26 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/crm/api/doc.py b/crm/api/doc.py index eba670c7..a8627584 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -276,7 +276,7 @@ def get_data( default_view_filters = { "dt": doctype, "type": view_type or "list", - "is_default": 1, + "is_standard": 1, "user": frappe.session.user, } diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json index dde0b128..f1081b79 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -8,7 +8,7 @@ "label", "icon", "user", - "is_default", + "is_standard", "column_break_zacm", "type", "dt", @@ -112,12 +112,6 @@ "fieldtype": "Check", "label": "Public" }, - { - "default": "0", - "fieldname": "is_default", - "fieldtype": "Check", - "label": "Is Default" - }, { "fieldname": "icon", "fieldtype": "Data", @@ -178,11 +172,17 @@ "fieldname": "title_field", "fieldtype": "Data", "label": "Title Field" + }, + { + "default": "0", + "fieldname": "is_standard", + "fieldtype": "Check", + "label": "Is Standard" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-06-25 19:40:12.067788", + "modified": "2025-02-20 12:41:51.574655", "modified_by": "Administrator", "module": "FCRM", "name": "CRM View Settings", diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index 13d08686..c62a0f52 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -153,7 +153,7 @@ def set_as_default(name=None, type=None, doctype=None): @frappe.whitelist() -def create_or_update_default_view(view): +def create_or_update_standard_view(view): view = frappe._dict(view) filters = parse_json(view.filters) or {} @@ -173,7 +173,7 @@ def create_or_update_default_view(view): doc = frappe.db.exists( "CRM View Settings", - {"dt": view.doctype, "type": view.type or "list", "is_default": True, "user": frappe.session.user}, + {"dt": view.doctype, "type": view.type or "list", "is_standard": True, "user": frappe.session.user}, ) if doc: doc = frappe.get_doc("CRM View Settings", doc) @@ -210,5 +210,5 @@ def create_or_update_default_view(view): doc.kanban_fields = json.dumps(kanban_fields) doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) - doc.is_default = True + doc.is_standard = True doc.insert() diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index 56a84669..a2fd14db 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -310,13 +310,13 @@ const currentView = computed(() => { label: _view?.label || props.options?.defaultViewName || getViewType().label, icon: _view?.icon || getViewType().icon, - is_default: !_view || _view.is_default, + is_standard: !_view || _view.is_standard, } }) usePageMeta(() => { let label = currentView.value.label - if (currentView.value.is_default) { + if (currentView.value.is_standard) { let routeName = route.name label = `${routeName} - ${label}` } @@ -558,7 +558,7 @@ const viewsDropdownOptions = computed(() => { }) let publicViews = list.value.data.views.filter((v) => v.public) let savedViews = list.value.data.views.filter( - (v) => !v.pinned && !v.public && !v.is_default, + (v) => !v.pinned && !v.public && !v.is_standard, ) let pinnedViews = list.value.data.views.filter((v) => v.pinned) @@ -662,7 +662,7 @@ function updateFilter(filters) { list.value.reload() if (!route.query.view) { - create_or_update_default_view() + createOrUpdateStandardView() } } @@ -677,7 +677,7 @@ function updateSort(order_by) { list.value.reload() if (!route.query.view) { - create_or_update_default_view() + createOrUpdateStandardView() } } @@ -692,7 +692,7 @@ function updateGroupBy(group_by_field) { list.value.reload() if (!route.query.view) { - create_or_update_default_view() + createOrUpdateStandardView() } } @@ -726,7 +726,7 @@ function updateColumns(obj) { viewUpdated.value = true if (!route.query.view) { - create_or_update_default_view() + createOrUpdateStandardView() } } @@ -768,7 +768,7 @@ async function updateKanbanSettings(data) { list.value.reload() if (!route.query.view) { - create_or_update_default_view() + createOrUpdateStandardView() } else if (!data.column_field) { if (isDirty) { $dialog({ @@ -780,14 +780,14 @@ async function updateKanbanSettings(data) { label: __('Update'), variant: 'solid', onClick: (close) => { - update_custom_view() + updateCustomView() close() }, }, ], }) } else { - update_custom_view() + updateCustomView() } } } @@ -811,11 +811,11 @@ function loadMoreKanban(columnName) { list.value.reload() } -function create_or_update_default_view() { +function createOrUpdateStandardView() { if (route.query.view) return view.value.doctype = props.doctype call( - 'crm.fcrm.doctype.crm_view_settings.crm_view_settings.create_or_update_default_view', + 'crm.fcrm.doctype.crm_view_settings.crm_view_settings.create_or_update_standard_view', { view: view.value, }, @@ -842,7 +842,7 @@ function create_or_update_default_view() { }) } -function update_custom_view() { +function updateCustomView() { viewUpdated.value = false view.value = { doctype: props.doctype, From c0f6dcd7e05092679406886292d2692b3159efc5 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 12:53:03 +0530 Subject: [PATCH 08/13] fix: removed default_view field from fcrm settings --- crm/fcrm/doctype/fcrm_settings/fcrm_settings.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json index f2aa7b83..250c8c29 100644 --- a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json +++ b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json @@ -6,8 +6,6 @@ "engine": "InnoDB", "field_order": [ "defaults_tab", - "default_view", - "column_break_jeeh", "restore_defaults", "branding_tab", "brand_name", @@ -58,21 +56,12 @@ "fieldname": "favicon", "fieldtype": "Attach", "label": "Favicon" - }, - { - "fieldname": "default_view", - "fieldtype": "Data", - "label": "Default View" - }, - { - "fieldname": "column_break_jeeh", - "fieldtype": "Column Break" } ], "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-02-18 17:05:39.440396", + "modified": "2025-02-20 12:38:38.088477", "modified_by": "Administrator", "module": "FCRM", "name": "FCRM Settings", From d057926f7ab73786813b14787692d45dbdcd01d0 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 12:53:40 +0530 Subject: [PATCH 09/13] fix: added is_default field in crm view settings --- .../doctype/crm_view_settings/crm_view_settings.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json index f1081b79..7beefffb 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -9,6 +9,7 @@ "icon", "user", "is_standard", + "is_default", "column_break_zacm", "type", "dt", @@ -178,11 +179,17 @@ "fieldname": "is_standard", "fieldtype": "Check", "label": "Is Standard" + }, + { + "default": "0", + "fieldname": "is_default", + "fieldtype": "Check", + "label": "Is Default" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-02-20 12:41:51.574655", + "modified": "2025-02-20 12:52:27.522624", "modified_by": "Administrator", "module": "FCRM", "name": "CRM View Settings", From c0bcd2a34ffd10c40cc67fbdd356bc55c66150fd Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 13:02:55 +0530 Subject: [PATCH 10/13] fix: renamed is_default to is_standard --- frontend/src/components/ViewControls.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index a2fd14db..5d4f6715 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -480,11 +480,11 @@ async function exportRows() { export_type.value = 'Excel' } -let defaultViews = [] +let standardViews = [] let allowedViews = props.options.allowedViews || ['list'] if (allowedViews.includes('list')) { - defaultViews.push({ + standardViews.push({ name: 'list', label: __(props.options?.defaultViewName) || __('List'), icon: markRaw(ListIcon), @@ -495,7 +495,7 @@ if (allowedViews.includes('list')) { }) } if (allowedViews.includes('kanban')) { - defaultViews.push({ + standardViews.push({ name: 'kanban', label: __(props.options?.defaultViewName) || __('Kanban'), icon: markRaw(KanbanIcon), @@ -506,7 +506,7 @@ if (allowedViews.includes('kanban')) { }) } if (allowedViews.includes('group_by')) { - defaultViews.push({ + standardViews.push({ name: 'group_by', label: __(props.options?.defaultViewName) || __('Group By'), icon: markRaw(GroupByIcon), @@ -531,9 +531,9 @@ function getIcon(icon, type) { const viewsDropdownOptions = computed(() => { let _views = [ { - group: __('Default Views'), + group: __('Standard Views'), hideLabel: true, - items: defaultViews, + items: standardViews, }, ] @@ -904,7 +904,7 @@ const viewActions = (view) => { let actions = [ { - group: __('Default Views'), + group: __('Actions'), hideLabel: true, items: [ { @@ -916,7 +916,7 @@ const viewActions = (view) => { }, ] - if (!isStandardView(_view, isStandard)) { + if (!isDefaultView(_view, isStandard)) { actions[0].items.unshift({ label: __('Set as default'), icon: () => h(CheckIcon, { class: 'h-4 w-4' }), @@ -981,7 +981,7 @@ const viewActions = (view) => { return actions } -function isStandardView(v, isStandard) { +function isDefaultView(v, isStandard) { let defaultView = getDefaultView() if (!defaultView) return false From 1e39385abe97239f2b06b90abb0fd77da46eb821 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 14:10:53 +0530 Subject: [PATCH 11/13] fix: set as default view in view settings per user --- crm/api/views.py | 5 -- .../crm_view_settings/crm_view_settings.py | 28 +++++++++-- frontend/src/components/ViewControls.vue | 9 ++-- frontend/src/router.js | 19 ++++--- frontend/src/stores/views.js | 49 +++---------------- frontend/src/utils/view.js | 6 +-- 6 files changed, 46 insertions(+), 70 deletions(-) diff --git a/crm/api/views.py b/crm/api/views.py index ece602a1..5313753e 100644 --- a/crm/api/views.py +++ b/crm/api/views.py @@ -14,8 +14,3 @@ def get_views(doctype): query = query.where(View.dt == doctype) views = query.run(as_dict=True) return views - - -@frappe.whitelist() -def get_default_view(): - return frappe.db.get_single_value("FCRM Settings", "default_view") or None diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index c62a0f52..694882ab 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -147,9 +147,19 @@ def sync_default_columns(view): @frappe.whitelist() def set_as_default(name=None, type=None, doctype=None): - if not name: - name = type + "_" + doctype - frappe.db.set_single_value("FCRM Settings", "default_view", name) + if name: + frappe.db.set_value("CRM View Settings", name, "is_default", 1) + else: + doc = create_or_update_standard_view({"type": type, "doctype": doctype, "is_default": 1}) + name = doc.name + + # remove default from other views of same user + frappe.db.set_value( + "CRM View Settings", + {"name": ("!=", name), "user": frappe.session.user, "is_default": 1}, + "is_default", + 0, + ) @frappe.whitelist() @@ -190,10 +200,17 @@ def create_or_update_standard_view(view): doc.kanban_fields = json.dumps(kanban_fields) doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) + doc.is_default = view.is_default or False doc.save() else: doc = frappe.new_doc("CRM View Settings") - label = "Group By View" if view.type == "group_by" else "List View" + + label = "List" + if view.type == "group_by": + label = "Group By" + elif view.type == "kanban": + label = "Kanban" + doc.name = view.label or label doc.label = view.label or label doc.type = view.type or "list" @@ -211,4 +228,7 @@ def create_or_update_standard_view(view): doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) doc.is_standard = True + doc.is_default = view.is_default or False doc.insert() + + return doc diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index 5d4f6715..ee38ccc0 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -897,6 +897,7 @@ const viewActions = (view) => { if (!_view) { _view = { + label: view.label, type: view.name, dt: props.doctype, } @@ -984,13 +985,9 @@ const viewActions = (view) => { function isDefaultView(v, isStandard) { let defaultView = getDefaultView() - if (!defaultView) return false + if (!defaultView || (isStandard && !v.name)) return false - if (isStandard && !v.name) { - return defaultView == v.type + '_' + v.dt - } - - return defaultView == v.name + return defaultView.name == v.name } const viewModalObj = ref({}) diff --git a/frontend/src/router.js b/frontend/src/router.js index e6af1562..43ff0e33 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -113,23 +113,22 @@ router.beforeEach(async (to, from, next) => { isLoggedIn && (await userResource.promise) if (to.name === 'Home' && isLoggedIn) { - const { getDefaultView, defaultView } = viewsStore() - await defaultView.promise + const { views, getDefaultView } = viewsStore() + await views.promise - let _defaultView = getDefaultView(true) - - if (!_defaultView) { + let defaultView = getDefaultView() + if (!defaultView) { next({ name: 'Leads' }) return } - let { name, type, view } = _defaultView - name = name || 'Leads' + let { route_name, type, name, is_standard } = defaultView + route_name = route_name || 'Leads' - if (view) { - next({ name, params: { viewType: type }, query: { view } }) + if (name && !is_standard) { + next({ name: route_name, params: { viewType: type }, query: { name } }) } else { - next({ name, params: { viewType: type } }) + next({ name: route_name, params: { viewType: type } }) } } else if (!isLoggedIn) { window.location.href = '/login?redirect-to=/crm' diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js index 011a9e38..097d2706 100644 --- a/frontend/src/stores/views.js +++ b/frontend/src/stores/views.js @@ -7,13 +7,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => { let pinnedViews = ref([]) let publicViews = ref([]) let standardViews = ref({}) - - // Default view - const defaultView = createResource({ - url: 'crm.api.views.get_default_view', - cache: 'crm-default-view', - auto: true, - }) + const defaultView = ref(null) // Views const views = createResource({ @@ -34,48 +28,19 @@ export const viewsStore = defineStore('crm-views', (doctype) => { if (view.public) { publicViews.value?.push(view) } - if (view.is_default && view.dt) { + if (view.is_standard && view.dt) { standardViews.value[view.dt + ' ' + view.type] = view } + if (view.is_default) { + defaultView.value = view + } } return views }, }) - function getDefaultView(routeName = false) { - let view = defaultView.data - if (!view) return null - - if (typeof view === 'string' && !isNaN(view)) { - view = parseInt(view) - } - - if (routeName) { - let viewObj = getView(view) || { - type: view.split('_')[0], - dt: view.split('_')[1], - } - - let routeName = viewObj.dt - - if (routeName.startsWith('CRM ')) { - routeName = routeName.slice(4) - } - - if (!routeName.endsWith('s')) { - routeName += 's' - } - - let viewName = viewObj.is_default ? null : viewObj.name - - return { - name: routeName, - type: viewObj.type, - view: viewName, - } - } - - return view + function getDefaultView() { + return defaultView.value } function getView(view, type, doctype = null) { diff --git a/frontend/src/utils/view.js b/frontend/src/utils/view.js index a6db2fb2..d810eb70 100644 --- a/frontend/src/utils/view.js +++ b/frontend/src/utils/view.js @@ -6,7 +6,7 @@ import { markRaw } from 'vue' const { getView: getViewDetails } = viewsStore() -function defaultView(type) { +function standardView(type) { let types = { list: { label: __('List'), @@ -29,7 +29,7 @@ export function getView(view, type, doctype) { let viewType = type || 'list' let viewDetails = getViewDetails(view, viewType, doctype) if (viewDetails && !viewDetails.icon) { - viewDetails.icon = defaultView(viewType).icon + viewDetails.icon = standardView(viewType).icon } - return viewDetails || defaultView(viewType) + return viewDetails || standardView(viewType) } From ab25f26f1447b4a323242397183ee9e8de7060ba Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 15:21:56 +0530 Subject: [PATCH 12/13] fix: set route name if not set --- .../crm_view_settings/crm_view_settings.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index 694882ab..d340fff7 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -37,7 +37,7 @@ def create(view): doc.icon = view.icon doc.dt = view.doctype doc.user = frappe.session.user - doc.route_name = view.route_name or "" + doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(view.filters) doc.order_by = view.order_by @@ -70,7 +70,7 @@ def update(view): doc.label = view.label doc.type = view.type or "list" doc.icon = view.icon - doc.route_name = view.route_name or "" + doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) doc.order_by = view.order_by @@ -189,7 +189,7 @@ def create_or_update_standard_view(view): doc = frappe.get_doc("CRM View Settings", doc) doc.label = view.label doc.type = view.type or "list" - doc.route_name = view.route_name or "" + doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) doc.order_by = view.order_by @@ -216,7 +216,7 @@ def create_or_update_standard_view(view): doc.type = view.type or "list" doc.dt = view.doctype doc.user = frappe.session.user - doc.route_name = view.route_name or "" + doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) doc.order_by = view.order_by @@ -232,3 +232,14 @@ def create_or_update_standard_view(view): doc.insert() return doc + + +def get_route_name(doctype): + # Example: "CRM Lead" -> "Leads" + if doctype.startswith("CRM "): + doctype = doctype[4:] + + if doctype[-1] != "s": + doctype += "s" + + return doctype From 19c1501eba293f627868defad09f505c32109e6b Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 15:38:41 +0530 Subject: [PATCH 13/13] fix: set default column_field, order_by & group_by_field if not set --- .../doctype/crm_view_settings/crm_view_settings.json | 3 +-- crm/fcrm/doctype/crm_view_settings/crm_view_settings.py | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json index 7beefffb..e8b9d8cc 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -169,7 +169,6 @@ "label": "Kanban Fields" }, { - "default": "name", "fieldname": "title_field", "fieldtype": "Data", "label": "Title Field" @@ -189,7 +188,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-02-20 12:52:27.522624", + "modified": "2025-02-20 15:36:55.059065", "modified_by": "Administrator", "module": "FCRM", "name": "CRM View Settings", diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index d340fff7..2552b901 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -171,6 +171,7 @@ def create_or_update_standard_view(view): rows = parse_json(view.rows or "[]") kanban_columns = parse_json(view.kanban_columns or "[]") kanban_fields = parse_json(view.kanban_fields or "[]") + view.column_field = view.column_field or "status" default_rows = sync_default_rows(view.doctype, view.type) rows = rows + default_rows if default_rows else rows @@ -192,8 +193,8 @@ def create_or_update_standard_view(view): doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) - doc.order_by = view.order_by - doc.group_by_field = view.group_by_field + doc.order_by = view.order_by or "modified desc" + doc.group_by_field = view.group_by_field or "owner" doc.column_field = view.column_field doc.title_field = view.title_field doc.kanban_columns = json.dumps(kanban_columns) @@ -219,8 +220,8 @@ def create_or_update_standard_view(view): doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) - doc.order_by = view.order_by - doc.group_by_field = view.group_by_field + doc.order_by = view.order_by or "modified desc" + doc.group_by_field = view.group_by_field or "owner" doc.column_field = view.column_field doc.title_field = view.title_field doc.kanban_columns = json.dumps(kanban_columns)