Merge ~ya-bo-ng/maas:lp-1782801 into maas:master

[Anthony Dillon]

LP: #1782801 - Removing a specific cache set prompts user to remove all cache sets

Done
- Update the UI to only delete the selected cache set.
- Also tidied up some off the small screen elements.
- Added more verbose messaging to the destructive action.

QA
- Go to Node Details > Storage
- (Optional) Create some cache sets if none are available from available disks and partitions
- When you have more than two cache sets
- Select the contextual menu and click delete
- This should only display the confirmation under the selected cache set
- See that the confirmation button says "Remove cache set"

Screenshot
https://screenshots.firefox.com/2sLjvWfXgRsiWaoB/10.54.72.65

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-1782801 lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7c42726af1738bba68f67a6f8948341584ffa4c9

review: Approve

[Caleb Ellis (caleb-ellis)]

Looks good to me! +1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp-1782801 lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4436/consoleText

diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 5845156..c95c24b 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -1891,7 +1891,7 @@
                                     <td class="col-4" aria-label="Used by" title="{$ cacheset.used_by $}">{$ cacheset.used_by $}</td>
                                     <td class="col-2 p-table--action-cell">
                                         <div class="u-align--right">
-                                        <div class="p-contextual-menu" toggle-ctrl data-ng-if="canDeleteCacheSet(cacheset)">
+                                        <div class="p-contextual-menu" toggle-ctrl data-ng-if="canDeleteCacheSet(cacheset) && !cacheset.$selected">
                                             <button class="p-button--base is-small p-contextual-menu__toggle" data-ng-click="toggleMenu()">
                                                 <i class="p-icon--contextual-menu u-no-margin--right">Actions</i>
                                             </button>
@@ -1904,16 +1904,13 @@
                                         </div>
                                         </div>
                                     </td>
-                                    <td class="p-table-expanding__panel col-12" data-ng-if="cachesetsMode === 'delete'">
+                                    <td class="p-table-expanding__panel col-12" data-ng-if="cacheset.$selected && cachesetsMode === 'delete'">
                                         <div class="row" data-ng-if="windowWidth <= 768">
                                             <div class="col-8">
                                                 <h2 data-ng-click="filesystemCancel()" class="p-heading--four">
                                                     <span data-ng-if="cachesetsMode === 'delete'">Removing {$ cacheset.name $}</span>
                                                 </h2>
                                             </div>
-                                            <div class="col-4 u-float--right">
-                                                <i data-ng-click="filesystemCancel()" class="p-icon--close">Cancel</i>
-                                            </div>
                                         </div>
                                         <div class="row" data-ng-class="{ 'is-active': cachesetsMode !== null && cachesetsMode !== 'multi' }">
                                             <div data-ng-show="cachesetsMode === 'single' && canDeleteCacheSet(cacheset)">
@@ -1928,7 +1925,7 @@
                                                 <div class="col-4">
                                                     <div class="u-align--right">
                                                         <button class="p-button--base" type="button" data-ng-click="cacheSetCancel()">Cancel</button>
-                                                        <button class="p-button--negative u-no-margin--top" data-ng-click="cacheSetConfirmDelete(cacheset)">Remove</button>
+                                                        <button class="p-button--negative u-no-margin--top" data-ng-click="cacheSetConfirmDelete(cacheset)">Remove cache set</button>
                                                     </div>
                                                 </div>
                                             </div>