From 23df79c9ba05e28194fd0a7352d6420d7a027ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= Date: Mon, 8 Jul 2024 17:30:17 -0300 Subject: [PATCH] Change layout, adjust ddl and default order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Castillo --- src/components/inputs/email-template-input.js | 4 +- src/components/nav-menu/index.js | 2 +- src/layouts/email-layout.js | 2 + src/layouts/email-logs-layout.js | 47 ------------------- src/layouts/primary-layout.js | 2 - src/pages/emails/email-log-list-page.js | 6 +-- 6 files changed, 8 insertions(+), 55 deletions(-) delete mode 100644 src/layouts/email-logs-layout.js diff --git a/src/components/inputs/email-template-input.js b/src/components/inputs/email-template-input.js index 6d15104cd..76ffbffda 100644 --- 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 index e4502e8d3..e0989b90b 100644 --- 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 index 3dfac6cd3..f33d365c9 100644 --- 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 { + diff --git a/src/layouts/email-logs-layout.js b/src/layouts/email-logs-layout.js deleted file mode 100644 index f517a9c51..000000000 --- a/src/layouts/email-logs-layout.js +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2017 OpenStack Foundation - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -import React from 'react' -import {Switch, Route, Redirect} from 'react-router-dom'; -import T from "i18n-react/dist/i18n-react"; -import {connect} from "react-redux"; -import { Breadcrumb } from 'react-breadcrumbs'; -import Restrict from '../routes/restrict'; -import EmailLogsListPage from "../pages/emails/email-log-list-page"; - -class EmailLogsLayout extends React.Component { - - render(){ - const { match, currentSummit } = this.props; - - return( -
- - - - - - -
- ); - } - -} - -const mapStateToProps = ({ currentSummitState }) => ({ - ...currentSummitState -}); - -export default Restrict(connect (mapStateToProps, {})(EmailLogsLayout), 'email-logs'); - - diff --git a/src/layouts/primary-layout.js b/src/layouts/primary-layout.js index 3a7d05c99..c50a30d8d 100644 --- 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 { - diff --git a/src/pages/emails/email-log-list-page.js b/src/pages/emails/email-log-list-page.js index bf05d7051..4ded5cb79 100644 --- 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 />