Merge ~steverydz/maas:pod-refresh-message into maas:master

Proposed by Steve Rydz
Status: Merged
Approved by: Steve Rydz
Approved revision: 912afe58c37b63c8845c6f5933c1174a875b2ef0
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~steverydz/maas:pod-refresh-message
Merge into: maas:master
Diff against target: 19 lines (+8/-0)
1 file modified
src/maasserver/static/partials/pods-list.html (+8/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anthony Dillon Approve
Review via email: mp+363442@code.launchpad.net

Commit message

LP: #1815754 - Add pod refresh message to pod list

Description of the change

Done:
Add pod refresh message to pod listing page so it matches pod summary page

QA steps:
- Go to pod summary and refresh pod. See the message that appears at the top of the screen.
- Go to pod listing and refresh one or more pods. See the message that appears at the top of the screen.

Screenshots:
https://user-images.githubusercontent.com/501889/53111329-cae3a980-3534-11e9-9616-c0fe2f01e9fb.png
https://user-images.githubusercontent.com/501889/53111330-cae3a980-3534-11e9-8182-24027b202589.png

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Nice LGTM +1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b pod-refresh-message lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 912afe58c37b63c8845c6f5933c1174a875b2ef0

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/pods-list.html b/src/maasserver/static/partials/pods-list.html
2index bf5287b..0cbbe50 100644
3--- a/src/maasserver/static/partials/pods-list.html
4+++ b/src/maasserver/static/partials/pods-list.html
5@@ -31,6 +31,14 @@
6 <span data-ng-pluralize count="action.progress.errors" when="{'one': 'pod', 'other': 'pods'}"></span>,
7 see listing for specific error for each pod.
8 </p>
9+
10+ <div data-ng-if="action.option.name === 'refresh'" class="col-8">
11+ <p class="u-remove-max-width u-align--left">
12+ Refreshing <span data-ng-if="selectedItems.length === 1">this pod</span><span data-ng-if="selectedItems.length > 1">these pods</span> will cause MAAS to recalculate usage metrics, update information about storage pools,
13+ and commission any machines present in <span data-ng-if="selectedItems.length === 1">the pod</span><span data-ng-if="selectedItems.length > 1">the pods</span> that are not yet known to MAAS.
14+ </p>
15+ </div>
16+
17 <button class="p-button--base is-inline" type="button" data-ng-click="actionCancel()">Cancel</button>
18 <button class="is-inline" data-ng-class="action.option.name === 'delete' ? 'p-button--negative' : 'p-button--positive'" data-ng-click="actionGo()" data-ng-if="!hasActionsFailed()">
19 <span data-ng-if="action.option.name === 'refresh'">Refresh {$ selectedItems.length $}

Subscribers

People subscribed via source and target branches