fix: contact and partner mutually dependent

changelogs/unreleased/88244.json

@@ -0,0 +1,5 @@
+{
+  "title": "Opportunity form: make contact and partner fields mutually dependent",
+  "type": "fix",
+  "packages": "crm"
+}

packages/apps/crm/src/api/contact-api.js

@@ -24,7 +24,12 @@ import {
   RouterProvider,
 } from '@axelor/aos-mobile-core';
 
-const createContactCriteria = (searchValue, userId, assigned) => {
+const createContactCriteria = (
+  searchValue,
+  userId,
+  assigned,
+  mainPartnerId,
+) => {
   const criteria = [
     {
       operator: 'and',
@@ -54,6 +59,14 @@ const createContactCriteria = (searchValue, userId, assigned) => {
     getSearchCriterias('crm_contact', searchValue),
   ];
 
+  if (mainPartnerId != null) {
+    criteria.push({
+      fieldName: 'mainPartner.id',
+      operator: '=',
+      value: mainPartnerId,
+    });
+  }
+
   if (userId != null && assigned) {
     criteria.push({
       fieldName: 'user.id',
@@ -82,10 +95,21 @@ export async function searchContactWithIds(idList) {
   });
 }
 
-export async function searchContact({searchValue, page = 0, userId, assigned}) {
+export async function searchContact({
+  searchValue,
+  page = 0,
+  userId,
+  assigned,
+  mainPartnerId,
+}) {
   return createStandardSearch({
     model: 'com.axelor.apps.base.db.Partner',
-    criteria: createContactCriteria(searchValue, userId, assigned),
+    criteria: createContactCriteria(
+      searchValue,
+      userId,
+      assigned,
+      mainPartnerId,
+    ),
     fieldKey: 'crm_contact',
     sortKey: 'crm_contact',
     page,

packages/apps/crm/src/components/templates/ContactSearchBar/ContactSearchBar.tsx

@@ -45,13 +45,20 @@ const ContactSearchBarAux = ({
   const {contactList, loadingContact, moreLoading, isListEnd} = useSelector(
     (state: any) => state.contact,
   );
+  const {partner} = useSelector((state: any) => state.partner);
 
   const fetchContactSearchBarAPI = useCallback(
     ({page = 0, searchValue}) => {
       onFetchDataAction && onFetchDataAction(searchValue);
-      dispatch((fetchContact as any)({page, searchValue}));
+      dispatch(
+        (fetchContact as any)({
+          page,
+          searchValue,
+          mainPartnerId: partner?.id,
+        }),
+      );
     },
-    [dispatch, onFetchDataAction],
+    [dispatch, onFetchDataAction, partner],
   );
 
   return (

packages/apps/crm/src/features/asyncFunctions-index.ts

@@ -58,6 +58,7 @@ export {
   fetchPartner,
   searchLinkedPartnersOfContact,
   searchPartner,
+  updatePartner,
 } from './partnerSlice';
 export {
   fetchProspectById,

packages/apps/crm/src/features/partnerSlice.js

@@ -98,6 +98,11 @@ const initialState = {
 const partnerSlice = createSlice({
   name: 'partner',
   initialState,
+  reducers: {
+    updatePartner: (state, action) => {
+      state.partner = action.payload;
+    },
+  },
   extraReducers: builder => {
     builder.addCase(fetchPartner.pending, state => {
       state.loadingPartner = true;
@@ -127,4 +132,6 @@ const partnerSlice = createSlice({
   },
 });
 
+export const {updatePartner} = partnerSlice.actions;
+
 export const partnerReducer = partnerSlice.reducer;

packages/apps/crm/src/models/forms.ts

@@ -29,6 +29,7 @@ import {
   OpportunityStatusPicker,
   PartnerSearchBar,
 } from '../components';
+import {updatePartner} from '../features/partnerSlice';
 
 const MODELS = {
   lead: 'com.axelor.apps.crm.db.Lead',
@@ -302,6 +303,16 @@ export const crm_formsRegister: FormConfigs = {
         widget: 'custom',
         customComponent: ClientProspectSearchBar,
         required: true,
+        dependsOn: {
+          contact: ({newValue, objectState, dispatch}) => {
+            if (newValue != null) {
+              dispatch(updatePartner(newValue?.mainPartner));
+              return newValue?.mainPartner;
+            } else {
+              return objectState?.partner;
+            }
+          },
+        },
       },
       contact: {
         titleKey: 'Crm_Contact',
@@ -311,7 +322,17 @@ export const crm_formsRegister: FormConfigs = {
         options: {
           showTitle: true,
         },
-        required: true,
+        requiredIf: ({objectState}) => objectState.partner == null,
+        dependsOn: {
+          partner: ({newValue, objectState, dispatch}) => {
+            dispatch(updatePartner(newValue));
+            if (objectState.contact?.mainPartner?.id != newValue?.id) {
+              return null;
+            } else {
+              return objectState.contact;
+            }
+          },
+        },
       },
       expectedCloseDate: {
         titleKey: 'Crm_Opportunity_ExpectedCloseDate',