Skip to content

Commit

Permalink
#1807 Fix sort in observables list and display more dates
Browse files Browse the repository at this point in the history
  • Loading branch information
@nadouani
nadouani committed Mar 1, 2021
1 parent 5e046ba commit a5591d2
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 32 deletions.
8 changes: 2 additions & 6 deletions frontend/app/styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,11 @@ pre.clearpre {
}

.progress.progress-bar-sm {
height: 10px;
height: 4px;
}

.progress.progress-bar-sm .progress-bar {
line-height: 10px;
}

.progress.task-progress {
margin-bottom: 4px !important;
line-height: 4px;
}

.progress.task-progress .progress-bar {
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/views/directives/task-progress.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="progress task-progress progress-bar-sm mt-0">
<div class="progress task-progress progress-bar-sm mv-0">
<div class="progress-bar progress-bar-danger" style="{{waiting}}" uib-tooltip="{{tasks.Waiting}} Waiting"></div>
<div class="progress-bar progress-bar-success" style="{{completed}}" uib-tooltip="{{tasks.Completed}} Completed"></div>
<div class="progress-bar progress-bar-warning" style="{{progress}}" uib-tooltip="{{tasks.InProgress}} In Progress"></div>
Expand Down
17 changes: 8 additions & 9 deletions frontend/app/views/partials/case/case.list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
</a>
</th>
<th style="width: 150px;">Details</th>
<!-- <th style="width: 100px;">Observables</th> -->
<th style="width: 90px;">
<a href class="text-default ml-xxxs" ng-click="$vm.sortByField('assignee')" uib-tooltip="Sort by occur start date">
Assignee
Expand All @@ -86,7 +85,7 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
<th style="width: 150px">
Dates

<a href class="text-default ml-xxxs" ng-click="$vm.sortByField('startDate')" uib-tooltip="Sort by occur start date">
<a href class="text-default ml-xxxs" ng-click="$vm.sortByField('startDate')" uib-tooltip="Sort by start date">
S.
<i ng-show="$vm.filtering.context.sort.indexOf('+startDate') === -1 && $vm.filtering.context.sort.indexOf('-startDate') === -1" class="fa fa-sort"></i>
<i ng-show="$vm.filtering.context.sort.indexOf('+startDate') !== -1" class="fa fa-caret-up"></i>
Expand Down Expand Up @@ -178,29 +177,29 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
</div>
</td>
<td>
<div ng-class="{'text-danger': !!currentCase.extraData.actionRequired}">
<div ng-class="{'text-danger': !!currentCase.extraData.actionRequired}" class="clearfix">
<a href ng-click="$vm.addFilterValue('actionRequired', true)">
<span ng-if="!!currentCase.extraData.actionRequired" class="text-danger noline mr-xxxs" uib-tooltip="Action Required" tooltip-placement="left-middle">
<i class="fa fa-exclamation-triangle"></i>
</span>
</a>

<a ui-sref="app.case.tasks({caseId: currentCase._id})" ng-class="{'text-danger': !!currentCase.extraData.actionRequired}">
<ng-pluralize count="currentCase.extraData.taskStats.total" when="{'0': 'No Tasks', '1': '1 Task', 'other': '{} Tasks'}"></ng-pluralize>
<span>Tasks</span>
<strong class="pull-right">{{currentCase.extraData.taskStats.total || 0}}</strong>
</a>
</div>
<task-progress class="mt-0" ng-show="currentCase.extraData.taskStats.total > 0" tasks="currentCase.extraData.taskStats"></task-progress>

<div>
<div class="clearfix mt-xxs">

<a ui-sref="app.case.observables({caseId: currentCase._id})">
<ng-pluralize count="currentCase.extraData.observableStats.total" when="{'0': 'No Observables', '1': '1 Observable', 'other': '{} Observables'}"></ng-pluralize>
<span>Observables</span>
<strong class="pull-right">{{currentCase.extraData.observableStats.total || 0}}</strong>
</a>
</div>

</td>
<!-- <td>
<a ui-sref="app.case.observables({caseId: currentCase._id})">{{currentCase.extraData.observableStats.total}}</a>
</td> -->
<td class="nowrap">
<user user-id="currentCase.assignee" icon-only="true" icon-size="m"></user>
</td>
Expand Down
60 changes: 44 additions & 16 deletions frontend/app/views/partials/observables/list/observables.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,49 @@ <h4>
</th>
<th style="width: 100px">Flags</th>
<th style="width: 100px">
<a href class="text-default" ng-click="sortByField('dataType')">
Type
<i ng-show="artifacts.sort !== '+dataType' && artifacts.sort !== '-dataType'" class="fa fa-sort"></i>
<i ng-show="artifacts.sort === '+dataType'" class="fa fa-caret-up"></i>
<i ng-show="artifacts.sort === '-dataType'" class="fa fa-caret-down"></i>
</a>
<a href class="text-default ml-xxxs" ng-click="sortByField('dataType')" uib-tooltip="Sort by dataType">
Type
<i ng-show="filtering.context.sort.indexOf('+dataType') === -1 && filtering.context.sort.indexOf('-dataType') === -1" class="fa fa-sort"></i>
<i ng-show="filtering.context.sort.indexOf('+dataType') !== -1" class="fa fa-caret-up"></i>
<i ng-show="filtering.context.sort.indexOf('-dataType') !== -1" class="fa fa-caret-down"></i>
</a>
</th>
<th>
<a href class="text-default" ng-click="sortByField('data')">
<a href class="text-default ml-xxxs" ng-click="sortByField('data')" uib-tooltip="Sort by dataType">
Value/Filename
<i ng-show="filtering.context.sort.indexOf('+data') === -1 && filtering.context.sort.indexOf('-data') === -1" class="fa fa-sort"></i>
<i ng-show="filtering.context.sort.indexOf('+data') !== -1" class="fa fa-caret-up"></i>
<i ng-show="filtering.context.sort.indexOf('-data') !== -1" class="fa fa-caret-down"></i>
</a>
<!-- <a href class="text-default" ng-click="sortByField('data')">
Value/Filename
<i ng-show="artifacts.sort !== '+data' && artifacts.sort !== '-data'" class="fa fa-sort"></i>
<i ng-show="artifacts.sort === '+data'" class="fa fa-caret-up"></i>
<i ng-show="artifacts.sort === '-data'" class="fa fa-caret-down"></i>
</a>
</a> -->
</th>
<th style="width: 70px;"></th>
<th style="width: 120px">
<a href class="text-default" ng-click="sortByField('startDate')">
Date Added
<i ng-show="artifacts.sort !== '+startDate' && artifacts.sort !== '-startDate'" class="fa fa-sort"></i>
<i ng-show="artifacts.sort === '+startDate'" class="fa fa-caret-up"></i>
<i ng-show="artifacts.sort === '-startDate'" class="fa fa-caret-down"></i>
</a>
<th style="width: 150px">
Dates

<a href class="text-default ml-xxxs" ng-click="sortByField('startDate')" uib-tooltip="Sort by add date">
S.
<i ng-show="filtering.context.sort.indexOf('+startDate') === -1 && filtering.context.sort.indexOf('-startDate') === -1" class="fa fa-sort"></i>
<i ng-show="filtering.context.sort.indexOf('+startDate') !== -1" class="fa fa-caret-up"></i>
<i ng-show="filtering.context.sort.indexOf('-startDate') !== -1" class="fa fa-caret-down"></i>
</a>
<a href class="text-default ml-xxxs" ng-click="sortByField('_createdAt')" uib-tooltip="Sort by creation date">
C.
<i ng-show="filtering.context.sort.indexOf('+_createdAt') === -1 && filtering.context.sort.indexOf('-_createdAt') === -1" class="fa fa-sort"></i>
<i ng-show="filtering.context.sort.indexOf('+_createdAt') !== -1" class="fa fa-caret-up"></i>
<i ng-show="filtering.context.sort.indexOf('-_createdAt') !== -1" class="fa fa-caret-down"></i>
</a>
<a href class="text-default ml-xxxs" ng-click="sortByField('_updatedAt')" uib-tooltip="Sort by last update date">
U.
<i ng-show="filtering.context.sort.indexOf('+_updatedAt') === -1 && filtering.context.sort.indexOf('-_updatedAt') === -1" class="fa fa-sort"></i>
<i ng-show="filtering.context.sort.indexOf('+_updatedAt') !== -1" class="fa fa-caret-up"></i>
<i ng-show="filtering.context.sort.indexOf('-_updatedAt') !== -1" class="fa fa-caret-down"></i>
</a>
</th>
<th style="width: 40px;" if-permission="manageAction" allowed="{{userPermissions}}" ng-if="appConfig.connectors.cortex.enabled">Actions</th>
</tr>
Expand Down Expand Up @@ -95,7 +115,15 @@ <h4>
</a>
</td>
<td>
<a href ng-click="addFilterValue('startDate', artifact.startDate)"><span uib-tooltip="{{artifact.startDate | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{artifact.startDate | shortDate}}</span></a>
<div ng-class="{'text-bold': filtering.context.sort.indexOf('+startDate') !== -1 || filtering.context.sort.indexOf('-startDate') !== -1}">
S. <a href ng-click="addFilterValue('startDate', artifact.startDate)">{{artifact.startDate | shortDate}}</a>
</div>
<div ng-class="{'text-bold': filtering.context.sort.indexOf('+_createdAt') !== -1 || filtering.context.sort.indexOf('-_createdAt') !== -1}">
C. <a href ng-click="addFilterValue('_createdAt', artifact._createdAt)">{{artifact._createdAt | shortDate}}</a>
</div>
<div ng-if="artifact._updatedAt > 0" ng-class="{'text-bold': filtering.context.sort.indexOf('+_updatedAt') !== -1 || filtering.context.sort.indexOf('-_updatedAt') !== -1}">
U. <a href ng-click="addFilterValue('_updatedAt', artifact._updatedAt)">{{artifact._updatedAt | shortDate}}</a>
</div>
</td>
<td align="center" ng-if="appConfig.connectors.cortex.enabled" if-permission="manageAction" allowed="{{userPermissions}}">
<span>
Expand Down

0 comments on commit a5591d2

Please sign in to comment.