Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LXD radio option to Add KVM form. #1051

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Add LXD radio option to Add KVM form. #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion legacy/src/app/controllers/pod_details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ function PodDetailsController(
$scope.machinesSearch = "pod:=" + $scope.pod.name;
setTimeout(() => {
$scope.machinesSearch = "pod-id:=" + $scope.pod.id;
}, 100);
}, 1000);
}
});
$scope.$watch("action.option", function(now, then) {
Expand Down
2 changes: 1 addition & 1 deletion legacy/src/app/controllers/pods_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function PodsListController(
if ($scope.onRSDSection()) {
$scope.add.obj.type = "rsd";
} else {
$scope.add.obj.type = "virsh";
$scope.add.obj.type = "lxd";
}
};

Expand Down
2 changes: 1 addition & 1 deletion legacy/src/app/partials/pod-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ <h3 class="p-heading--four">Storage configuration</h3>
</div>
</td>
</tr>
<tr class="p-table__row">
<tr class="p-table__row" ng-if="pod.type !== 'lxd'">
<td colspan="5">
<button class="p-button--base u-td-outdent-focusable--left p-button--narrow" data-ng-click="composeAddStorage(); sendAnalyticsEvent('KVM details', 'Add storage', 'KVM compose')">
<i class="p-icon--plus"></i>
Expand Down
42 changes: 37 additions & 5 deletions legacy/src/app/partials/pods-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<header class="p-strip--light is-shallow u-no-padding--bottom page-header" media-query="min-width: 769px">
<div class="row">
<div class="col-small-2 col-medium-4 col-8">
<h1 class="page-header__title">{$ getPageHeading() $}</h1>
<h1 class="page-header__title"><span ng-if="add.open">Add </span>{$ getPageHeading() $}</h1>
<p class="page-header__status u-no-margin--top" data-ng-show="loading"><span class="u-text--loading"><i class="p-icon--spinner u-animation--spin"></i> Loading...</span></p>
</div>
<div class="col-small-2 col-medium-2 col-4 u-align--right">
<div class="page-header__controls">
<ul class="p-inline-list u-no-margin--bottom">
<ul class="p-inline-list u-no-margin--bottom" ng-if="!add.open">
<li class="p-inline-list__item" ng-if="selectedItems.length">{$ selectedItems.length $} selected</li>
<li class="p-inline-list__item" ng-if="canAddPod()">
<button
Expand Down Expand Up @@ -96,12 +96,44 @@ <h1 class="page-header__title">{$ getPageHeading() $}</h1>
</div>
</div>
<div data-ng-class="{ 'u-hide': !add.open }">
<hr style="margin-bottom: 1rem" />
<maas-obj-form obj="add.obj" manager="podManager" manager-method="createItem"
save-on-blur="false" after-save="cancelAddPod" data-ng-if="add.open" class="p-form--stacked">
<div class="row">
<h3 class="page-header__dropdown-title p-heading--five">Add {$ getPageHeading() $}</h3>
<div class="row" ng-if="add.obj.type !== 'rsd'">
<div class="col-2">
<p>KVM host type</p>
</div>
<div class="col-4">
<ul class="p-inline-list">
<li class="p-inline-list__item" style="display: inline-block">
<input type="radio" data-ng-model="add.obj.type" id="lxd-pod" value="lxd" />
<label for="lxd-pod">LXD</label>
</li>
<li class="p-inline-list__item" style="display: inline-block">
<input type="radio" data-ng-model="add.obj.type" id="virsh-pod" value="virsh" />
<label for="virsh-pod">virsh</label>
</li>
</ul>
<!-- TODO Caleb 28/04/2020 - Replace with real copy when ready -->
<span ng-if="false">
<p ng-if="add.obj.type === 'lxd'">
Why would I like to add a LXD host?<br>
<a class="p-link--external">More about LXD hosts in MAAS...</a>
</p>
<p ng-if="add.obj.type === 'virsh'">
Why would I like to add a virsh host?<br>
<a class="p-link--external">More about virsh hosts in MAAS...</a>
</p>
</span>
</div>
<div class="col-6">
<maas-obj-field type="text" key="name" label="Name" label-width="2" input-width="4" placeholder="Name (optional)"></maas-obj-field>
<maas-obj-field type="options" key="zone" label="Zone" subtle="false" placeholder="Choose a zone" label-width="2" input-width="4" options="zone.id as zone.name for zone in zones"></maas-obj-field>
<maas-obj-field type="options" key="pool" label="Resource pool" subtle="false" placeholder="Choose a pool" label-width="2" input-width="4" options="pool.id as pool.name for pool in pools" style="margin-bottom: .5rem !important"></maas-obj-field>
<maas-pod-parameters class="row" hide-slider="true" hide-type="true"></maas-pod-parameters>
</div>
</div>
<div class="row">
<div class="row" ng-if="add.obj.type === 'rsd'">
<div class="col-6">
<maas-obj-field type="text" key="name" label="Name" label-width="2" input-width="4" placeholder="Name (optional)"></maas-obj-field>
<maas-obj-field type="options" key="zone" label="Zone" subtle="false" placeholder="Choose a zone" label-width="2" input-width="4" options="zone.id as zone.name for zone in zones"></maas-obj-field>
Expand Down