- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Add loading icon for guests tab
by Socorro Stoppler 17 Jun '16

17 Jun '16

Add 'loading' icon when in Guests tab as it may take a while to get the list of guests to appear Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2f5e757..fea8054 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -315,7 +315,7 @@ kimchi.initClone = function() { kimchi.listVmsAuto = function() { - + $('.wok-mask').removeClass('hidden'); //Check if the actions button is opened or not, //if opended stop the reload of the itens until closed var $isDropdownOpened = $('[name="guest-actions"] ul.dropdown-menu').is(":visible"); @@ -418,10 +418,12 @@ kimchi.listVmsAuto = function() { }); }); } + $('.wok-mask').fadeOut(300, function() {}); } else { $('.grid-control').addClass('hidden'); $('#guestListField').hide(); $('#noGuests').show(); + $('.wok-mask').fadeOut(300, function() {}); } } -- 2.5.0

3 2

[PATCH] [Kimchi] Save view for Guests tab
by Socorro Stoppler 17 Jun '16

17 Jun '16

This patch addresses the issue of the last view of the Guests tab not being remembered either after switching tabs or exiting Kimchi. When switching view from List to Gallery (or vice versa), the next time the user goes back to the Guests tab, whatever view it was last on should be what is shown when going back to the Guests tab. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2f5e757..fe6d48d 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -801,15 +801,64 @@ kimchi.guestSetRequestHeader = function(xhr) { }; kimchi.toggleGuestsGallery = function() { - $(".wok-guest-list, .wok-guest-gallery").toggleClass("wok-guest-list wok-guest-gallery"); - $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); - var text = $('#guest-gallery-table-button span.text').text(); - $('#guest-gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + $(".wok-guest-list, .wok-guest-gallery").toggleClass("wok-guest-list wok-guest-gallery"); + $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); + var text = $('#guest-gallery-table-button span.text').text(); + $('#guest-gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + var buttonText = $('#guest-gallery-table-button span.text').text(); + if (buttonText.indexOf("Gallery") !== -1) { + // Currently in list view + kimchi.setGuestView("guestView", "list"); + } else { + // Currently in gallery + kimchi.setGuestView("guestView", "gallery"); + } +}; + +kimchi.setGuestView = function(name, value) { + window.localStorage.setItem(name, value); +}; + +kimchi.readGuestView = function(name) { + var viewName = window.localStorage.getItem(name); + if (viewName !== "") { + return viewName; + } else { + return null; + } +}; + +kimchi.showGuestGallery = function() { + $(".wok-guest-list").addClass("wok-guest-gallery"); + $(".wok-list").addClass("wok-gallery"); + $(".wok-guest-gallery").removeClass("wok-guest-list"); + $(".wok-gallery").removeClass("wok-list"); + $('#guest-gallery-table-button span.text').text(i18n['KCHTMPL6004M']); +}; + +kimchi.showGuestList = function() { + $(".wok-guest-list").removeClass("wok-guest-gallery"); + $(".wok-list").removeClass("wok-gallery"); + $(".wok-guest-gallery").addClass("wok-guest-list"); + $(".wok-gallery").addClass("wok-list"); + $('#guest-gallery-table-button span.text').text(i18n['KCHTMPL6005M']); }; kimchi.guest_main = function() { $('body').addClass('wok-list'); - + var viewFound = kimchi.readGuestView("guestView"); + if (viewFound) { + if(viewFound === "gallery") { + // should be showing gallery + kimchi.showGuestGallery(); + } else { + // Should be showing list + kimchi.showGuestList(); + } + } else { + // Default to showing list + kimchi.showGuestList(); + } if (wok.tabMode['guests'] === 'admin') { $('.tools').attr('style', 'display'); $("#vm-add").on("click", function(event) { -- 2.5.0

2 1

[PATCH][Kimchi] Improve UI error codes checking
by Ramon Medeiros 17 Jun '16

17 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- check_ui_code_errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 59d631f..58dd231 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'KCH[0-9A-Z]*'| sort)" -uiErrors="$(grep -Ro 'KCH[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" +uiErrors="$(grep -ERo 'KCH[0-9A-Z]+' ui/js/ | cut -d: -f2 | sort| uniq)" # all errors on i18n are present in js/html files: success if [ "$errors" == "$uiErrors" ]; then -- 2.5.5

2 1

[PATCH] [Wok] Remove support for TLS v1.0 and add SSL timeout
by Lucio Correia 17 Jun '16

17 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index 8dd5d7c..f56f5c0 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -62,10 +62,11 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_protocols TLSv1.1 TLSv1.2; ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; ssl_prefer_server_ciphers on; ssl_dhparam ${dhparams_pem}; + ssl_session_timeout 10m; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 1.9.1

3 2

[PATCH] [Wok] Reduce from 5 to 2 seconds between notification requests
by Lucio Correia 16 Jun '16

16 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 2146b3d..55b8d0d 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -18,7 +18,7 @@ * limitations under the License. */ -wok.NOTIFICATION_INTERVAL = 5000 +wok.NOTIFICATION_INTERVAL = 2000 wok.postedNotifications = [] wok.tabMode = {}; -- 1.9.1

3 2

[PATCH] [Wok] Added lodash.js library to Wok
by sguimaraes943＠gmail.com 16 Jun '16

16 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Lodash makes JavaScript easier by taking the hassle out of working with arrays, numbers, objects, strings, etc. This library is necessary in order to redesign Ginger Sensor Monitors. With this library we can also improve other panels that have dynamically generated content that we have to iterate through arrays of objects. If the patch doesn't apply because it is a minified library, please let me know. Samuel Guimarães (1): Added lodash.js library to Wok configure.ac | 1 + ui/libs/Makefile.am | 2 +- ui/libs/lodash/LICENSE | 24 +++++++++ ui/libs/lodash/Makefile.am | 21 ++++++++ ui/libs/lodash/lodash.js | 127 +++++++++++++++++++++++++++++++++++++++++++++ ui/pages/login.html.tmpl | 1 + ui/pages/wok-ui.html.tmpl | 1 + 7 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 ui/libs/lodash/LICENSE create mode 100644 ui/libs/lodash/Makefile.am create mode 100644 ui/libs/lodash/lodash.js -- 1.9.3

4 4

[PATCH][Wok] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 16 Jun '16

16 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 1 + check_spec_errors.sh | 34 ++++++++++++++++++++++++++++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 325d0c9..579f707 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ check-local: echo "Check IBM license header and copyright date ..." ; \ /bin/bash check-IBM-license-header.sh ; \ fi + /bin/bash check_spec_errors.sh; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..fa67ced --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# create links +cp contrib/wok.spec.fedora contrib/wok_fedora.spec +cp contrib/wok.spec.suse contrib/wok_suse.spec + +# run checking +rpmlint contrib/wok_fedora.spec +rpmlint contrib/wok_suse.spec + +# remove links +rm contrib/wok_fedora.spec +rm contrib/wok_suse.spec + + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index e665cdb..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests + $ sudo yum install pyflakes python-pep8 python-requests rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 4fe3876..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -29,4 +29,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests rpmlint -- 2.5.5

3 4

[PATCH v2][Wok] Improve UI error codes checking
by Ramon Medeiros 16 Jun '16

16 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Use "+" instead of "*". This expression only match WOKXXXXXX, and no more WOK, what was causing trouble before check_ui_code_errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 4d9a8bd..6b7ea7e 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)" -uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" +uiErrors="$(grep -ERo 'WOK[0-9A-Z]+' ui/js/ | cut -d: -f2 | sort| uniq)" # all errors on i18n are present in js/html files: success if [ "$errors" == "$uiErrors" ]; then -- 2.5.5

3 3

[PATCH v2][Wok 0/2] Issue #118: logrotate fails
by Ramon Medeiros 16 Jun '16

16 Jun '16

Changes: v2: Add option to change log size on wok.conf Ramon Medeiros (2): Issue #118: logrotate fails Allow wok.conf determine log file size Makefile.am | 2 -- contrib/Makefile.am | 1 - contrib/wok.spec.fedora.in | 1 - contrib/wok.spec.suse.in | 1 - contrib/wokd.logrotate.in | 9 --------- src/wok.conf.in | 3 +++ src/wok/config.py.in | 1 + src/wok/server.py | 20 ++++++++++++++------ 8 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 contrib/wokd.logrotate.in -- 2.5.5

2 3

[PATCH][Kimchi] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 16 Jun '16

16 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 1 + check_spec_errors.sh | 34 ++++++++++++++++++++++++++++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 1b46773..85a44bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ check-local: echo "IBM copyright year verification ..." ; \ /bin/bash ../../../../check-IBM-license-header.sh ; \ fi + ./check_spec_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..b25da58 --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# create links +cp contrib/kimchi.spec.fedora contrib/kimchi_fedora.spec +cp contrib/kimchi.spec.suse contrib/kimchi_suse.spec + +# run checking +rpmlint contrib/kimchi_fedora.spec +rpmlint contrib/kimchi_suse.spec + +# remove links +rm contrib/kimchi_fedora.spec +rm contrib/kimchi_suse.spec + + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ca24994..65ad987 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -47,7 +47,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests python-mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a8763b3..16ffb5e 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -45,4 +45,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock rpmlint -- 2.5.5

2 2