这是indexloc提供的服务，不要输入任何密码
Skip to content

change success code from 200 to 2xx (close #2335) #2342

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

Merged
merged 6 commits into from
Jun 7, 2019
Merged

change success code from 200 to 2xx (close #2335) #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68d9d0c
change success code from 200 to 2xx
strongSoda Jun 6, 2019
b03a1d5
change success code from 200 to 2xx
strongSoda Jun 7, 2019
3ad4ac6
change name from verifyStatus to verifySuccessStatus
strongSoda Jun 7, 2019
c5cdda1
move util fns
rikinsk Jun 7, 2019
97c0946
.
rikinsk Jun 7, 2019
9a3102f
fix bad ref
rikinsk Jun 7, 2019
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
12 changes: 6 additions & 6 deletions console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
} from './FilterActions';
import { ordinalColSort, convertDateTimeToLocale } from '../utils';
import '../TableCommon/EventReactTableOverrides.css';
import { verifySuccessStatus } from '../utils';

const ViewRows = ({
curTriggerName,
Expand Down Expand Up @@ -256,12 +257,11 @@ const ViewRows = ({
const invocationRowsData = [];
currentRow.logs.map((r, rowIndex) => {
const newRow = {};
const status =
r.status === 200 ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
);
const status = verifySuccessStatus(r.status) ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
);

// Insert cells corresponding to all rows
invocationColumns.forEach(col => {
Expand Down
74 changes: 36 additions & 38 deletions console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import Tabs from 'react-bootstrap/lib/Tabs';
import Tab from 'react-bootstrap/lib/Tab';
import 'brace/mode/json';
import 'react-table/react-table.css';
import { deleteItem, vExpandRow, vCollapseRow } from './ViewActions'; // eslint-disable-line no-unused-vars
import FilterQuery from './FilterQuery';
import parseRowData from '../StreamingLogs/util';
import {
setOrderCol,
setOrderType,
Expand All @@ -17,7 +15,12 @@ import {
setLimit,
addOrder,
} from './FilterActions';
import { ordinalColSort, convertDateTimeToLocale } from '../utils';
import {
ordinalColSort,
convertDateTimeToLocale,
verifySuccessStatus,
parseRowData,
} from '../utils';
import '../TableCommon/EventReactTableOverrides.css';
import * as tooltip from '../Common/Tooltips';
import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
Expand Down Expand Up @@ -221,6 +224,14 @@ const ViewRows = ({
}
};

const successIcon = (
<i className={styles.invocationSuccess + 'fa fa-check'} />
);

const failureIcon = (
<i className={styles.invocationFailure + ' fa fa-times'} />
);

const renderTableBody = () => {
if (newCurRows.length === 0) {
return <div> No rows found. </div>;
Expand Down Expand Up @@ -275,12 +286,9 @@ const ViewRows = ({
const responseData = [];
currentRow.logs.map((r, rowIndex) => {
const newRow = {};
const status =
r.status === 200 ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
);
const status = verifySuccessStatus(r.status)
? successIcon
: failureIcon;

requestData.push(parseRowData(r, 'request'));
responseData.push(parseRowData(r, 'response'));
Expand Down Expand Up @@ -429,36 +437,26 @@ const ViewRows = ({
>
{finalResponse.status_code
? [
'Status Code: ',
finalResponse.status_code === 200 ? (
<i
className={
styles.invocationSuccess +
' fa fa-check'
}
/>
) : (
<i
className={
styles.invocationFailure +
' fa fa-times'
'Status Code: ',
verifySuccessStatus(
finalResponse.status_code
)
? successIcon
: failureIcon,
finalResponse.status_code,
' ',
<OverlayTrigger
placement="top"
overlay={
tooltip.statusCodeDescription
}
/>
),
finalResponse.status_code,
' ',
<OverlayTrigger
placement="top"
overlay={
tooltip.statusCodeDescription
}
>
<i
className="fa fa-question-circle"
aria-hidden="true"
/>
</OverlayTrigger>,
]
>
<i
className="fa fa-question-circle"
aria-hidden="true"
/>
</OverlayTrigger>,
]
: null}
</div>
<AceEditor
Expand Down
12 changes: 6 additions & 6 deletions console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import { ordinalColSort, convertDateTimeToLocale } from '../utils';
import Spinner from '../../../Common/Spinner/Spinner';
import '../TableCommon/EventReactTableOverrides.css';
import { verifySuccessStatus } from '../utils';

const ViewRows = ({
curTriggerName,
Expand Down Expand Up @@ -262,12 +263,11 @@ const ViewRows = ({
const invocationRowsData = [];
currentRow.logs.map((r, rowIndex) => {
const newRow = {};
const status =
r.status === 200 ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
);
const status = verifySuccessStatus(r.status) ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
);

// Insert cells corresponding to all rows
invocationColumns.forEach(col => {
Expand Down
57 changes: 29 additions & 28 deletions console/src/components/Services/EventTrigger/StreamingLogs/Logs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Tabs from 'react-bootstrap/lib/Tabs';
import Tab from 'react-bootstrap/lib/Tab';
import RedeliverEvent from '../TableCommon/RedeliverEvent';
import TableHeader from '../TableCommon/TableHeader';
import parseRowData from './util';
import { parseRowData, verifySuccessStatus } from '../utils';
import {
loadEventLogs,
setTrigger,
Expand Down Expand Up @@ -144,7 +144,8 @@ class StreamingLogs extends Component {
const newRow = {};

const status =
r.status === 200 ? (
// 2xx is success
verifySuccessStatus(r.status) ? (
<i className={styles.invocationSuccess + ' fa fa-check'} />
) : (
<i className={styles.invocationFailure + ' fa fa-times'} />
Expand Down Expand Up @@ -292,32 +293,32 @@ class StreamingLogs extends Component {
>
{finalResponse.status_code
? [
'Status Code: ',
finalResponse.status_code === 200 ? (
<i
className={
styles.invocationSuccess + ' fa fa-check'
}
/>
) : (
<i
className={
styles.invocationFailure + ' fa fa-times'
}
/>
),
finalResponse.status_code,
' ',
<OverlayTrigger
placement="top"
overlay={tooltip.statusCodeDescription}
>
<i
className="fa fa-question-circle"
aria-hidden="true"
/>
</OverlayTrigger>,
]
'Status Code: ',
verifySuccessStatus(finalResponse.status_code) ? (
<i
className={
styles.invocationSuccess + ' fa fa-check'
}
/>
) : (
<i
className={
styles.invocationFailure + ' fa fa-times'
}
/>
),
finalResponse.status_code,
' ',
<OverlayTrigger
placement="top"
overlay={tooltip.statusCodeDescription}
>
<i
className="fa fa-question-circle"
aria-hidden="true"
/>
</OverlayTrigger>,
]
: null}
</div>
<AceEditor
Expand Down
53 changes: 0 additions & 53 deletions console/src/components/Services/EventTrigger/StreamingLogs/util.js
View file
Open in desktop

This file was deleted.

33 changes: 17 additions & 16 deletions console/src/components/Services/EventTrigger/TableCommon/RedeliverEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import AceEditor from 'react-ace';
import 'brace/mode/json';
import Button from '../../../Common/Button/Button';

import { verifySuccessStatus } from '../utils';

class RedeliverEvent extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -89,22 +91,21 @@ class RedeliverEvent extends Component {
const invocationRowsData = [];
log.eventInvocations.map(r => {
const newRow = {};
const status =
r.status === 200 ? (
<i
className={
styles.invocationSuccess +
' fa fa-check invocationsSuccess ' +
styles.tabletdCenter
}
/>
) : (
<i
className={
styles.invocationFailure + ' fa fa-times invocationsFailure'
}
/>
);
const status = verifySuccessStatus(r.status) ? (
<i
className={
styles.invocationSuccess +
' fa fa-check invocationsSuccess ' +
styles.tabletdCenter
}
/>
) : (
<i
className={
styles.invocationFailure + ' fa fa-times invocationsFailure'
}
/>
);

// Insert cells corresponding to all rows
invocationColumns.forEach(col => {
Expand Down
Loading