Skip to content
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

Bump xmldom from 0.4.0 to 0.5.0 #1113

Closed
wants to merge 10 commits into from
+23 −22
Closed

Bump xmldom from 0.4.0 to 0.5.0 #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56de653
fix the channel report
bradsawadye Jan 5, 2021
697a044
Merge pull request #1108 from jembi/MOM-651
MattyJ007 Jan 7, 2021
b78eb6d
Bump package patch version
MattyJ007 Jan 7, 2021
41bd73d
Merge pull request #1109 from jembi/patch-version-bump
bradsawadye Jan 7, 2021
3b7a0a9
Bump axios from 0.21.0 to 0.21.1
dependabot[bot] Jan 14, 2021
fcd3211
Merge pull request #1110 from jembi/dependabot/npm_and_yarn/axios-0.21.1
MattyJ007 Jan 14, 2021
4c6c1de
Bump ini from 1.3.5 to 1.3.8
dependabot[bot] Jan 14, 2021
eb56394
Merge pull request #1111 from jembi/dependabot/npm_and_yarn/ini-1.3.8
rcrichton Jan 15, 2021
c5dbf1f
Bump xmldom from 0.4.0 to 0.5.0
dependabot[bot] Mar 12, 2021
acd72bc
Merge branch 'dato-3-release' into dependabot/npm_and_yarn/xmldom-0.5.0
de-laz May 4, 2021
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
24 changes: 12 additions & 12 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"winston": "3.3.3",
"winston-mongodb": "5.0.5",
"xml2js": "^0.4.23",
"xmldom": "^0.4.0",
"xmldom": "^0.5.0",
"xpath": "0.0.32"
},
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion src/reports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ function sendReports (job, flag, done) {
for (const key in totals) {
report.data[i][key] = totals[key]
}

report.data[i].channelName = data.channel.name
report.data[i].channelID = data.channel._id
report.data[i].totalStyle = (report.data[i].total > 0 ? '' : colorGrey)
report.data[i].avgRespStyle = (report.data[i].avgResp > 0 ? '' : colorGrey)
report.data[i].failedStyle = (report.data[i].failed > 0 ? 'color: red;' : colorGrey)
Expand Down
16 changes: 8 additions & 8 deletions templates/report/html.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@
</tr>
{{#each data}}
<tr style="{{rowColor}}">
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content00"><strong><a target="_blank" href="{{../consoleURL}}/#!/channels/{{this.channel._id}}">{{this.channel.name}}</a></strong></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content01"><a target="_blank" style="{{totalStyle}}" href="{{../consoleURL}}/#!/transactions?txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.total}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content02"><a target="_blank" style="{{avgRespStyle}}" href="{{../consoleURL}}/#!/channels/{{this.channel._id}}">{{this.avgResp}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content03"><a target="_blank" style="{{failedStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Failed&amp;txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.failed}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content04"><a target="_blank" style="{{successfulStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Successful&amp;txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.successful}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content05"><a target="_blank" style="{{processingStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Processing&amp;txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.processing}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content06"><a target="_blank" style="{{completedStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Completed&amp;txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.completed}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content07"><a target="_blank" style="{{completedWErrorsStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Completed%20with%20error(s)&amp;txChannel={{this.channel._id}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.completedWErrors}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content00"><strong><a target="_blank" href="{{../consoleURL}}/#!/channels/{{channelID}}">{{channelName}}</a></strong></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content01"><a target="_blank" style="{{totalStyle}}" href="{{../consoleURL}}/#!/transactions?txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{this.total}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content02"><a target="_blank" style="{{avgRespStyle}}" href="{{../consoleURL}}/#!/channels/{{channelID}}">{{this.avgResp}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content03"><a target="_blank" style="{{failedStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Failed&amp;txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{failed}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content04"><a target="_blank" style="{{successfulStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Successful&amp;txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{successful}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content05"><a target="_blank" style="{{processingStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Processing&amp;txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{processing}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content06"><a target="_blank" style="{{completedStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Completed&amp;txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{completed}}</a></td>
<td style="border: 1px solid black" valign="top" align="center" class="dataTableContent" mc:edit="data_table_content07"><a target="_blank" style="{{completedWErrorsStyle}}" href="{{../consoleURL}}/#!/transactions?txStatus=Completed%20with%20error(s)&amp;txChannel={{channelID}}&amp;startDate={{../reportStartDate}}&amp;endDate={{../reportEndDate}}">{{completedWErrors}}</a></td>
</tr>
{{/each}}
</table>
Expand Down