refactor: manage company in data fetching in helpdesk (#852)

* RM#88457

changelogs/unreleased/88457.json

@@ -0,0 +1,5 @@
+{
+  "title": "Data fetching: add active company management",
+  "type": "refactor",
+  "packages": "helpdesk"
+}

packages/apps/helpdesk/src/api/customer-api.js

@@ -37,9 +37,11 @@ const createCustomerContactCriteria = searchValue => {
   return [getSearchCriterias('helpdesk_customerContact', searchValue)];
 };
 
-export async function searchCustomer({searchValue, page = 0}) {
+export async function searchCustomer({searchValue, companyId, page = 0}) {
   return createStandardSearch({
     model: 'com.axelor.apps.base.db.Partner',
+    companyId,
+    isCompanyM2M: true,
     criteria: createCustomerCriteria(searchValue),
     fieldKey: 'helpdesk_customer',
     sortKey: 'helpdesk_customer',
@@ -48,9 +50,15 @@ export async function searchCustomer({searchValue, page = 0}) {
   });
 }
 
-export async function searchCustomerContact({searchValue, page = 0}) {
+export async function searchCustomerContact({
+  searchValue,
+  companyId,
+  page = 0,
+}) {
   return createStandardSearch({
     model: 'com.axelor.apps.base.db.Partner',
+    companyId,
+    isCompanyM2M: true,
     criteria: createCustomerContactCriteria(searchValue),
     fieldKey: 'helpdesk_customerContact',
     sortKey: 'helpdesk_customerContact',

packages/apps/helpdesk/src/api/project-api.js

@@ -25,9 +25,10 @@ const createProjectCriteria = searchValue => {
   return [getSearchCriterias('helpdesk_project', searchValue)];
 };
 
-export async function searchProject({searchValue, page = 0}) {
+export async function searchProject({searchValue, companyId, page = 0}) {
   return createStandardSearch({
     model: 'com.axelor.apps.project.db.Project',
+    companyId,
     criteria: createProjectCriteria(searchValue),
     fieldKey: 'helpdesk_project',
     sortKey: 'helpdesk_project',

packages/apps/helpdesk/src/components/templates/ContactPartnerSearchBar/ContactPartnerSearchBar.js

@@ -45,12 +45,19 @@ const ContactPartnerSearchBar = ({
     isListEndCustomerContact,
     customerContactList,
   } = useSelector(state => state.helpdesk_customer);
+  const {user} = useSelector(state => state.user);
 
   const searchContactAPI = useCallback(
     ({page = 0, searchValue}) => {
-      dispatch(searchCustomerContact({page, searchValue}));
+      dispatch(
+        searchCustomerContact({
+          page,
+          searchValue,
+          companyId: user.activeCompany?.id,
+        }),
+      );
     },
-    [dispatch],
+    [dispatch, user.activeCompany?.id],
   );
 
   const ObjectToDisplay = useMemo(() => {

packages/apps/helpdesk/src/components/templates/CustomerSearchBar/CustomerSearchBar.js

@@ -41,12 +41,15 @@ const CustomerSearchBar = ({
   const {customerList, loading, moreLoading, isListEnd} = useSelector(
     state => state.helpdesk_customer,
   );
+  const {user} = useSelector(state => state.user);
 
   const searchCustomerAPI = useCallback(
     ({page = 0, searchValue}) => {
-      dispatch(searchCustomer({page, searchValue}));
+      dispatch(
+        searchCustomer({page, searchValue, companyId: user.activeCompany?.id}),
+      );
     },
-    [dispatch],
+    [dispatch, user.activeCompany?.id],
   );
 
   return (

packages/apps/helpdesk/src/components/templates/ProjectSearchBar/ProjectSearchBar.js

@@ -40,12 +40,15 @@ const ProjectSearchBar = ({
   const {projectList, loadingProject, moreLoading, isListEnd} = useSelector(
     state => state.helpdesk_project,
   );
+  const {user} = useSelector(state => state.user);
 
   const searchProjectAPI = useCallback(
     ({page = 0, searchValue}) => {
-      dispatch(searchProject({page, searchValue}));
+      dispatch(
+        searchProject({page, searchValue, companyId: user.activeCompany?.id}),
+      );
     },
-    [dispatch],
+    [dispatch, user.activeCompany?.id],
   );
 
   return (