merge the working of search and refresh button in one function

Author: rusp-odoo

outlook/src/taskpane/api.js

@@ -14,9 +14,9 @@ const api = {
     searchPartner: '/mail_plugin/partner/search',
     getTranslations: '/mail_plugin/get_translations',
     searchProject: '/mail_plugin/project/search',
-    getLeads: '/mail/plugin/leads/search',
-    getTasks: '/mail/plugin/tasks/search',
-    getTickets: '/mail/plugin/tickets/search',
+    Leads: '/mail/plugin/leads',
+    Tasks: '/mail/plugin/tasks',
+    Tickets: '/mail/plugin/tickets',
 
     // Authentication
     loginPage: '/web/login', // Should be the usual Odoo login page.

outlook/src/taskpane/components/SearchRefrech/SearchRefrech.tsx

@@ -42,7 +42,6 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
             fontSize: 'medium',
             color: '#787878',
             fontWeight: 600,
-            marginRight: '10px',
         };
 
         const onBackClick = () => {
@@ -51,6 +50,10 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
             this.props.setIsSearching(false);
         };
 
+        const onRefrechClick = () => {
+            searchData();
+        };
+
         const onSearchClick = () => {
             this.setState({ isSearching: true });
             this.props.setIsSearching(true);
@@ -65,22 +68,26 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
             }
         };
 
-        const onRefrechClick = () => {
-            if (this.state.query) {
-                searchData(this.state.query);
+        const getEndPoint = (params: string) => {
+            let endPoint = '';
+            if (this.props.searchType === 'lead') {
+                endPoint = api.Leads;
+            } else if (this.props.searchType === 'task') {
+                endPoint = api.Tasks;
+            } else {
+                endPoint = api.Tickets;
             }
+            return endPoint + `/${params}`;
         };
 
-        const searchData = async (query: string) => {
+        const searchData = async (query?: string) => {
             this.props.setIsLoading(true);
 
             let endPoint = '';
-            if (this.props.searchType === 'lead') {
-                endPoint = api.getLeads;
-            } else if (this.props.searchType === 'task') {
-                endPoint = api.getTasks;
+            if (query) {
+                endPoint = getEndPoint('search');
             } else {
-                endPoint = api.getTickets;
+                endPoint = getEndPoint('refresh');
             }
 
             try {
@@ -89,7 +96,7 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
                     api.baseURL + endPoint,
                     ContentType.Json,
                     this.context.getConnectionToken(),
-                    { query: query, partner_id: this.props.partner.id },
+                    { query: query, partner: this.props.partner },
                     true,
                 );
 
@@ -160,7 +167,7 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
         }
 
         let refrechButton = null;
-        if (this.state.isSearching) {
+        if (!this.state.isSearching) {
             refrechButton = (
                 <TooltipHost content={_t('Refresh search')}>
                     <div className="odoo-muted-button" onClick={onRefrechClick} style={{ border: 'none' }}>
@@ -174,8 +181,8 @@ class SearchRefrech extends React.Component<SearchRefrechProps, SearchRefrechSta
             <div style={broadCampStyle}>
                 {backButton}
                 {searchButton}
-                {searchBar}
                 {refrechButton}
+                {searchBar}
             </div>
         );
     }