diff --git a/app/containers/RepoExecutionsPage/saga.js b/app/containers/RepoExecutionsPage/saga.js
index 81fff2f..3549e7c 100644
--- a/app/containers/RepoExecutionsPage/saga.js
+++ b/app/containers/RepoExecutionsPage/saga.js
@@ -1,7 +1,10 @@
-import { take, call, put, select, takeLatest } from 'redux-saga/effects';
+import { call, put, select, takeLatest } from 'redux-saga/effects';
import createInjector from 'utils/injectSaga';
import { raceCancel } from '../../utils/saga-util';
-import { requestJson } from 'utils/request';
+
+import {
+ endpointRequest,
+} from 'containers/App/saga';
import {
PAGE_OPENED,
@@ -9,18 +12,6 @@ import {
FETCH_EXECUTIONS_REQUEST,
} from './constants';
-import {
- LOGIN_SUCCESS,
-} from 'containers/App/constants';
-
-import {
- loginRequest,
-} from 'containers/App/actions';
-
-import {
- selectLoggingIn,
-} from 'containers/App/selectors';
-
import selectDomain from './selectors';
import {
@@ -30,12 +21,6 @@ import {
} from './actions';
export function* fetchingExecution() {
- // Check if a login is in process.
- const isLoggingIn = yield select(selectLoggingIn);
- if (isLoggingIn) {
- yield take(LOGIN_SUCCESS);
- }
-
try {
const {
owner,
@@ -50,8 +35,9 @@ export function* fetchingExecution() {
executions,
lastEvaluatedKey,
} = yield call(
- requestJson,
- `/api/v1/repo/${owner}/${repo}`,
+ endpointRequest,
+ 'searchByRepoUrl',
+ { owner, repo },
);
yield put(fetchExecutionsSuccess(
@@ -61,23 +47,9 @@ export function* fetchingExecution() {
}
catch (err) {
if (err.isJson && err.body) {
- if (err.status === 403 && err.body.authRedirectUrl) {
- // Start a login request.
- yield put(loginRequest(err.body.authRedirectUrl));
-
- // Wait for the login to succeed or the
- const loginSuccessResult = yield take(LOGIN_SUCCESS);
-
- if (loginSuccessResult) {
- // Try the fetch again...
- yield call(fetchExecutions());
- }
- }
- else {
- yield put(fetchExecutionsFailure(
- err.body,
- ));
- }
+ yield put(fetchExecutionsFailure(
+ err.body,
+ ));
}
else {
yield put(fetchExecutionsFailure(
@@ -104,7 +76,6 @@ export default function* defaultSaga() {
FETCH_EXECUTIONS_REQUEST,
raceCancel(fetchingExecution, [
PAGE_CLOSED,
- FETCH_EXECUTIONS_REQUEST,
]),
);
}
diff --git a/app/containers/TopNav/index.js b/app/containers/TopNav/index.js
index 2dfbc5d..842fa08 100644
--- a/app/containers/TopNav/index.js
+++ b/app/containers/TopNav/index.js
@@ -3,13 +3,21 @@
*/
import React from 'react';
-// import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Link } from 'react-router-dom';
import { FormattedMessage } from 'react-intl';
import styled from 'styled-components';
+import { buildApiUrl } from '../../utils/request';
import messages from './messages';
+import {
+ selectGithubUrl,
+ selectUserName,
+ selectUserLogin,
+ selectEndpoints,
+} from 'containers/App/selectors';
+
const DropdownBG = styled.div`
position: fixed;
top: 0;
@@ -49,11 +57,21 @@ export class TopNav extends React.PureComponent {
handleLogOut(evt) {
evt.preventDefault();
- window.location = `/api/v1/auth/logout?redirect=${encodeURIComponent(`${window.location.origin}/app`)}`;
+ const { logoutUrl } = this.props;
+ window.location = buildApiUrl(logoutUrl, { url: `${window.location.origin}/app` });
}
render() {
- const { showNavi, showUserDropdown } = this.state;
+ const {
+ githubUrl,
+ userName,
+ userLogin,
+ } = this.props;
+
+ const {
+ showNavi,
+ showUserDropdown,
+ } = this.state;
return (
@@ -94,27 +112,30 @@ export class TopNav extends React.PureComponent {
-
-
- 
-
-
- {showUserDropdown && (
-
- )}
-
+
+ 
+
+
+ {showUserDropdown && (
+
+ )}
+
should render expected JSX for "opened" pull r
synchronize {{actionHtml} to}
other {{actionHtml}}
}
- {pullRequestLinkHtml}"
+ {pullRequestLinkHtml} by {usernameHtml}"
id="app.components.ExecutionStartMessage.startedForPullRequest"
values={
Object {
@@ -27,7 +27,7 @@ exports[`