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.

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

Release 0.2.10 #1091

Merged
merged 3 commits into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"angular-vs-repeat": "1.1.11",
"babel-polyfill": "6.26.0",
"cross-env": "6.0.3",
"jquery": "3.4.1",
"jquery": "3.5.0",
"js-cookie": "2.2.1",
"macaroon-bakery": "0.2.1",
"ng-tags-input": "3.2.0",
Expand Down
8 changes: 4 additions & 4 deletions legacy/src/app/controllers/node_details_networking.js
Original file line number Diff line number Diff line change
Expand Up @@ -1384,11 +1384,11 @@ export function NodeNetworkingController(
if (nic.tags) {
params.tags = nic.tags.map(tag => tag.text);
}
if (nic.link_speed && nic.formatted_link_speed) {
params.link_speed = nic.formatted_link_speed * 1000;
if (parseInt(nic.formatted_link_speed) >= 0) {
params.link_speed = parseInt(nic.formatted_link_speed) * 1000;
}
if (nic.interface_speed && nic.formatted_interface_speed) {
params.interface_speed = nic.formatted_interface_speed * 1000;
if (parseInt(nic.formatted_interface_speed) >= 0) {
params.interface_speed = parseInt(nic.formatted_interface_speed) * 1000;
}
return params;
};
Expand Down
2 changes: 1 addition & 1 deletion legacy/src/app/partials/directives/release-options.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-if="loading">
<i class="p-icon--spinner u-animation--spin" />
<i class="p-icon--spinner u-animation--spin"></i>
&nbsp;Loading...
</div>
<ul class="p-inline-list--settings u-no-margin--left" ng-if="!loading">
Expand Down
4 changes: 2 additions & 2 deletions legacy/src/app/partials/node-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ <h1 class="page-header__title">
<div class="row ng-hide" data-ng-show="action.showing_confirmation">
<div class="col-12">
<p>
<i class="p-icon--warning" /><b>Confirm:</b> {$ action.confirmation_message $}
<i class="p-icon--warning"></i><b>Confirm:</b> {$ action.confirmation_message $}
</p>
<div data-ng-repeat="confirmation_detail in action.confirmation_details">
<span>{$ confirmation_detail $}</span>
Expand Down Expand Up @@ -1686,7 +1686,7 @@ <h3 class="p-heading--five">{$ getInterfaceTypeText(interface) $} details</h3>
<div class="p-form__group row" data-ng-if="!isAllNetworkingDisabled(interface)">
<label class="p-form__label col-2">Tags</label>
<div class="p-form__control col-4 tags--inline">
<tags-input data-ng-model="interface.tags" allow-tags-pattern="[\w-]+"></tags-input>
<tags-input data-ng-model="editInterface.tags" allow-tags-pattern="[\w-]+"></tags-input>
</div>
</div>
<div class="p-form__group row p-form-validation" data-ng-class="{ 'is-error': !linkSpeedValid(editInterface) }" data-ng-if="editInterface.type === 'physical'">
Expand Down
4 changes: 2 additions & 2 deletions legacy/src/app/partials/nodes-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ <h1 class="page-header__title">{$ title $}</h1>
<section class="page-header__section row u-no-margin--top ng-hide" data-ng-show="tabs[tab].actionProgress.showing_confirmation">
<div class="col-12">
<p>
<i class="p-icon--warning" /><b>Confirm:</b> {$ tabs[tab].actionProgress.confirmation_message $}
<i class="p-icon--warning"></i><b>Confirm:</b> {$ tabs[tab].actionProgress.confirmation_message $}
</p>
<div data-ng-repeat="confirmation_detail in tabs[tab].actionProgress.confirmation_details">
<span>{$ confirmation_detail $}</span>
Expand Down Expand Up @@ -699,7 +699,7 @@ <h4 class="page-header__dropdown-title">Add device</h4>
<div class="row">
<div class="col-12">
<p>
<i class="p-icon--warning" /><b>Confirm:</b> {$ tabs.controllers.actionProgress.confirmation_message $}
<i class="p-icon--warning"></i><b>Confirm:</b> {$ tabs.controllers.actionProgress.confirmation_message $}
</p>
<div data-ng-repeat="confirmation_detail in tabs.controllers.actionProgress.confirmation_details">
<span>{$ confirmation_detail $}</span>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maas-ui",
"version": "0.2.9",
"version": "0.2.10",
"scripts": {
"build": "yarn build-shared",
"build-all": "yarn clean-all && yarn build-shared && yarn build-legacy && yarn build-ui && yarn copy-build",
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@maas-ui/ui",
"version": "0.2.9",
"version": "0.2.10",
"private": true,
"dependencies": {
"@canonical/macaroon-bakery": "0.3.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8009,10 +8009,10 @@ [email protected]:
import-local "^2.0.0"
jest-cli "^24.9.0"

jquery@3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==

js-base64@^2.1.8:
version "2.5.1"
Expand Down