External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5695 from jlmitch5/redirectToLogin

Browse Source 
add redirect to login on 401

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-01-17 23:31:38 +00:00
committed by GitHub
parent ad73174029 8d4d718f7d
commit 77d1c711bf
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui_next/src/components/ContentError/ContentError.jsx
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React, { Fragment } from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { Link } from 'react-router-dom'; import { Link, Redirect } from 'react-router-dom';
import { bool, instanceOf } from 'prop-types'; import { bool, instanceOf } from 'prop-types';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
@@ -33,7 +33,12 @@ function ContentError({ error, children, isNotFound, i18n }) {
} }
const is404 = const is404 =
isNotFound || (error && error.response && error.response.status === 404); isNotFound || (error && error.response && error.response.status === 404);
const is401 = error && error.response && error.response.status === 401;
return ( return (
<Fragment>
{is401 ? (
<Redirect to="/login" />
) : (
<EmptyState> <EmptyState>
<EmptyStateIcon icon={ExclamationTriangleIcon} /> <EmptyStateIcon icon={ExclamationTriangleIcon} />
<Title size="lg"> <Title size="lg">
@@ -45,10 +50,14 @@ function ContentError({ error, children, isNotFound, i18n }) {
: i18n._( : i18n._(
t`There was an error loading this content. Please reload the page.` t`There was an error loading this content. Please reload the page.`
)}{' '} )}{' '}
{children || <Link to="/home">{i18n._(t`Back to Dashboard.`)}</Link>} {children || (
<Link to="/home">{i18n._(t`Back to Dashboard.`)}</Link>
)}
</EmptyStateBody> </EmptyStateBody>
{error && <ErrorDetail error={error} />} {error && <ErrorDetail error={error} />}
</EmptyState> </EmptyState>
)}
</Fragment>
); );
} }
ContentError.propTypes = { ContentError.propTypes = {