Mercurial > hg > thermostat-ng > web-client
changeset 213:c6f39f7d58e0
Use treelist view in jvm-list
Reviewed-by: jkang
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/025054.html
| author | Andrew Azores <aazores@redhat.com> |
|---|---|
| date | Mon, 18 Sep 2017 14:11:59 -0400 |
| parents | e1cc9561d3f5 |
| children | b1248ac0b1af |
| files | src/app/components/jvm-list/en.locale.yaml src/app/components/jvm-list/jvm-list.controller.js src/app/components/jvm-list/jvm-list.html |
| diffstat | 3 files changed, 37 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/app/components/jvm-list/en.locale.yaml Fri Sep 15 15:56:17 2017 -0400 +++ b/src/app/components/jvm-list/en.locale.yaml Mon Sep 18 14:11:59 2017 -0400 @@ -3,7 +3,6 @@ ALIVE_ONLY: Alive JVMs Only SYSTEM_INFO_LABEL: System Information START_TIME_LIST: Start Time: {{date}} - START_TIME_CARD: <strong>Start Time:</strong>{{date}} ERR_TITLE: Unable to retrieve data. ERR_MESSAGE: Error while retrieving Thermostat JVM Listing. @@ -17,4 +16,7 @@ sortConfig: TIME_CREATED_TITLE: 'Host: Time Created' - NUM_JVMS_TITLE: 'Host: Number of JVMs' \ No newline at end of file + NUM_JVMS_TITLE: 'Host: Number of JVMs' + + jvmEntry: + JVM_INFO_LINK: JVM Information
--- a/src/app/components/jvm-list/jvm-list.controller.js Fri Sep 15 15:56:17 2017 -0400 +++ b/src/app/components/jvm-list/jvm-list.controller.js Mon Sep 18 14:11:59 2017 -0400 @@ -49,11 +49,14 @@ useExpandingRows: true, onClick: item => $location.hash(this.changeLocationHash(item)) }; + $scope.jvmConfig = { + showSelectBox: false, + useExpandingRows: false + }; // Settings for pfPagination $scope.pageNumber = 1; - $scope.pageSize = 4; - $scope.pageSizeIncrements = [4, 8, 12, 16, 20]; + $scope.pageSize = 10; $scope.emptyStateConfig = { icon: 'pficon-warning-triangle-o', @@ -123,7 +126,11 @@ systemId: system.systemId, hostname: resp.data.response[0].hostname, jvms: system.jvms, - timeCreated: resp.data.response[0].timeCreated + timeCreated: resp.data.response[0].timeCreated, + pageConfig: { + pageNumber: 1, + pageSize: 5 + } }); } );
--- a/src/app/components/jvm-list/jvm-list.html Fri Sep 15 15:56:17 2017 -0400 +++ b/src/app/components/jvm-list/jvm-list.html Mon Sep 18 14:11:59 2017 -0400 @@ -40,32 +40,33 @@ </div> </div> <list-expanded-content> - <div class="jvmPagination col-md-12"> - <pf-pagination - page-size="pageSize" - page-number="pageNumber" - page-size-increments="pageSizeIncrements" - num-total-items="$parent.item.jvms.length"> - </pf-pagination> - </div> - <div ng-repeat="jvm in $parent.item.jvms | startFrom:(pageNumber - 1) * pageSize | limitTo:pageSize"> - <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3"> - <div ui-sref="jvmInfo({ systemId: $parent.$parent.item.systemId, jvmId: jvm.jvmId })" class="card-pf card-pf-view card-pf-view-select"> - <div class="card-pf-top-element"> - <span class="pficon pficon-virtual-machine card-pf-icon-circle"></span> + + <pf-list-view + custom-scope="{ systemId: $parent.item.systemId }" + items="$parent.item.jvms" + page-config="$parent.item.pageConfig" + config="jvmConfig"> + + <div class="list-view-pf-left"> + <span class="pficon pficon-virtual-machine list-view-pf-icon-med"></span> + </div> + <div class="list-view-pf-description"> + <div class="list-group-item-heading"> + {{item.mainClass}} + </div> + <div class="list-view-pf-additional-info"> + <div class="list-view-pf-additional-info-item" ng-click="$event.stopPropagation()"> + <span class="pficon pficon-container-node"></span> + <a ui-sref="jvmInfo({ systemId: $parent.$ctrl.customScope.systemId, jvmId: $parent.item.jvmId })" translate>jvmList.jvmEntry.JVM_INFO_LINK</a> </div> - <div class="card-pf-body"> - <h2 class="card-pf-title text-center ellipsis-word-wrap"> - {{jvm.mainClass | extractClass:true}} - </h2> - <div class="card-pf-info text-center" translate> - <span class="pull-right pficon" ng-class="jvm.isAlive ? 'pficon-ok' : 'pficon-error-circle-o'"></span> - <span translate="jvmList.START_TIME_CARD" translate-values="{ date: '{{jvm.startTime | timestampToDate}}' }"></span> - </div> + <div class="list-view-pf-additional-info-item"> + <span class="fa fa-clock-o"></span> + <span translate="jvmList.START_TIME_LIST" translate-values="{ date: '{{item.startTime | timestampToDate}}' }"></span> </div> </div> </div> - </div> + </pf-list-view> + </list-expanded-content> </pf-list-view> </div>