Change layout, adjust ddl and default order

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

Hide file tree

Showing 6 changed files with 8 additions and 55 deletions.
diff --git a/src/components/inputs/email-template-input.js b/src/components/inputs/email-template-input.js
@@ -44,9 +44,9 @@ export default class EmailTemplateInput extends React.Component {
     }
 
     getTemplates (input, callback) {
-        const {ownerId } = this.props;
+        const {ownerId, defaultOptions} = this.props;
 
-        if (!input) {
+        if (!input && !defaultOptions) {
             return Promise.resolve({ options: [] });
         }
 

diff --git a/src/components/nav-menu/index.js b/src/components/nav-menu/index.js
@@ -130,9 +130,9 @@ class NavMenu extends React.Component {
             {name: 'emails', iconClass: 'fa-envelope-o', accessRoute: 'emails',
                 childs: [
                     {name:'email_templates', linkUrl:`emails/templates`},
+                    {name:'email_logs', linkUrl:`emails/log`},
                 ]
             },
-            {name: 'email_logs', iconClass: 'fa-envelope-o', linkUrl: 'email-logs', accessRoute: 'email-logs'},
             {name: 'admin_access', iconClass: 'fa-arrow-circle-o-right', linkUrl: 'admin-access', accessRoute: 'admin-access'},
             {name: 'media_file_types', iconClass: 'fa-file-text-o', linkUrl: 'media-file-types', accessRoute: 'admin-access'},
         ];

diff --git a/src/layouts/email-layout.js b/src/layouts/email-layout.js
@@ -19,6 +19,7 @@ import { Breadcrumb } from 'react-breadcrumbs';
 import Restrict from '../routes/restrict';
 import EmailTemplateListPage from "../pages/emails/email-template-list-page";
 import EditEmailTemplatePage from "../pages/emails/edit-email-template-page";
+import EmailLogListPage from '../pages/emails/email-log-list-page';
 
 class EmailLayout extends React.Component {
 
@@ -33,6 +34,7 @@ class EmailLayout extends React.Component {
                     <Route exact strict path={`${match.url}/templates`} component={EmailTemplateListPage}/>
                     <Route strict exact path={`${match.url}/templates/new`} component={EditEmailTemplatePage}/>
                     <Route path={`${match.url}/templates/:template_id`} component={EditEmailTemplatePage}/>
+                    <Route exact strict path={`${match.url}/log`} component={EmailLogListPage}/>
                     <Redirect to={`/app/emails/templates`} />
                 </Switch>
             </div>

diff --git a/src/layouts/email-logs-layout.js b/src/layouts/email-logs-layout.js
diff --git a/src/layouts/primary-layout.js b/src/layouts/primary-layout.js
@@ -22,7 +22,6 @@ import SummitDirectoryPage from '../pages/summits/summit-directory-page';
 import SpeakerLayout from './speaker-layout';
 import CompanyLayout from './company-layout';
 import EmailLayout from "./email-layout";
-import EmailLogsLayout from './email-logs-layout';
 import AdminAccessLayout from "./admin-access-layout";
 import MediaFileTypeLayout from "./media-file-type-layout";
 import SponsoredProjectLayout from "./sponsored-project-layout";
@@ -57,7 +56,6 @@ class PrimaryLayout extends React.Component {
                         <Route path="/app/tags" component={TagLayout}/>
                         <Route path="/app/sponsored-projects" component={SponsoredProjectLayout}/>
                         <Route path={"/app/emails"} component={EmailLayout}/>
-                        <Route path={"/app/email-logs"} component={EmailLogsLayout}/>
                         <Route path={"/app/admin-access"} component={AdminAccessLayout}/>
                         <Route path={"/app/media-file-types"} component={MediaFileTypeLayout}/>
                         <Route path="/app/summits" component={SummitLayout} />

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, orderDir, filters);
+    props.getSentEmails(term, currentPage, perPage, order, 0, filters);
   }, []);
 
   const defaultFilters = {
@@ -107,8 +107,6 @@ const SentEmailListPage = ({
     setEmailFilters({ ...emailFilters, [id]: value });
   }
 
-  console.log("CHJECK FILTER", emailFilters);
-
   const handleColumnsChange = (ev) => {
     const { value } = ev.target;
     let newColumns = value;
@@ -262,6 +260,8 @@ const SentEmailListPage = ({
               placeholder={T.translate("email_logs.placeholders.template")}
               onChange={handleEmailFilterChange}
               isClearable={true}
+              cacheOptions
+              defaultOptions              
               plainValue
             />
           </div>