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

Allow user to receive notification #39

Merged
merged 4 commits into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from 3 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
Binary file added app/assets/images/kuroko2/kuroko-logo-error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/kuroko2/kuroko-logo-success.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions app/assets/javascripts/kuroko2/application.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//= require jquery
//= require jquery_ujs
//= require ./bootstrap
//= require ./js.cookie.js
//= stub kuroko2/instance_linker
//= require_tree
//= require moment
Expand All @@ -25,4 +26,42 @@ jQuery(function ($) {
$(".right-side").toggleClass("strech");
}
});

var showNotificationStatus = function () {
if (Notification.permission === 'granted') {
if (Cookies.get('notification') === 'on') {
$('#notification').html("<i class=\"fa fa-volume-up\"></i> on");
} else {
$('#notification').html("<i class=\"fa fa-volume-off\"></i> off");
}
} else if (Notification.permission === 'denied') {
$('#notification').html("<i class=\"fa fa-volume-off\"></i> off");
}
}

$('#notification').click(function (e) {
if (!('Notification' in window)) {
return;
}

if (Notification.permission === 'default') {
Notification.requestPermission(function (permission) {
if (permission === "granted") {
Cookies.set('notification', 'on');
}
showNotificationStatus();
});
} else if (Notification.permission === 'granted') {
if (Cookies.get('notification') === 'on') {
Cookies.set('notification', 'off');
} else {
Cookies.set('notification', 'on');
}
showNotificationStatus();
}
});

if ('Notification' in window) {
showNotificationStatus();
}
});
17 changes: 17 additions & 0 deletions app/assets/javascripts/kuroko2/job_instances.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,28 @@

jQuery(function ($) {
var logIntervalId;
var notifyIfNeeded = function (status, name) {
if (!('Notification' in window)) {
return;
}

if (Notification.permission === 'granted' && Cookies.get('notification') === 'on') {
var notification = new Notification(
"[" + status + "] " + name,
{"icon": window.location.origin + "/assets/kuroko2/kuroko-logo-" + status.toLowerCase() + ".png"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not necessarily to mount kuroko2 engine on root.
How about using the rails generated path or URL in any data attribute?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assets within an engine are put into /assets path. This code will work.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops... I'm sorry, what I pointed out is mistake 😢
But the same situation will occur using config.assets.prefix or config.action_controller.asset_host, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your are right. I will change it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 7ecc693

);
notification.onclick = function () {
notification.close();
window.focus();
};
}
};
var updateInstance = function () {
var instancePath = $('#instance').data("instance-path");

$.get(instancePath, function (data) {
$('#instance').replaceWith(data);
notifyIfNeeded($('#instance-status').text(), $('#definition-name').text());
});
};
var updateLogs = function () {
Expand Down
156 changes: 156 additions & 0 deletions app/assets/javascripts/kuroko2/js.cookie.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
/*!
* JavaScript Cookie v2.1.3
* https://github.com/js-cookie/js-cookie
*
* Copyright 2006, 2015 Klaus Hartl & Fagner Brack
* Released under the MIT license
*/
;(function (factory) {
var registeredInModuleLoader = false;
if (typeof define === 'function' && define.amd) {
define(factory);
registeredInModuleLoader = true;
}
if (typeof exports === 'object') {
module.exports = factory();
registeredInModuleLoader = true;
}
if (!registeredInModuleLoader) {
var OldCookies = window.Cookies;
var api = window.Cookies = factory();
api.noConflict = function () {
window.Cookies = OldCookies;
return api;
};
}
}(function () {
function extend () {
var i = 0;
var result = {};
for (; i < arguments.length; i++) {
var attributes = arguments[ i ];
for (var key in attributes) {
result[key] = attributes[key];
}
}
return result;
}

function init (converter) {
function api (key, value, attributes) {
var result;
if (typeof document === 'undefined') {
return;
}

// Write

if (arguments.length > 1) {
attributes = extend({
path: '/'
}, api.defaults, attributes);

if (typeof attributes.expires === 'number') {
var expires = new Date();
expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
attributes.expires = expires;
}

try {
result = JSON.stringify(value);
if (/^[\{\[]/.test(result)) {
value = result;
}
} catch (e) {}

if (!converter.write) {
value = encodeURIComponent(String(value))
.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
} else {
value = converter.write(value, key);
}

key = encodeURIComponent(String(key));
key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
key = key.replace(/[\(\)]/g, escape);

return (document.cookie = [
key, '=', value,
attributes.expires ? '; expires=' + attributes.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
attributes.path ? '; path=' + attributes.path : '',
attributes.domain ? '; domain=' + attributes.domain : '',
attributes.secure ? '; secure' : ''
].join(''));
}

// Read

if (!key) {
result = {};
}

// To prevent the for loop in the first place assign an empty array
// in case there are no cookies at all. Also prevents odd result when
// calling "get()"
var cookies = document.cookie ? document.cookie.split('; ') : [];
var rdecode = /(%[0-9A-Z]{2})+/g;
var i = 0;

for (; i < cookies.length; i++) {
var parts = cookies[i].split('=');
var cookie = parts.slice(1).join('=');

if (cookie.charAt(0) === '"') {
cookie = cookie.slice(1, -1);
}

try {
var name = parts[0].replace(rdecode, decodeURIComponent);
cookie = converter.read ?
converter.read(cookie, name) : converter(cookie, name) ||
cookie.replace(rdecode, decodeURIComponent);

if (this.json) {
try {
cookie = JSON.parse(cookie);
} catch (e) {}
}

if (key === name) {
result = cookie;
break;
}

if (!key) {
result[name] = cookie;
}
} catch (e) {}
}

return result;
}

api.set = api;
api.get = function (key) {
return api.call(api, key);
};
api.getJSON = function () {
return api.apply({
json: true
}, [].slice.call(arguments));
};
api.defaults = {};

api.remove = function (key, attributes) {
api(key, '', extend(attributes, {
expires: -1
}));
};

api.withConverter = init;

return api;
}

return init(function () {});
}));
4 changes: 4 additions & 0 deletions app/assets/stylesheets/kuroko2/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,7 @@
font-size: 1.3em;
fill: #666;
}

#notification {
cursor: pointer;
}
2 changes: 1 addition & 1 deletion app/views/kuroko2/job_instances/_instance.html.slim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.box#instance data-instance-path="#{naked_job_definition_job_instance_path(@definition, @instance)}"
.box-header
h2.box-title
h2#definition-name.box-title
= link_to "##{@definition.id} #{@definition.name}", job_definition_path(@definition)
.box-body
table.table
Expand Down
3 changes: 3 additions & 0 deletions app/views/layouts/kuroko2/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ html
img.img-circle src='#{current_user.image}' alt="#{current_user.name}"
.pull-left.info
p Hello, #{current_user.name}
p#notification
i.fa.fa-volume-off
| Turn on notification
ul.sidebar-menu
li class=('active' if controller_name == 'dashboard')
= link_to raw('<i class="fa fa-dashboard"></i> Dashboard'), root_path
Expand Down