loading: boolean
+ host: string
}
-function PageInsightsPanel({ filters, fetchInsights, events = [], insights, urlOptions, loading = true }: Props) {
+function PageInsightsPanel({
+ filters, fetchInsights, events = [], insights, urlOptions, host, loading = true
+}: Props) {
const [insightsFilters, setInsightsFilters] = useState(filters)
+ console.log('host', host)
const onDateChange = (e) => {
const { startDate, endDate, rangeValue } = e;
@@ -33,7 +37,7 @@ function PageInsightsPanel({ filters, fetchInsights, events = [], insights, urlO
}, [insights])
useEffect(() => {
- const url = insightsFilters.url ? insightsFilters.url : urlOptions[0].value;
+ const url = insightsFilters.url ? insightsFilters.url : host + '/' + urlOptions[0].value;
Player.pause();
fetchInsights({ ...insightsFilters, url })
}, [insightsFilters])
@@ -41,7 +45,7 @@ function PageInsightsPanel({ filters, fetchInsights, events = [], insights, urlO
const onPageSelect = (e, { name, value }) => {
const event = events.find(item => item.url === value)
Player.jump(event.time + JUMP_OFFSET)
- setInsightsFilters({ ...insightsFilters, url: value })
+ setInsightsFilters({ ...insightsFilters, url: host + '/' + value })
markTargets([])
};
@@ -83,9 +87,10 @@ export default connect(state => {
const events = state.getIn([ 'sessions', 'visitedEvents' ])
return {
filters: state.getIn(['sessions', 'insightFilters']),
+ host: state.getIn([ 'sessions', 'host' ]),
insights: state.getIn([ 'sessions', 'insights' ]),
events: events,
- urlOptions: events.map(({ url }) => ({ text: url, value: url})),
+ urlOptions: events.map(({ url, host }) => ({ text: url, value: url, host })),
loading: state.getIn([ 'sessions', 'fetchInsightsRequest', 'loading' ]),
}
}, { fetchInsights })(PageInsightsPanel);
\ No newline at end of file
diff --git a/frontend/app/components/Signup/SignupForm/SignupForm.js b/frontend/app/components/Signup/SignupForm/SignupForm.js
index 0a5de9507..7df2822ee 100644
--- a/frontend/app/components/Signup/SignupForm/SignupForm.js
+++ b/frontend/app/components/Signup/SignupForm/SignupForm.js
@@ -155,7 +155,7 @@ export default class SignupForm extends React.Component {
diff --git a/frontend/app/duck/sessions.js b/frontend/app/duck/sessions.js
index 6fe968d47..d54506ddc 100644
--- a/frontend/app/duck/sessions.js
+++ b/frontend/app/duck/sessions.js
@@ -53,7 +53,8 @@ const initialState = Map({
liveSessions: List(),
visitedEvents: List(),
insights: List(),
- insightFilters: defaultDateFilters
+ insightFilters: defaultDateFilters,
+ host: ''
});
const reducer = (state = initialState, action = {}) => {
@@ -146,7 +147,7 @@ const reducer = (state = initialState, action = {}) => {
// TODO: more common.. or TEMP
const events = action.filter.events;
// const filters = action.filter.filters;
- const current = state.get('list').find(({ sessionId }) => sessionId === action.data.sessionId) || Session();
+ const current = state.get('list').find(({ sessionId }) => sessionId === action.data.sessionId) || Session();
const session = Session(action.data);
const matching = [];
@@ -158,7 +159,7 @@ const reducer = (state = initialState, action = {}) => {
tmpMap[event.url] = event.url
visitedEvents.push(event)
}
- })
+ })
events.forEach(({ key, operator, value }) => {
session.events.forEach((e, index) => {
@@ -172,10 +173,12 @@ const reducer = (state = initialState, action = {}) => {
}
}
})
- })
+ })
+ console.log('visitedEvents', visitedEvents)
return state.set('current', current.merge(session))
.set('eventsIndex', matching)
- .set('visitedEvents', visitedEvents);
+ .set('visitedEvents', visitedEvents)
+ .set('host', visitedEvents[0].host);
}
case FETCH_FAVORITE_LIST.SUCCESS:
return state
@@ -227,7 +230,7 @@ const reducer = (state = initialState, action = {}) => {
.set('sessionIds', allList.map(({ sessionId }) => sessionId ).toJS())
case SET_TIMEZONE:
return state.set('timezone', action.timezone)
- case TOGGLE_CHAT_WINDOW:
+ case TOGGLE_CHAT_WINDOW:
return state.set('showChatWindow', action.state)
case FETCH_INSIGHTS.SUCCESS:
return state.set('insights', List(action.data).sort((a, b) => b.count - a.count));
diff --git a/frontend/app/duck/user.js b/frontend/app/duck/user.js
index 5395792c3..fc9fdcabf 100644
--- a/frontend/app/duck/user.js
+++ b/frontend/app/duck/user.js
@@ -113,12 +113,12 @@ export const signup = params => dispatch => dispatch({
export const resetPassword = params => dispatch => dispatch({
types: RESET_PASSWORD.toArray(),
- call: client => client.post('/password/reset/2', params),
+ call: client => client.post('/password/reset', params)
});
export const requestResetPassword = params => dispatch => dispatch({
types: REQUEST_RESET_PASSWORD.toArray(),
- call: client => client.post('/password/reset/1', params),
+ call: client => client.post('/password/reset-link', params),
});
export const updatePassword = params => dispatch => dispatch({
diff --git a/frontend/app/types/session/event.js b/frontend/app/types/session/event.js
index b64744bcb..537de1724 100644
--- a/frontend/app/types/session/event.js
+++ b/frontend/app/types/session/event.js
@@ -56,6 +56,7 @@ const View = Event.extend({
const Location = Event.extend({
type: LOCATION,
url: '',
+ host: '',
pageLoad: false,
fcpTime: undefined,
//fpTime: undefined,