Adjust params for template search, change menu text, initial order di…

…r on reducer Signed-off-by: Tomás Castillo <[email protected]>
fntechgit · Jul 8, 2024 · 1181741 · 1181741
1 parent 23df79c
commit 1181741
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/actions/email-actions.js b/src/actions/email-actions.js
@@ -31,6 +31,7 @@ import {
 } from 'openstack-uicore-foundation/lib/utils/actions';
 import {checkOrFilter,getAccessTokenSafely} from '../utils/methods';
 import { saveMarketingSetting } from "./marketing-actions";
+import URI from "urijs";
 
 
 export const REQUEST_TEMPLATES       = 'REQUEST_TEMPLATES';
@@ -234,10 +235,19 @@ const normalizeEntity = (entity) => {
 export const queryTemplates = _.debounce(async (input, callback) => {
 
     const accessToken = await getAccessTokenSafely();
-
+
+    let endpoint = URI(`${window.EMAIL_API_BASE_URL}/api/v1/mail-templates`);    
+
     input = escapeFilterValue(input);
 
-    fetch(`${window.EMAIL_API_BASE_URL}/api/v1/mail-templates?identifier__contains=${input}&access_token=${accessToken}`)
+    endpoint.addQuery('access_token', accessToken);    
+    endpoint.addQuery('order','-id')
+
+    if(input) {
+        endpoint.addQuery('identifier__contains', input);
+    }
+
+    fetch(endpoint)
         .then(fetchResponseHandler)
         .then((json) => {
             const options = [...json.data];

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -137,7 +137,7 @@
     "emails": "Emails",
     "email_templates": "Templates",
     "sent_email": "Sent Emails",
-    "email_logs": "Email Logs",
+    "email_logs": "Logs",
     "summitdocs": "Event Docs",
     "email_flow_events": "Email Events",
     "email_flow_overrides": "Overrides",

diff --git a/src/pages/emails/email-log-list-page.js b/src/pages/emails/email-log-list-page.js
@@ -36,7 +36,7 @@ const SentEmailListPage = ({
   ...props
 }) => {
   useEffect(() => {
-    props.getSentEmails(term, currentPage, perPage, order, 0, filters);
+    props.getSentEmails(term, currentPage, perPage, order, orderDir, filters);
   }, []);
 
   const defaultFilters = {

diff --git a/src/reducers/emails/email-log-list-reducer.js b/src/reducers/emails/email-log-list-reducer.js
@@ -24,7 +24,7 @@ const DEFAULT_STATE = {
     emails          : [],
     term            : '',
     order           : 'id',
-    orderDir        : 1,
+    orderDir        : 0,
     currentPage     : 1,
     lastPage        : 1,
     perPage         : 10,