github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(ui): renovate the edge jobs edit page EE-3531 (#7192)

pull/7318/head^2
matias-portainer 2022-08-02 10:28:27 -03:00 committed by GitHub
parent 0580d3833a
commit b28f635fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html
View File

@ -2,14 +2,14 @@
<rd-widget> <rd-widget>
<rd-widget-body classes="no-padding"> <rd-widget-body classes="no-padding">
<div class="toolBar"> <div class="toolBar">
<div class="toolBarTitle"> <div class="toolBarTitle vertical-center">
<i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> <span><pr-icon icon="$ctrl.titleIcon" feather="true"></pr-icon></span>
{{ $ctrl.titleText }} {{ $ctrl.titleText }}
</div> </div>
</div> <div class="searchBar">
<div class="searchBar"> <span><pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon></span>
<i class="fa fa-search searchIcon" aria-hidden="true"></i> <input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus ng-model-options="{ debounce: 300 }" />
<input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus ng-model-options="{ debounce: 300 }" /> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover table-filters nowrap-cells"> <table class="table table-hover table-filters nowrap-cells">
@ -17,9 +17,9 @@
<tr> <tr>
<th> <th>
<a ng-click="$ctrl.changeOrderBy('Endpoint')"> <a ng-click="$ctrl.changeOrderBy('Endpoint')">
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && $ctrl.state.reverseOrder"></i>
Environment Environment
<span><pr-icon icon="'arrow-down'" feather="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && !$ctrl.state.reverseOrder"></pr-icon></span>
<span><pr-icon icon="'arrow-up'" feather="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && $ctrl.state.reverseOrder"></pr-icon></span>
</a> </a>
</th> </th>
<th> Actions </th> <th> Actions </th>
@ -52,7 +52,7 @@
<div class="paginationControls"> <div class="paginationControls">
<form class="form-inline"> <form class="form-inline">
<span class="limitSelector"> <span class="limitSelector">
<span style="margin-right: 5px"> Items per page </span> <span class="mr-1"> Items per page </span>
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect"> <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
<option value="0">All</option> <option value="0">All</option>
<option value="10">10</option> <option value="10">10</option>

11
app/edge/views/edge-jobs/edgeJob/edgeJob.html
View File

@ -6,7 +6,9 @@
<rd-widget-body> <rd-widget-body>
<uib-tabset active="$ctrl.state.activeTab"> <uib-tabset active="$ctrl.state.activeTab">
<uib-tab index="0" select="$ctrl.showEditor()"> <uib-tab index="0" select="$ctrl.showEditor()">
<uib-tab-heading> <i class="fa fa-wrench" aria-hidden="true"></i> Configuration </uib-tab-heading> <uib-tab-heading>
<span><pr-icon icon="'tool'" feather="true"></pr-icon></span> Configuration
</uib-tab-heading>
<edge-job-form <edge-job-form
ng-if="$ctrl.edgeJob && $ctrl.state.showEditorTab" ng-if="$ctrl.edgeJob && $ctrl.state.showEditorTab"
@ -22,13 +24,14 @@
</uib-tab> </uib-tab>
<uib-tab index="1"> <uib-tab index="1">
<uib-tab-heading> <i class="fa fa-tasks" aria-hidden="true"></i> Results </uib-tab-heading> <uib-tab-heading>
<span><pr-icon icon="'list'" feather="true"></pr-icon></span> Results
</uib-tab-heading>
<edge-job-results-datatable <edge-job-results-datatable
style="display: block; margin-top: 10px"
ng-if="$ctrl.results" ng-if="$ctrl.results"
title-text="Results" title-text="Results"
title-icon="fa-tasks" title-icon="list"
dataset="$ctrl.results" dataset="$ctrl.results"
table-key="edge-job-results" table-key="edge-job-results"
order-by="Status" order-by="Status"