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

Jump to bottom

ft: adding async pending option to channel #616

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

ft: adding async pending option to channel #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba739aa
ft: adding async pending option to channel
brett-onions Sep 8, 2023
cb8fbd1
Merge branch 'master' into ft-async-processing-web
brett-onions Sep 21, 2023
613f228
Added status filter for Pending Async
brett-onions Sep 27, 2023
2c48f4b
More descriptive wording for async option
brett-onions Sep 27, 2023
dc1ee2e
Add pending async status to transaction status filter
arran-standish Sep 28, 2023
fe369cc
bumping minor version v1.19.0
brett-onions Sep 28, 2023
6ef2b8b
Merge branch 'ft-async-processing-web' of https://github.com/jembi/op…
brett-onions Sep 28, 2023
7c87871
updating versioning in config files
brett-onions Sep 28, 2023
5f42b39
Add Pending Async status to task details view
arran-standish Sep 29, 2023
f328858
Merge branch 'ft-async-processing-web' of github.com:jembi/openhim-co…
arran-standish Sep 29, 2023
70bc01a
Remove duplicate transaction pending async filter and add it to task …
arran-standish Sep 29, 2023
1e13844
Adding Pending Async to Task Views
brett-onions Oct 6, 2023
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 app/config/default-env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.18.2",
"version": "1.19.0",
"minimumCoreVersion": "5.2.0",
"protocol": "${OPENHIM_CONSOLE_PROTOCOL}",
"host": "${OPENHIM_CORE_MEDIATOR_HOSTNAME}",
Expand Down
2 changes: 1 addition & 1 deletion app/config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.18.2",
"version": "1.19.0",
"minimumCoreVersion": "5.0.0",
"protocol": "https",
"host": "localhost",
Expand Down
1 change: 1 addition & 0 deletions app/scripts/controllers/channel-tabs/basicInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export function channelBasicInfoCtrl ($scope, $timeout, $interval, Api, Notify,
$scope.channel.type = 'http'
$scope.channel.authType = 'private'
$scope.channel.status = 'enabled'
$scope.channel.isAsynchronousProcess = false
}

$scope.$on('$destroy', function () {
Expand Down
8 changes: 8 additions & 0 deletions app/views/partials/channels-tab-basic-info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@
</div>
</div>

<div class="form-group-2columns">
<label style="display: block;">Is Asynchronous Process</label>
<div class="btn-group" style="margin-bottom: 10px">
<label class="btn btn-primary" ng-model="channel.isAsynchronousProcess" uib-btn-radio="true">Enabled</label>
<label class="btn btn-primary" ng-model="channel.isAsynchronousProcess" uib-btn-radio="false">Disabled</label>
</div>
</div>

<div style="border-top: 1px solid #eee;">
<div class="form-group" style="width: 45%" ng-class="{ 'has-error' : ngError.timeout }">
<label style="display: block;">
Expand Down
1 change: 1 addition & 0 deletions app/views/partials/tasks-filter-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<option value="">Don't filter</option>
<option value="Queued">Show Queued</option>
<option value="Processing">Show Processing</option>
<option value="Pending Async">Show Pending Async</option>
<option value="Paused">Show Paused</option>
<option value="Cancelled">Show Cancelled</option>
<option value="Completed">Show Completed</option>
Expand Down
1 change: 1 addition & 0 deletions app/views/partials/transaction-filter-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
<option value="">Don't filter</option>
<option value="Failed">Show Failed</option>
<option value="Processing">Show Processing</option>
<option value="Pending Async">Show Pending Async</option>
<option value="Completed">Show Completed</option>
<option value="Completed with error(s)">Show Completed with error(s)</option>
<option value="Successful">Show Successful</option>
Expand Down
4 changes: 4 additions & 0 deletions app/views/taskDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ <h2><i class="glyphicon glyphicon-repeat"></i>&nbsp;&nbsp;Task #{{task._id}}</h2
<div class="data-value">
<span ng-if="task.status === 'Completed'" class="label label-success">Completed</span>
<span ng-if="task.status === 'Processing'" class="label label-warning">Processing</span>
<span ng-if="task.status === 'Pending Async'" class="label label-info">Pending Async</span>
<span ng-if="task.status === 'Queued'" class="label label-info">Queued</span>
<span ng-if="task.status === 'Paused'" class="label label-primary">Paused</span>
<span ng-if="task.status === 'Cancelled'" class="label label-danger">Cancelled</span>
Expand All @@ -37,6 +38,7 @@ <h2><i class="glyphicon glyphicon-repeat"></i>&nbsp;&nbsp;Task #{{task._id}}</h2
<div class="data-value">
<uib-progressbar ng-if="task.status === 'Completed'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="success"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Processing' || task.status === 'Queued'" class="progress-striped active" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="warning"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Pending Async'" class="progress-striped active" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="info"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Paused'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="default"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Cancelled'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="danger"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
</div>
Expand Down Expand Up @@ -110,6 +112,7 @@ <h2><i class="glyphicon glyphicon-repeat"></i>&nbsp;&nbsp;Task #{{task._id}}</h2
<option value="">Don't filter</option>
<option value="Failed">Show Failed</option>
<option value="Processing">Show Processing</option>
<option value="Pending Async">Show Pending Async</option>
<option value="Completed">Show Completed</option>
<option value="Completed with error(s)">Show Completed with error(s)</option>
<option value="Successful">Show Successful</option>
Expand Down Expand Up @@ -205,6 +208,7 @@ <h4>Pagination: </h4>
<span ng-if="transaction.rerunStatus === 'Successful'" class="label label-success">Successful</span>
<span ng-if="transaction.rerunStatus === 'Completed'" class="label label-success">Completed</span>
<span ng-if="transaction.rerunStatus === 'Processing'" class="label label-info">Processing</span>
<span ng-if="transaction.rerunStatus === 'Pending Async'" class="label label-info">Pending Async</span>
<span ng-if="transaction.rerunStatus === 'Completed with error(s)'" class="label label-warning">Completed with error(s)</span>
<span ng-if="transaction.rerunStatus === 'Failed'" class="label label-danger">Failed</span>
</td>
Expand Down
2 changes: 2 additions & 0 deletions app/views/tasks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ <h2><i class="glyphicon glyphicon-repeat"></i>&nbsp;&nbsp;Rerun Tasks</h2>

<span ng-if="task.status === 'Completed'" class="label label-success">Completed</span>
<span ng-if="task.status === 'Processing'" class="label label-warning">Processing</span>
<span ng-if="task.status === 'Pending Async'" class="label label-info">Pending Async</span>
<span ng-if="task.status === 'Queued'" class="label label-info">Queued</span>
<span ng-if="task.status === 'Paused'" class="label label-primary">Paused</span>
<span ng-if="task.status === 'Cancelled'" class="label label-danger">Cancelled</span>
Expand All @@ -81,6 +82,7 @@ <h2><i class="glyphicon glyphicon-repeat"></i>&nbsp;&nbsp;Rerun Tasks</h2>
<td ng-click="viewTaskDetails('tasks/' + task._id)" data-title="Progress">
<uib-progressbar ng-if="task.status === 'Completed'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="success"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Processing' || task.status === 'Queued'" class="progress-striped active" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="warning"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Pending Async'" class="progress-striped active" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="info"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Paused'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="default"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
<uib-progressbar ng-if="task.status === 'Cancelled'" class="progress-striped" max="task.totalTransactions" animate="false" value="getProcessedTotal(task)" type="danger"><i>{{getProcessedPercentage(task)}}</i></uib-progressbar>
</td>
Expand Down
1 change: 1 addition & 0 deletions app/views/transactionDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h2>
<span ng-if="transactionDetails.status === 'Successful'" class="label label-success">Successful</span>
<span ng-if="transactionDetails.status === 'Completed'" class="label label-completed">Completed</span>
<span ng-if="transactionDetails.status === 'Processing'" class="label label-info">Processing</span>
<span ng-if="transactionDetails.status === 'Pending Async'" class="label label-info">Pending Async</span>
<span ng-if="transactionDetails.status === 'Completed with error(s)'" class="label label-completed-with-errors">Completed with error(s)</span>
<span ng-if="transactionDetails.status === 'Failed'" class="label label-danger">Failed</span>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/views/transactions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ <h3 style="margin: 20px;">
<span ng-if="transaction.status === 'Successful'" class="label label-success">Successful</span>
<span ng-if="transaction.status === 'Completed'" class="label label-completed">Completed</span>
<span ng-if="transaction.status === 'Processing'" class="label label-info">Processing</span>
<span ng-if="transaction.status === 'Pending Async'" class="label label-info">Pending Async</span>
<span ng-if="transaction.status === 'Completed with error(s)'" class="label label-completed-with-errors">Completed with error(s)</span>
<span ng-if="transaction.status === 'Failed'" class="label label-danger">Failed</span>
</td>
Expand Down
2 changes: 1 addition & 1 deletion 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
@@ -1,7 +1,7 @@
{
"name": "openhim-console",
"description": "This application provides a web application to configure and manage the OpenHIM-core component.",
"version": "1.18.3",
"version": "1.19.0",
"dependencies": {
"http-server": "^14.1.1",
"keycloak-js": "^20.0.3",
Expand Down