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

Add track by to notification drawer #1988

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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
// var clientGeneratedNotifications = [];

var eventsWatcher;
var eventsByNameData = {};
var eventsMap = {};

// TODO:
Expand Down Expand Up @@ -159,6 +158,7 @@
ensureProjectGroupExists(filtered, event.metadata.namespace);
filtered[event.metadata.namespace].notifications.push({
unread: !EventsService.isRead(event),
uid: event.metadata.uid,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@spadgett fixed

event: event,
actions: null
});
Expand Down Expand Up @@ -198,8 +198,7 @@
// TODO: follow-on PR to decide which of these events to toast,
// via config in constants.js
var eventWatchCallback = function(eventData) {
eventsByNameData = eventData.by('metadata.name');
eventsMap = formatAndFilterEvents(eventsByNameData);
eventsMap = formatAndFilterEvents(eventData.by('metadata.uid'));
// TODO: Update to an intermediate map, so that we can then combine both
// events + notifications into the final notificationGroups output
notificationGroups = sortNotificationGroups(eventsMap);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<pf-notification-drawer
drawer-hidden="$ctrl.drawerHidden"
allow-expand="$ctrl.allowExpand"
custom-scope="$ctrl.customScope"
drawer-expanded="$ctrl.drawerExpanded"
drawer-hidden="$ctrl.drawerHidden"
drawer-title="{{$ctrl.drawerTitle}}"
show-clear-all="$ctrl.showClearAll"
show-mark-all-read="$ctrl.showMarkAllRead"
notification-groups="$ctrl.notificationGroups"
heading-include="{{$ctrl.headingInclude}}"
notification-body-include="{{$ctrl.notificationBodyInclude}}"
notification-groups="$ctrl.notificationGroups"
notification-track-field="uid"
on-close="$ctrl.onClose"
on-mark-all-read="$ctrl.onMarkAllRead"
on-clear-all="$ctrl.onClearAll"
custom-scope="$ctrl.customScope"></pf-notification-drawer>
on-mark-all-read="$ctrl.onMarkAllRead"
show-clear-all="$ctrl.showClearAll"
show-mark-all-read="$ctrl.showMarkAllRead"></pf-notification-drawer>
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"angular-touch": "1.5.11",
"angular-route": "1.5.11",
"angular-bootstrap": "0.14.3",
"angular-patternfly": "4.5.6",
"angular-patternfly": "4.7.1",
"angular-gettext": "2.3.9",
"uri.js": "1.18.12",
"moment": "2.14.2",
Expand Down Expand Up @@ -47,7 +47,7 @@
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "0.0.51",
"origin-web-catalog": "0.0.41"
"origin-web-catalog": "0.0.42"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand Down
87 changes: 44 additions & 43 deletions dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -13884,69 +13884,70 @@ u(), d();
angular.module("openshiftConsole").component("notificationDrawerWrapper", {
templateUrl: "views/directives/notifications/notification-drawer-wrapper.html",
controller: [ "$filter", "$interval", "$location", "$timeout", "$routeParams", "$rootScope", "Constants", "DataService", "NotificationsService", "EventsService", function(e, t, n, a, r, o, i, s, c, l) {
var u, d, m = _.get(i, "DISABLE_GLOBAL_EVENT_WATCH"), p = e("isIE")() || e("isEdge")(), f = this, g = [], h = {}, v = {}, y = [], b = {}, C = function(e) {
var u, d, m = _.get(i, "DISABLE_GLOBAL_EVENT_WATCH"), p = e("isIE")() || e("isEdge")(), f = this, g = [], h = {}, v = [], y = {}, b = function(e) {
return s.get("projects", e, {}, {
errorNotification: !1
}).then(function(e) {
return b[e.metadata.name] = e, e;
return y[e.metadata.name] = e, e;
});
}, S = function(t, n) {
}, C = function(t, n) {
n && !t[n] && (t[n] = {
heading: e("displayName")(b[n]) || n,
project: b[n],
heading: e("displayName")(y[n]) || n,
project: y[n],
notifications: []
});
}, w = function() {
}, S = function() {
d && s.unwatch(d);
}, k = function(e, t) {
w(), e && (d = s.watch("events", {
}, w = function(e, t) {
S(), e && (d = s.watch("events", {
namespace: e
}, _.debounce(t, 400), {
skipDigest: !0
}));
}, j = function() {
}, k = function() {
u && u(), u = null;
}, P = function(e) {
}, j = function(e) {
return _.filter(e, "unread");
}, R = function(e) {
}, P = function(e) {
o.$applyAsync(function() {
e.totalUnread = P(e.notifications).length, e.hasUnread = !!e.totalUnread, o.$emit("NotificationDrawerWrapper.count", e.totalUnread);
e.totalUnread = j(e.notifications).length, e.hasUnread = !!e.totalUnread, o.$emit("NotificationDrawerWrapper.count", e.totalUnread);
});
}, E = function() {
_.each(y, R);
}, T = function(e) {
}, R = function() {
_.each(v, P);
}, E = function(e) {
return _.orderBy(e, [ "event.lastTimestamp", "event.firstTimestamp" ], [ "desc", "desc" ]);
}, I = function(e) {
}, T = function(e) {
var t = _.sortBy(e, function(e) {
return e.heading;
});
return _.each(t, function(e) {
e.notifications = T(e.notifications), e.counts = R(e);
e.notifications = E(e.notifications), e.counts = P(e);
}), t;
}, N = function(e) {
}, I = function(e) {
var t = {};
return S(t, r.project), _.each(e, function(e) {
l.isImportantEvent(e) && !l.isCleared(e) && (S(t, e.metadata.namespace), t[e.metadata.namespace].notifications.push({
return C(t, r.project), _.each(e, function(e) {
l.isImportantEvent(e) && !l.isCleared(e) && (C(t, e.metadata.namespace), t[e.metadata.namespace].notifications.push({
unread: !l.isRead(e),
uid: e.metadata.uid,
event: e,
actions: null
}));
}), t;
}, D = function() {
}, N = function() {
_.each(g, function(e) {
e();
}), g = [];
}, $ = function(e) {
}, D = function(e) {
e || (f.drawerHidden = !0);
}, A = function() {
}, $ = function() {
o.$evalAsync(function() {
E(), f.notificationGroups = _.filter(y, function(e) {
R(), f.notificationGroups = _.filter(v, function(e) {
return e.project.metadata.name === r.project;
});
});
}, B = function(e) {
h = e.by("metadata.name"), v = N(h), y = I(v), A();
}, L = {
}, A = function(e) {
h = I(e.by("metadata.uid")), v = T(h), $();
}, B = {
Normal: "pficon pficon-info",
Warning: "pficon pficon-warning-triangle-o"
};
Expand All @@ -13964,51 +13965,51 @@ f.drawerHidden = !0;
onMarkAllRead: function(e) {
_.each(e.notifications, function(e) {
e.unread = !1, l.markRead(e.event);
}), A(), o.$emit("NotificationDrawerWrapper.onMarkAllRead");
}), $(), o.$emit("NotificationDrawerWrapper.onMarkAllRead");
},
onClearAll: function(e) {
_.each(e.notifications, function(e) {
l.markRead(e.event), l.markCleared(e.event);
}), e.notifications = [], A(), o.$emit("NotificationDrawerWrapper.onMarkAllRead");
}), e.notifications = [], $(), o.$emit("NotificationDrawerWrapper.onMarkAllRead");
},
notificationGroups: y,
notificationGroups: v,
headingInclude: "views/directives/notifications/header.html",
notificationBodyInclude: "views/directives/notifications/notification-body.html",
customScope: {
clear: function(e, t, n) {
l.markCleared(e.event), n.notifications.splice(t, 1), E();
l.markCleared(e.event), n.notifications.splice(t, 1), R();
},
markRead: function(e) {
e.unread = !1, l.markRead(e.event), E();
e.unread = !1, l.markRead(e.event), R();
},
getNotficationStatusIconClass: function(e) {
return L[e.type] || L.info;
return B[e.type] || B.info;
},
getStatusForCount: function(e) {
return L[e] || L.info;
return B[e] || B.info;
},
close: function() {
f.drawerHidden = !0;
}
}
});
var U = function(e, t) {
var L = function(e, t) {
return _.get(e, "params.project") !== _.get(t, "params.project");
}, O = function() {
C(r.project).then(function() {
k(r.project, B), $(r.project), A();
}, U = function() {
b(r.project).then(function() {
w(r.project, A), D(r.project), $();
});
}, F = function() {
r.project && O(), g.push(o.$on("$routeChangeSuccess", function(e, t, n) {
U(t, n) && (f.customScope.projectName = r.project, O());
}, O = function() {
r.project && U(), g.push(o.$on("$routeChangeSuccess", function(e, t, n) {
L(t, n) && (f.customScope.projectName = r.project, U());
})), g.push(o.$on("NotificationDrawerWrapper.toggle", function() {
f.drawerHidden = !f.drawerHidden;
}));
};
f.$onInit = function() {
m || p || F();
m || p || O();
}, f.$onDestroy = function() {
j(), w(), D();
k(), S(), N();
};
} ]
});
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -7533,7 +7533,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(


$templateCache.put('views/directives/notifications/notification-drawer-wrapper.html',
"<pf-notification-drawer drawer-hidden=\"$ctrl.drawerHidden\" allow-expand=\"$ctrl.allowExpand\" drawer-expanded=\"$ctrl.drawerExpanded\" drawer-title=\"{{$ctrl.drawerTitle}}\" show-clear-all=\"$ctrl.showClearAll\" show-mark-all-read=\"$ctrl.showMarkAllRead\" notification-groups=\"$ctrl.notificationGroups\" heading-include=\"{{$ctrl.headingInclude}}\" notification-body-include=\"{{$ctrl.notificationBodyInclude}}\" on-close=\"$ctrl.onClose\" on-mark-all-read=\"$ctrl.onMarkAllRead\" on-clear-all=\"$ctrl.onClearAll\" custom-scope=\"$ctrl.customScope\"></pf-notification-drawer>"
"<pf-notification-drawer allow-expand=\"$ctrl.allowExpand\" custom-scope=\"$ctrl.customScope\" drawer-expanded=\"$ctrl.drawerExpanded\" drawer-hidden=\"$ctrl.drawerHidden\" drawer-title=\"{{$ctrl.drawerTitle}}\" heading-include=\"{{$ctrl.headingInclude}}\" notification-body-include=\"{{$ctrl.notificationBodyInclude}}\" notification-groups=\"$ctrl.notificationGroups\" notification-track-field=\"uid\" on-close=\"$ctrl.onClose\" on-clear-all=\"$ctrl.onClearAll\" on-mark-all-read=\"$ctrl.onMarkAllRead\" show-clear-all=\"$ctrl.showClearAll\" show-mark-all-read=\"$ctrl.showMarkAllRead\"></pf-notification-drawer>"
);


Expand Down
Loading