test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use fieldname instead of name and value in sortby, filter & groupby

Browse Source
This commit is contained in:
Shariq Ansari 2025-01-23 14:43:44 +05:30
parent 7e00969ef7
commit 7b56035123
8 changed files with 66 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
crm/api/doc.py
View File

@ -19,21 +19,23 @@ def sort_options(doctype: str):
{
"label": _(field.label),
"value": field.fieldname,
"fieldname": field.fieldname,
}
for field in fields
if field.label and field.fieldname
]
standard_fields = [
{"label": "Name", "value": "name"},
{"label": "Created On", "value": "creation"},
{"label": "Last Modified", "value": "modified"},
{"label": "Modified By", "value": "modified_by"},
{"label": "Owner", "value": "owner"},
{"label": "Name", "fieldname": "name"},
{"label": "Created On", "fieldname": "creation"},
{"label": "Last Modified", "fieldname": "modified"},
{"label": "Modified By", "fieldname": "modified_by"},
{"label": "Owner", "fieldname": "owner"},
]
for field in standard_fields:
field["label"] = _(field["label"])
field["value"] = field["fieldname"]
fields.append(field)
return fields
@ -100,6 +102,7 @@ def get_filterable_fields(doctype: str):
for field in res:
field["label"] = _(field.get("label"))
field["value"] = field.get("fieldname")
return res
@ -129,23 +132,23 @@ def get_group_by_fields(doctype: str):
fields = [
{
"label": _(field.label),
"value": field.fieldname,
"fieldname": field.fieldname,
}
for field in fields
if field.label and field.fieldname
]
standard_fields = [
{"label": "Name", "value": "name"},
{"label": "Created On", "value": "creation"},
{"label": "Last Modified", "value": "modified"},
{"label": "Modified By", "value": "modified_by"},
{"label": "Owner", "value": "owner"},
{"label": "Liked By", "value": "_liked_by"},
{"label": "Assigned To", "value": "_assign"},
{"label": "Comments", "value": "_comments"},
{"label": "Created On", "value": "creation"},
{"label": "Modified On", "value": "modified"},
{"label": "Name", "fieldname": "name"},
{"label": "Created On", "fieldname": "creation"},
{"label": "Last Modified", "fieldname": "modified"},
{"label": "Modified By", "fieldname": "modified_by"},
{"label": "Owner", "fieldname": "owner"},
{"label": "Liked By", "fieldname": "_liked_by"},
{"label": "Assigned To", "fieldname": "_assign"},
{"label": "Comments", "fieldname": "_comments"},
{"label": "Created On", "fieldname": "creation"},
{"label": "Modified On", "fieldname": "modified"},
]
for field in standard_fields:
@ -197,7 +200,7 @@ def get_quick_filters(doctype: str):
)
if doctype == "CRM Lead":
quick_filters = [filter for filter in quick_filters if filter.get("name") != "converted"]
quick_filters = [filter for filter in quick_filters if filter.get("fieldname") != "converted"]
return quick_filters
@ -344,7 +347,7 @@ def get_data(
for kc in kanban_columns:
column_filters = {column_field: kc.get("name")}
order = kc.get("order")
if (column_field in filters and filters.get(column_field) != kc.name) or kc.get("delete"):
if (column_field in filters and filters.get(column_field) != kc.get("name")) or kc.get("delete"):
column_data = []
else:
column_filters.update(filters.copy())
@ -392,8 +395,8 @@ def get_data(
fields = [
{
"label": _(field.label),
"type": field.fieldtype,
"value": field.fieldname,
"fieldtype": field.fieldtype,
"fieldname": field.fieldname,
"options": field.options,
}
for field in fields
@ -401,23 +404,23 @@ def get_data(
]
std_fields = [
{"label": "Name", "type": "Data", "value": "name"},
{"label": "Created On", "type": "Datetime", "value": "creation"},
{"label": "Last Modified", "type": "Datetime", "value": "modified"},
{"label": "Name", "fieldtype": "Data", "fieldname": "name"},
{"label": "Created On", "fieldtype": "Datetime", "fieldname": "creation"},
{"label": "Last Modified", "fieldtype": "Datetime", "fieldname": "modified"},
{
"label": "Modified By",
"type": "Link",
"value": "modified_by",
"fieldtype": "Link",
"fieldname": "modified_by",
"options": "User",
},
{"label": "Assigned To", "type": "Text", "value": "_assign"},
{"label": "Owner", "type": "Link", "value": "owner", "options": "User"},
{"label": "Like", "type": "Data", "value": "_liked_by"},
{"label": "Assigned To", "fieldtype": "Text", "fieldname": "_assign"},
{"label": "Owner", "fieldtype": "Link", "fieldname": "owner", "options": "User"},
{"label": "Like", "fieldtype": "Data", "fieldname": "_liked_by"},
]
for field in std_fields:
if field.get("value") not in rows:
rows.append(field.get("value"))
if field.get("fieldname") not in rows:
rows.append(field.get("fieldname"))
if field not in fields:
field["label"] = _(field["label"])
fields.append(field)
@ -451,12 +454,12 @@ def get_data(
return options
for field in fields:
if field.get("value") == group_by_field:
if field.get("fieldname") == group_by_field:
group_by_field = {
"label": field.get("label"),
"name": field.get("value"),
"type": field.get("type"),
"options": get_options(field.get("type"), field.get("options")),
"fieldname": field.get("fieldname"),
"fieldtype": field.get("fieldtype"),
"options": get_options(field.get("fieldtype"), field.get("options")),
}
return {

3
crm/integrations/api.py
View File

@ -116,6 +116,9 @@ def get_contact_by_phone_number(phone_number):
def get_contact(phone_number, exact_match=False):
if not phone_number:
return {"mobile_no": phone_number}
cleaned_number = (
phone_number.strip()
.replace(" ", "")

24
frontend/src/components/Filter.vue
View File

@ -197,19 +197,7 @@ const list = defineModel()
const filterableFields = createResource({
url: 'crm.api.doc.get_filterable_fields',
cache: ['filterableFields', props.doctype],
params: {
doctype: props.doctype,
},
transform(fields) {
fields = fields.map((field) => {
return {
label: field.label,
value: field.fieldname,
...field,
}
})
return fields
},
params: { doctype: props.doctype },
})
onMounted(() => {
@ -447,11 +435,11 @@ function setfilter(data) {
filters.value.add({
field: {
label: data.label,
fieldname: data.value,
fieldname: data.fieldname,
fieldtype: data.fieldtype,
options: data.options,
},
fieldname: data.value,
fieldname: data.fieldname,
operator: getDefaultOperator(data.fieldtype),
value: getDefaultValue(data),
})
@ -459,14 +447,16 @@ function setfilter(data) {
}
function updateFilter(data, index) {
if (!data.fieldname) return
filters.value.delete(Array.from(filters.value)[index])
filters.value.add({
fieldname: data.value,
fieldname: data.fieldname,
operator: getDefaultOperator(data.fieldtype),
value: getDefaultValue(data),
field: {
label: data.label,
fieldname: data.value,
fieldname: data.fieldname,
fieldtype: data.fieldtype,
options: data.options,
},

11
frontend/src/components/GroupBy.vue
View File

@ -45,15 +45,13 @@ const list = defineModel()
const groupByValue = ref({
label: '',
value: '',
fieldname: '',
})
const groupByOptions = createResource({
url: 'crm.api.doc.get_group_by_fields',
cache: ['groupByOptions', props.doctype],
params: {
doctype: props.doctype,
},
params: { doctype: props.doctype },
})
onMounted(() => {
@ -62,8 +60,9 @@ onMounted(() => {
})
function setGroupBy(data) {
if (!data?.fieldname) return
groupByValue.value = data
nextTick(() => emit('update', data.value))
nextTick(() => emit('update', data.fieldname))
}
const options = computed(() => {
@ -71,7 +70,7 @@ const options = computed(() => {
if (!list.value?.data?.group_by_field) return groupByOptions.data
groupByValue.value = list.value.data.group_by_field
return groupByOptions.data.filter(
(option) => option !== groupByValue.value.value
(option) => option.fieldname !== groupByValue.value.fieldname,
)
})
</script>

12
frontend/src/components/SortBy.vue
View File

@ -195,9 +195,7 @@ const list = defineModel()
const sortOptions = createResource({
url: 'crm.api.doc.sort_options',
cache: ['sortOptions', props.doctype],
params: {
doctype: props.doctype,
},
params: { doctype: props.doctype },
})
onMounted(() => {
@ -228,7 +226,7 @@ const options = computed(() => {
const selectedOptions = [...sortValues.value].map((sort) => sort.fieldname)
restartSort()
return sortOptions.data.filter((option) => {
return !selectedOptions.includes(option.value)
return !selectedOptions.includes(option.fieldname)
})
})
@ -242,13 +240,13 @@ function getSortLabel() {
if (!sortValues.value.size) return __('Sort')
let values = Array.from(sortValues.value)
let label = sortOptions.data?.find(
(option) => option.value === values[0].fieldname,
(option) => option.fieldname === values[0].fieldname,
)?.label
return label || values[0].fieldname
}
function setSort(data) {
sortValues.value.add({ fieldname: data.value, direction: 'asc' })
sortValues.value.add({ fieldname: data.fieldname, direction: 'asc' })
restartSort()
apply()
}
@ -257,7 +255,7 @@ function updateSort(data, index) {
let oldSort = Array.from(sortValues.value)[index]
sortValues.value.delete(oldSort)
sortValues.value.add({
fieldname: data.value,
fieldname: data.fieldname,
direction: oldSort.direction,
})
apply()

2
frontend/src/components/ViewControls.vue
View File

@ -589,7 +589,7 @@ const viewsDropdownOptions = computed(() => {
})
const quickFilterList = computed(() => {
let filters = [{ name: 'name', label: __('ID') }]
let filters = [{ fieldname: 'name', fieldtype: 'Data', label: __('ID') }]
if (quickFilters.data) {
filters.push(...quickFilters.data)
}

8
frontend/src/pages/Deals.vue
View File

@ -328,7 +328,7 @@ function getRow(name, field) {
const rows = computed(() => {
if (!deals.value?.data?.data) return []
if (deals.value.data.view_type === 'group_by') {
if (!deals.value?.data.group_by_field?.name) return []
if (!deals.value?.data.group_by_field?.fieldname) return []
return getGroupedByRows(
deals.value?.data.data,
deals.value?.data.group_by_field,
@ -348,9 +348,9 @@ function getGroupedByRows(listRows, groupByField, columns) {
let filteredRows = []
if (!option) {
filteredRows = listRows.filter((row) => !row[groupByField.name])
filteredRows = listRows.filter((row) => !row[groupByField.fieldname])
} else {
filteredRows = listRows.filter((row) => row[groupByField.name] == option)
filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option)
}
let groupDetail = {
@ -359,7 +359,7 @@ function getGroupedByRows(listRows, groupByField, columns) {
collapsed: false,
rows: parseRows(filteredRows, columns),
}
if (groupByField.name == 'status') {
if (groupByField.fieldname == 'status') {
groupDetail.icon = () =>
h(IndicatorIcon, {
class: getDealStatus(option)?.color,

8
frontend/src/pages/Leads.vue
View File

@ -348,7 +348,7 @@ function getRow(name, field) {
const rows = computed(() => {
if (!leads.value?.data?.data) return []
if (leads.value.data.view_type === 'group_by') {
if (!leads.value?.data.group_by_field?.name) return []
if (!leads.value?.data.group_by_field?.fieldname) return []
return getGroupedByRows(
leads.value?.data.data,
leads.value?.data.group_by_field,
@ -368,9 +368,9 @@ function getGroupedByRows(listRows, groupByField, columns) {
let filteredRows = []
if (!option) {
filteredRows = listRows.filter((row) => !row[groupByField.name])
filteredRows = listRows.filter((row) => !row[groupByField.fieldname])
} else {
filteredRows = listRows.filter((row) => row[groupByField.name] == option)
filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option)
}
let groupDetail = {
@ -379,7 +379,7 @@ function getGroupedByRows(listRows, groupByField, columns) {
collapsed: false,
rows: parseRows(filteredRows, columns),
}
if (groupByField.name == 'status') {
if (groupByField.fieldname == 'status') {
groupDetail.icon = () =>
h(IndicatorIcon, {
class: getLeadStatus(option)?.color,