1
=== modified file 'src/maasserver/static/js/angular/controllers/node_details_storage.js'
2
--- src/maasserver/static/js/angular/controllers/node_details_storage.js	2015-10-23 16:34:24 +0000
3
+++ src/maasserver/static/js/angular/controllers/node_details_storage.js	2015-10-28 20:03:05 +0000
4
@@ -105,8 +105,6 @@
5
105
            }
105
            }
6
106
        ];
106
        ];
7
107
107
8
108
        $scope.editing = false;
9
109
        $scope.editing_tags = false;
10
110
        $scope.column = 'model';
108
        $scope.column = 'model';
11
111
        $scope.has_disks = false;
109
        $scope.has_disks = false;
12
112
        $scope.filesystems = [];
110
        $scope.filesystems = [];
13
@@ -492,6 +490,10 @@
14
492
490
15
493
        // Return true if another disk exists with name.
491
        // Return true if another disk exists with name.
16
494
        function isNameAlreadyInUse(name, exclude_disk) {
492
        function isNameAlreadyInUse(name, exclude_disk) {
17
493
            if(!angular.isArray($scope.node.disks)) {
18
494
                return false;
19
495
            }
20
496
21
495
            var i, j;
497
            var i, j;
22
496
            for(i = 0; i < $scope.node.disks.length; i++) {
498
            for(i = 0; i < $scope.node.disks.length; i++) {
23
497
                var disk = $scope.node.disks[i];
499
                var disk = $scope.node.disks[i];
24
@@ -631,6 +633,7 @@
25
631
            return false;
633
            return false;
26
632
        };
634
        };
27
633
635
28
636
        // Return true if the free space label should be shown.
29
634
        $scope.showFreeSpace = function(disk) {
637
        $scope.showFreeSpace = function(disk) {
30
635
            if(disk.type === "lvm-vg") {
638
            if(disk.type === "lvm-vg") {
31
636
                return true;
639
                return true;
32
@@ -1202,6 +1205,7 @@
33
1202
            var selected = $scope.getSelectedAvailable();
1205
            var selected = $scope.getSelectedAvailable();
34
1203
            if(selected.length === 1) {
1206
            if(selected.length === 1) {
35
1204
                return (
1207
                return (
36
1208
                    !selected[0].has_partitions &&
37
1205
                    !$scope.hasUnmountedFilesystem(selected[0]) &&
1209
                    !$scope.hasUnmountedFilesystem(selected[0]) &&
38
1206
                    selected[0].type !== "lvm-vg");
1210
                    selected[0].type !== "lvm-vg");
39
1207
            }
1211
            }
40
@@ -1471,7 +1475,11 @@
41
1471
                $scope.availableNew.spares.length);
1475
                $scope.availableNew.spares.length);
42
1472
            var minSize = Number.MAX_VALUE;
1476
            var minSize = Number.MAX_VALUE;
43
1473
            angular.forEach($scope.availableNew.devices, function(device) {
1477
            angular.forEach($scope.availableNew.devices, function(device) {
45
1474
                minSize = Math.min(minSize, device.original.available_size);
1478
                // Get the size of the device. For a block device it will be
46
1479
                // at available_size and for a partition it will be at size.
47
1480
                var deviceSize = (
48
1481
                    device.original.available_size || device.original.size);
49
1482
                minSize = Math.min(minSize, deviceSize);
50
1475
            });
1483
            });
51
1476
1484
52
1477
            // Calculate the new size.
1485
            // Calculate the new size.
53
@@ -1546,7 +1554,9 @@
54
1546
            if(selected.length > 0) {
1554
            if(selected.length > 0) {
55
1547
                var i;
1555
                var i;
56
1548
                for(i = 0; i < selected.length; i++) {
1556
                for(i = 0; i < selected.length; i++) {
58
1549
                    if($scope.hasUnmountedFilesystem(selected[i])) {
1557
                    if(selected[i].has_partitions) {
59
1558
                        return false;
60
1559
                    } else if($scope.hasUnmountedFilesystem(selected[i])) {
61
1550
                        return false;
1560
                        return false;
62
1551
                    } else if(selected[i].type === "lvm-vg") {
1561
                    } else if(selected[i].type === "lvm-vg") {
63
1552
                        return false;
1562
                        return false;
64
@@ -1573,7 +1583,9 @@
65
1573
        $scope.getNewVolumeGroupSize = function() {
1583
        $scope.getNewVolumeGroupSize = function() {
66
1574
            var total = 0;
1584
            var total = 0;
67
1575
            angular.forEach($scope.availableNew.devices, function(device) {
1585
            angular.forEach($scope.availableNew.devices, function(device) {
69
1576
                total += device.original.available_size;
1586
                // Add available_size or size if available_size is not set.
70
1587
                total += (
71
1588
                    device.original.available_size || device.original.size);
72
1577
            });
1589
            });
73
1578
            return ConverterService.bytesToUnits(total).string;
1590
            return ConverterService.bytesToUnits(total).string;
74
1579
        };
1591
        };
75
@@ -1703,33 +1715,33 @@
76
1703
            $scope.updateAvailableSelection(true);
1715
            $scope.updateAvailableSelection(true);
77
1704
        };
1716
        };
78
1705
1717
79
1718
        // Return true when tags can be edited.
80
1719
        $scope.canEditTags = function(disk) {
81
1720
            return disk.type !== "partition" && disk.type !== "lvm-vg";
82
1721
        };
83
1722
84
1706
        // Called to enter tag editing mode
1723
        // Called to enter tag editing mode
111
1707
        $scope.editTags = function() {
1724
        $scope.availableEditTags = function(disk) {
112
1708
            if($scope.$parent.canEdit() && !$scope.editing) {
1725
            disk.$options = {
113
1709
                $scope.editing = true;
1726
                editingTags: true,
114
1710
                $scope.editing_tags = true;
1727
                tags: angular.copy(disk.tags)
115
1711
            }
1728
            };
116
1712
        };
1729
        };
117
1713
1730
118
1714
        // Called to cancel editing.
1731
        // Called to cancel editing tags.
119
1715
        $scope.cancelTags = function() {
1732
        $scope.availableCancelTags = function(disk) {
120
1716
            $scope.editing = false;
1733
            disk.$options = {};
121
1717
            $scope.editing_tags = false;
1734
        };
122
1718
            updateDisks();
1735
123
1719
        };
1736
        // Called to save the tag changes.
124
1720
1737
        $scope.availableSaveTags = function(disk) {
125
1721
        // Called to save the changes.
1738
            var tags = [];
126
1722
        $scope.saveTags = function() {
1739
            angular.forEach(disk.$options.tags, function(tag) {
127
1723
            $scope.editing = false;
1740
                tags.push(tag.text);
102
1724
            $scope.editing_tags = false;
103
1725
104
1726
            angular.forEach($scope.available, function(disk) {
105
1727
                var tags = [];
106
1728
                angular.forEach(disk.tags, function(tag) {
107
1729
                    tags.push(tag.text);
108
1730
                });
109
1731
                NodesManager.updateDiskTags(
110
1732
                    $scope.node, disk.block_id, tags);
128
1733
            });
1741
            });
129
1742
            NodesManager.updateDiskTags(
130
1743
                $scope.node, disk.block_id, tags);
131
1744
            disk.tags = disk.$options.tags;
132
1745
            disk.$options = {};
133
1734
        };
1746
        };
134
1735
    }]);
1747
    }]);
135
1736
1748
136
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js'
137
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2015-10-23 18:39:01 +0000
138
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2015-10-28 20:03:05 +0000
139
@@ -252,7 +252,6 @@
140
252
252
141
253
    it("sets initial values", function() {
253
    it("sets initial values", function() {
142
254
        var controller = makeController();
254
        var controller = makeController();
143
255
        expect($scope.editing).toBe(false);
144
256
        expect($scope.column).toBe('model');
255
        expect($scope.column).toBe('model');
145
257
        expect($scope.has_disks).toBe(false);
256
        expect($scope.has_disks).toBe(false);
146
258
        expect($scope.filesystems).toEqual([]);
257
        expect($scope.filesystems).toEqual([]);
147
@@ -3277,6 +3276,25 @@
148
3277
            expect($scope.getNewRAIDSize()).toBe("2.0 MB");
3276
            expect($scope.getNewRAIDSize()).toBe("2.0 MB");
149
3278
        });
3277
        });
150
3279
3278
151
3279
        it("gets proper raid-0 size using size", function() {
152
3280
            var controller = makeController();
153
3281
            var disk0 = {
154
3282
                original: {
155
3283
                    size: 1000 * 1000
156
3284
                }
157
3285
            };
158
3286
            var disk1 = {
159
3287
                original: {
160
3288
                    size: 1000 * 1000
161
3289
                }
162
3290
            };
163
3291
            $scope.availableNew.spares = [];
164
3292
            $scope.availableNew.devices = [disk0, disk1];
165
3293
            $scope.availableNew.mode = $scope.getAvailableRAIDModes()[0];
166
3294
167
3295
            expect($scope.getNewRAIDSize()).toBe("2.0 MB");
168
3296
        });
169
3297
170
3280
        it("gets proper raid-1 size", function() {
3298
        it("gets proper raid-1 size", function() {
171
3281
            var controller = makeController();
3299
            var controller = makeController();
172
3282
            var disk0 = {
3300
            var disk0 = {
173
@@ -3632,6 +3650,29 @@
174
3632
3650
175
3633
            expect($scope.getNewVolumeGroupSize()).toBe("3.0 MB");
3651
            expect($scope.getNewVolumeGroupSize()).toBe("3.0 MB");
176
3634
        });
3652
        });
177
3653
178
3654
        it("return the total of all devices using size", function() {
179
3655
            var controller = makeController();
180
3656
            $scope.availableNew.devices = [
181
3657
                {
182
3658
                    original: {
183
3659
                        size: 1000 * 1000
184
3660
                    }
185
3661
                },
186
3662
                {
187
3663
                    original: {
188
3664
                        size: 1000 * 1000
189
3665
                    }
190
3666
                },
191
3667
                {
192
3668
                    original: {
193
3669
                        size: 1000 * 1000
194
3670
                    }
195
3671
                }
196
3672
            ];
197
3673
198
3674
            expect($scope.getNewVolumeGroupSize()).toBe("3.0 MB");
199
3675
        });
200
3635
    });
3676
    });
201
3636
3677
202
3637
    describe("createVolumeGroupCanSave", function() {
3678
    describe("createVolumeGroupCanSave", function() {
203
@@ -3925,83 +3966,90 @@
204
3925
        });
3966
        });
205
3926
    });
3967
    });
206
3927
3968
254
3928
    describe("editTags", function() {
3969
    describe("canEditTags", function() {
255
3929
3970
256
3930
        it("doesnt sets editing to true if cannot edit", function() {
3971
        it("returns false for partition", function() {
257
3931
            var controller = makeController();
3972
            var controller = makeController();
258
3932
            canEditSpy.and.returnValue(false);
3973
            expect($scope.canEditTags({
259
3933
            $scope.editing = false;
3974
                type: "partition"
260
3934
            $scope.editing_tags = false;
3975
            })).toBe(false);
261
3935
            $scope.editTags();
3976
        });
262
3936
            expect($scope.editing).toBe(false);
3977
263
3937
            expect($scope.editing_tags).toBe(false);
3978
        it("returns false for lvm-vg", function() {
264
3938
        });
3979
            var controller = makeController();
265
3939
3980
            expect($scope.canEditTags({
266
3940
        it("sets editing to true", function() {
3981
                type: "lvm-vg"
267
3941
            var controller = makeController();
3982
            })).toBe(false);
268
3942
            canEditSpy.and.returnValue(true);
3983
        });
269
3943
            $scope.editing = false;
3984
270
3944
            $scope.editing_tags = false;
3985
        it("returns true for physical", function() {
271
3945
            $scope.editTags();
3986
            var controller = makeController();
272
3946
            expect($scope.editing).toBe(true);
3987
            expect($scope.canEditTags({
273
3947
            expect($scope.editing_tags).toBe(true);
3988
                type: "physical"
274
3948
        });
3989
            })).toBe(true);
275
3949
    });
3990
        });
276
3950
3991
277
3951
    describe("cancelTags", function() {
3992
        it("returns true for virtual", function() {
278
3952
3993
            var controller = makeController();
279
3953
        it("sets editing to false", function() {
3994
            expect($scope.canEditTags({
280
3954
            var controller = makeController();
3995
                type: "virtual"
281
3955
            $scope.editing = true;
3996
            })).toBe(true);
282
3956
            $scope.editing_tags = true;
3997
        });
283
3957
            $scope.cancelTags();
3998
    });
284
3958
            expect($scope.editing).toBe(false);
3999
285
3959
            expect($scope.editing_tags).toBe(false);
4000
    describe("availableEditTags", function() {
286
3960
        });
4001
287
3961
4002
        it("sets $options", function() {
288
3962
        it("calls updateDisks", function() {
4003
            var controller = makeController();
289
3963
            var controller = makeController();
4004
            var tags = [{}, {}];
290
3964
4005
            var disk = {
291
3965
            // Updates disks so we can check that updateStorage
4006
                tags: tags
292
3966
            // is called.
4007
            };
293
3967
            node.disks = [
4008
294
3968
                {
4009
            $scope.availableEditTags(disk);
295
3969
                    id: 0,
4010
            expect(disk.$options.editingTags).toBe(true);
296
3970
                    model: makeName("model"),
4011
            expect(disk.$options.tags).toEqual(tags);
297
3971
                    tags: [],
4012
            expect(disk.$options.tags).not.toBe(tags);
298
3972
                    available_size: 0,
4013
        });
299
3973
                    filesystem: null,
4014
    });
300
3974
                    partitions: null
4015
301
4016
    describe("availableCancelTags", function() {
302
4017
303
4018
        it("clears $options", function() {
304
4019
            var controller = makeController();
305
4020
            var options = {};
306
4021
            var disk = { $options: options };
307
4022
308
4023
            $scope.availableCancelTags(disk);
309
4024
            expect(disk.$options).toEqual({});
310
4025
            expect(disk.$options).not.toBe(options);
311
4026
        });
312
4027
    });
313
4028
314
4029
    describe("availableSaveTags", function() {
315
4030
316
4031
        it("calls NodesManager.updateDiskTags", function() {
317
4032
            var controller = makeController();
318
4033
            var tags = [
319
4034
                { text: "new" },
320
4035
                { text: "old" }
321
4036
            ];
322
4037
            var disk = {
323
4038
                block_id: makeInteger(0, 100),
324
4039
                tags: [],
325
4040
                $options: {
326
4041
                   editingTags:true,
327
4042
                   tags: tags
328
3975
                }
4043
                }
358
3976
            ];
4044
            };
359
3977
4045
            spyOn(NodesManager, "updateDiskTags");
360
3978
            $scope.nodeLoaded();
4046
361
3979
            $rootScope.$digest();
4047
            $scope.availableSaveTags(disk);
362
3980
            var filesystems = $scope.filesystems;
4048
363
3981
            var available = $scope.available;
4049
            expect(NodesManager.updateDiskTags).toHaveBeenCalledWith(
364
3982
            var used = $scope.used;
4050
                node, disk.block_id, ["new", "old"]);
365
3983
            $scope.editing = true;
4051
            expect(disk.$options).toEqual({});
366
3984
            $scope.editing_tags = true;
4052
            expect(disk.tags).toEqual(tags);
338
3985
            $scope.cancelTags();
339
3986
340
3987
            // Verify cancel calls updateStorage but doesn't change any data
341
3988
            expect($scope.filesystems).toEqual(filesystems);
342
3989
            expect($scope.available).toEqual(available);
343
3990
            expect($scope.used).toEqual(used);
344
3991
        });
345
3992
    });
346
3993
347
3994
    describe("saveTags", function() {
348
3995
349
3996
        it("sets editing to false", function() {
350
3997
            var controller = makeController();
351
3998
352
3999
            $scope.editing = true;
353
4000
            $scope.editing_tags = true;
354
4001
            $scope.saveTags();
355
4002
356
4003
            expect($scope.editing).toBe(false);
357
4004
            expect($scope.editing_tags).toBe(false);
367
4005
        });
4053
        });
368
4006
    });
4054
    });
369
4007
});
4055
});
370
4008
4056
371
=== modified file 'src/maasserver/static/partials/node-details.html'
372
--- src/maasserver/static/partials/node-details.html	2015-10-28 18:53:35 +0000
373
+++ src/maasserver/static/partials/node-details.html	2015-10-28 20:03:05 +0000
374
@@ -828,11 +828,19 @@
375
828
                                    <div class="table__data table__column--15" colspan="2" data-ng-show="column === 'model'">{$ item.model $}</div>
828
                                    <div class="table__data table__column--15" colspan="2" data-ng-show="column === 'model'">{$ item.model $}</div>
376
829
                                    <div class="table__data table__column--15 ng-hide" colspan="2" data-ng-show="column === 'serial'">{$ item.serial $}</div>
829
                                    <div class="table__data table__column--15 ng-hide" colspan="2" data-ng-show="column === 'serial'">{$ item.serial $}</div>
377
830
                                    <div class="table__data table__tags table__column--15">
830
                                    <div class="table__data table__tags table__column--15">
379
831
                                        <span class="table__tag" data-ng-repeat="tag in item.tags" data-ng-hide="editing_tags">
831
                                        <span class="table__tag" data-ng-repeat="tag in item.tags" data-ng-hide="item.$options.editingTags">
380
832
                                            <a href="#/node/?query=storage_tags:({$ tag.text $})">{$ tag.text $}</a>
832
                                            <a href="#/node/?query=storage_tags:({$ tag.text $})">{$ tag.text $}</a>
381
833
                                        </span>
833
                                        </span>
384
834
                                        <tags-input ng-model="item.tags" data-ng-show="editing_tags" allow-tags-pattern="[\w-]+"></tags-input>
834
                                        <tags-input ng-model="item.$options.tags" data-ng-show="item.$options.editingTags" allow-tags-pattern="[\w-]+"></tags-input>
385
835
                                        <a class="table__controls table__controls--secondary">edit</a>
835
                                        <a class="table__controls table__controls--secondary"
386
836
                                            data-ng-hide="!canEditTags(item) || item.$options.editingTags"
387
837
                                            data-ng-click="availableEditTags(item)">edit</a>
388
838
                                        <a class="link-cta-ubuntu text-button"
389
839
                                            data-ng-show="item.$options.editingTags"
390
840
                                            data-ng-click="availableCancelTags(item)">Cancel</a>
391
841
                                        <button class="cta-ubuntu"
392
842
                                            data-ng-show="item.$options.editingTags"
393
843
                                            data-ng-click="availableSaveTags(item)">Save</button>
394
836
                                    </div>
844
                                    </div>
395
837
                                    <div class="table__data table__column--7">
845
                                    <div class="table__data table__column--7">
396
838
                                        <div class="table__controls">
846
                                        <div class="table__controls">
Reviewer	Date Requested	Status
Mike Pontillo (community)	2015-10-28	Approve on 2015-10-28
Lee Trager (community)	2015-10-28	Approve on 2015-10-28
Review via email: mp+276041@code.launchpad.net