From ce384d47fd6e60b498288c6c908dfdc6706345e9 Mon Sep 17 00:00:00 2001
From: vimal1083 <vimal1083@gmail.com>
Date: Wed, 19 May 2021 19:02:00 +0530
Subject: [PATCH] Fix lint & misc
---
.../containers/ReminderContainer/actions.js | 4 ++--
.../containers/ReminderForm/actions.js | 4 ++--
.../containers/ReminderForm/index.js | 3 +--
.../src/containers/ReminderContainer/index.js | 23 +++++++++----------
.../containers/ReminderContainer/selectors.js | 15 +++++-------
5 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/hypha/static_src/src/app/src/containers/ReminderContainer/actions.js b/hypha/static_src/src/app/src/containers/ReminderContainer/actions.js
index 6e0a68373..298192e1a 100644
--- a/hypha/static_src/src/app/src/containers/ReminderContainer/actions.js
+++ b/hypha/static_src/src/app/src/containers/ReminderContainer/actions.js
@@ -17,9 +17,9 @@ export const getRemindersSuccessAction = (data) => ({
});
export const showLoadingAction = () => ({
- type: ActionTypes.SHOW_LOADING,
+ type: ActionTypes.SHOW_LOADING,
})
export const hideLoadingAction = () => ({
- type: ActionTypes.HIDE_LOADING,
+ type: ActionTypes.HIDE_LOADING,
})
diff --git a/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/actions.js b/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/actions.js
index 0b9fbda82..c266387b5 100644
--- a/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/actions.js
+++ b/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/actions.js
@@ -18,9 +18,9 @@ export const createReminderAction = (values, submissionID) => ({
})
export const showLoadingAction = () => ({
- type: ActionTypes.SHOW_LOADING,
+ type: ActionTypes.SHOW_LOADING,
})
export const hideLoadingAction = () => ({
- type: ActionTypes.HIDE_LOADING,
+ type: ActionTypes.HIDE_LOADING,
})
diff --git a/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/index.js b/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/index.js
index 806634beb..4ca944b19 100644
--- a/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/index.js
+++ b/hypha/static_src/src/app/src/containers/ReminderContainer/containers/ReminderForm/index.js
@@ -44,9 +44,8 @@ class ReminderForm extends React.PureComponent {
}
render(){
+ if(this.props.reminderForm.loading) return <LoadingPanel />
return (
- this.props.reminderForm.loading
- ? <LoadingPanel /> :
<div className="reminder-form">
{this.props.reminderForm.metaStructure && this.props.reminderForm.metaStructure.length != 0 &&
<FormContainer metadata={this.getMetaFields()} formId={"ReminderForm"} />
diff --git a/hypha/static_src/src/app/src/containers/ReminderContainer/index.js b/hypha/static_src/src/app/src/containers/ReminderContainer/index.js
index b9b82d5b9..9dafb37d7 100644
--- a/hypha/static_src/src/app/src/containers/ReminderContainer/index.js
+++ b/hypha/static_src/src/app/src/containers/ReminderContainer/index.js
@@ -44,9 +44,8 @@ class ReminderContainer extends React.PureComponent {
render(){
const { classes } = this.props;
+ if(this.props.reminderInfo.loading) return <LoadingPanel />
return (
- this.props.reminderInfo.loading
- ? <LoadingPanel /> :
<div className="reminder-container">
<SidebarBlock title={"Reminders"}>
<div className="status-actions">
@@ -61,13 +60,13 @@ class ReminderContainer extends React.PureComponent {
open={this.state.open}
>
<>
- <ReminderForm
- submissionID={this.props.submissionID}
- closeForm={() => this.setState({open: false})}
- />
+ <ReminderForm
+ submissionID={this.props.submissionID}
+ closeForm={() => this.setState({open: false})}
+ />
</>
</Modal>
- {this.props.reminders && this.props.reminders.length
+ {this.props.reminders.length
?
this.props.reminders.map(reminders =>
<ReminderList
@@ -120,9 +119,9 @@ const withSaga = injectSaga({ key: 'ReminderContainer', saga });
export default compose(
-withSaga,
-withReducer,
-withConnect,
-withRouter,
-withStyles(styles)
+ withSaga,
+ withReducer,
+ withConnect,
+ withRouter,
+ withStyles(styles)
)(ReminderContainer);
diff --git a/hypha/static_src/src/app/src/containers/ReminderContainer/selectors.js b/hypha/static_src/src/app/src/containers/ReminderContainer/selectors.js
index 1c135cb09..29112453b 100644
--- a/hypha/static_src/src/app/src/containers/ReminderContainer/selectors.js
+++ b/hypha/static_src/src/app/src/containers/ReminderContainer/selectors.js
@@ -9,15 +9,12 @@ export const selectReminderContainer = createSelector(selectFieldsRenderer, doma
export const selectReminders = createSelector(selectReminderContainer, domain => {
let reminders = []
domain.reminders && domain.reminders.map(reminder => {
- if(reminders.find(r => r.grouper == reminder.action_type)){
- const index = reminders.indexOf(reminders.find(r => r.grouper == reminder.action_type))
- reminders[index].list.push(reminder)
- }
- else {
- reminders.push({
- grouper: reminder.action_type,
- list: [reminder]
- })
+ const existingReminderIndex = reminders.findIndex(r => r.grouper == reminder.action_type);
+ if (existingReminderIndex != -1) {
+ reminders[existingReminderIndex].list.push(reminder)
+ } else {
+ // new reminder.
+ reminders.push({ grouper: reminder.action_type, list: [reminder] })
}
})
return reminders
--
GitLab