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

console: update request payload event triggers #358

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 3 commits into from
Sep 5, 2018
Merged

console: update request payload event triggers #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d106aa
console: event triggers wip
praveenweb Sep 5, 2018
0c1e38f
console: update request payload
praveenweb Sep 5, 2018
9adcc2e
console: update for running events
praveenweb Sep 5, 2018
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
2 changes: 1 addition & 1 deletion console/src/components/Services/EventTrigger/EventActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ const loadEventLogs = triggerName => (dispatch, getState) => {
],
where: { event: { trigger_name: triggerName } },
order_by: ['-created_at'],
limit: 20,
limit: 10,
},
}),
};
Expand Down
4 changes: 2 additions & 2 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 @@ -313,12 +313,12 @@ const ViewRows = ({
showPagination={false}
SubComponent={logRow => {
const finalIndex = logRow.index;
const finalRow = currentRow.logs[finalIndex];
const currentPayload = JSON.stringify(
currentRow.payload,
finalRow.request,
null,
4
);
const finalRow = currentRow.logs[finalIndex];
const finalResponse = JSON.parse(
JSON.stringify(finalRow.response, null, 4)
);
Expand Down
4 changes: 2 additions & 2 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 @@ -306,12 +306,12 @@ const ViewRows = ({
showPagination={false}
SubComponent={logRow => {
const finalIndex = logRow.index;
const finalRow = currentRow.logs[finalIndex];
const currentPayload = JSON.stringify(
currentRow.payload,
finalRow.request,
null,
4
);
const finalRow = currentRow.logs[finalIndex];
// check if response is type JSON
let finalResponse = finalRow.response;
try {
Expand Down
4 changes: 2 additions & 2 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 @@ -313,12 +313,12 @@ const ViewRows = ({
showPagination={false}
SubComponent={logRow => {
const finalIndex = logRow.index;
const finalRow = currentRow.logs[finalIndex];
const currentPayload = JSON.stringify(
currentRow.payload,
finalRow.request,
null,
4
);
const finalRow = currentRow.logs[finalIndex];
const finalResponse = JSON.parse(
JSON.stringify(finalRow.response, null, 4)
);
Expand Down
2 changes: 1 addition & 1 deletion console/src/components/Services/EventTrigger/Schema/Schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Schema extends Component {
dispatch(push(`${appPrefix}/manage/triggers/add`));
}}
>
Create
Create Trigger
</button>
) : null}
</div>
Expand Down
2 changes: 1 addition & 1 deletion console/src/components/Services/EventTrigger/StreamingLogs/LogActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const streamingLogsReducer = (triggerName, triggerList, logState, action) => {
columns: ['*'],
},
],
limit: 20,
limit: 10,
where: { event: { trigger_name: triggerName } },
},
activePath: [triggerName],
Expand Down
11 changes: 7 additions & 4 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 @@ -80,7 +80,7 @@ class StreamingLogs extends Component {
}
if (col === 'created_at') {
const formattedDate = new Date(r.created_at).toUTCString();
return formattedDate;
return <div className={conditionalClassname}>{formattedDate}</div>;
}
const content = r[col] === undefined ? 'NULL' : r[col].toString();
return <div className={conditionalClassname}>{content}</div>;
Expand All @@ -103,15 +103,18 @@ class StreamingLogs extends Component {
<div>
<button
onClick={this.watchChanges.bind(this)}
className={' btn btn-default'}
className={styles.watchBtn + ' btn btn-default'}
data-test="run-query"
>
{this.state.isWatching ? (
<span>
Streaming... <i className={'fa fa-spinner fa-spin'} />
<i className={'fa fa-pause'} /> Streaming...{' '}
<i className={'fa fa-spinner fa-spin'} />
</span>
) : (
'Stream Logs'
<span>
Stream Logs <i className={'fa fa-play'} />
</span>
)}
</button>
</div>
Expand Down
6 changes: 6 additions & 0 deletions console/src/components/Services/EventTrigger/TableCommon/Table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,9 @@ a.expanded {
padding-left: 5px;
}
}

.watchBtn {
i {
font-size: 12px;
}
}