Skip to content

State few hooks issue solved for organization state #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umayangag wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

State few hooks issue solved for organization state #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7374b14
log image changes
umayangag Jun 1, 2020
afd7a98
organization state hook fix
umayangag Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions frontend/src/app/Logo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import { Link } from "react-router-dom";

import ECLogo from "../../static/img/ps-logo.jpg";
import "./Logo.css";
// import {API_BASE_URL} from '../../config';
import {API_BASE_URL} from '../../config';

function Logo(props) {
return (
<div className="logo-container">
<Link to="/">
<img
// src={props.image? API_BASE_URL+"/media/"+props.image:ECLogo}
src={ECLogo}
src={props.image? API_BASE_URL+"/media/"+props.image:ECLogo}
alt="logo"
style={{
maxWidth: props.maxWidth,
Expand Down
9 changes: 4 additions & 5 deletions frontend/src/guest-view/components/GuestIncidentForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const VerticalLinearStepper = (props) => {
dispatch(fetchCategories());
dispatch(fetchChannels());
dispatch(fetchDistricts());
// dispatch(loadOrganization(queryParams.organization ? queryParams.organization : 1));
dispatch(loadOrganization(queryParams.organization ? queryParams.organization : 1));
}, []);

const { formatMessage: f } = useIntl();
Expand All @@ -130,6 +130,7 @@ const VerticalLinearStepper = (props) => {
const { elections, categories, channels, districts } = useSelector(
(state) => state.shared
);
const organization = useSelector((state) => state.guestView.organization);

function removeDuplicates(originalArray, prop) {
var newArray = [];
Expand Down Expand Up @@ -902,7 +903,7 @@ const VerticalLinearStepper = (props) => {
recipientMobile: incidentContact.recipientMobile,
recipientEmail: incidentContact.recipientEmail,
recipientTitle: recipientTitle,
// organizationId: queryParams.organization,
organizationId: queryParams.organization,
};
const dateTime = getFormattedDateTime();
if (dateTime) {
Expand Down Expand Up @@ -1143,15 +1144,13 @@ const VerticalLinearStepper = (props) => {
}

const isLoading = isLoadingIncident || isLoadingMetaData;
// const organization = useSelector((state) => state.guestView.organization);

return (
<div className={classes.root}>
<Grid container spacing={24}>
<Grid item xs={12} sm={6}>
<Grid item xs={12} sm={6}>
{/* <Logo image={organization ? organization.logo : null} /> */}
<Logo />
<Logo image={organization ? organization.logo : null} />
</Grid>
</Grid>

Expand Down