Summary: This diff fixes the improper plugin id getting assigned to the variable which lead to notifications not getting shown. The client id has `#` so pluginId is no longer the second argument when one splits the string by `#`. This diff fixes this problem. Reviewed By: passy Differential Revision: D13176776 fbshipit-source-id: cd5bdc33c61485e3cdc2f2dbcc615980c39c8b8c
154 lines
4.7 KiB
JavaScript
154 lines
4.7 KiB
JavaScript
/**
|
|
* Copyright 2018-present Facebook.
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
* @format
|
|
*/
|
|
|
|
import type {Store} from '../reducers/index.js';
|
|
import type Logger from '../fb-stubs/Logger.js';
|
|
import type {PluginNotification} from '../reducers/notifications';
|
|
import type {FlipperPlugin} from '../plugin.js';
|
|
|
|
import {ipcRenderer} from 'electron';
|
|
import {selectPlugin} from '../reducers/connections';
|
|
import {
|
|
setActiveNotifications,
|
|
updatePluginBlacklist,
|
|
updateCategoryBlacklist,
|
|
} from '../reducers/notifications';
|
|
import {textContent} from '../utils/index';
|
|
import GK from '../fb-stubs/GK';
|
|
|
|
type NotificationEvents = 'show' | 'click' | 'close' | 'reply' | 'action';
|
|
|
|
export default (store: Store, logger: Logger) => {
|
|
if (GK.get('flipper_disable_notifications')) {
|
|
return;
|
|
}
|
|
|
|
const knownNotifications: Set<string> = new Set();
|
|
const knownPluginStates: Map<string, Object> = new Map();
|
|
|
|
ipcRenderer.on(
|
|
'notificationEvent',
|
|
(
|
|
e,
|
|
eventName: NotificationEvents,
|
|
pluginNotification: PluginNotification,
|
|
arg: null | string | number,
|
|
) => {
|
|
if (eventName === 'click' || (eventName === 'action' && arg === 0)) {
|
|
store.dispatch(
|
|
selectPlugin({
|
|
selectedPlugin: 'notifications',
|
|
selectedApp: null,
|
|
deepLinkPayload: pluginNotification.notification.id,
|
|
}),
|
|
);
|
|
} else if (eventName === 'action') {
|
|
if (arg === 1 && pluginNotification.notification.category) {
|
|
// Hide similar (category)
|
|
logger.track(
|
|
'usage',
|
|
'notification-hide-category',
|
|
pluginNotification,
|
|
);
|
|
|
|
const {category} = pluginNotification.notification;
|
|
const {blacklistedCategories} = store.getState().notifications;
|
|
if (category && blacklistedCategories.indexOf(category) === -1) {
|
|
store.dispatch(
|
|
updateCategoryBlacklist([...blacklistedCategories, category]),
|
|
);
|
|
}
|
|
} else if (arg === 2) {
|
|
// Hide plugin
|
|
logger.track('usage', 'notification-hide-plugin', pluginNotification);
|
|
|
|
const {blacklistedPlugins} = store.getState().notifications;
|
|
if (blacklistedPlugins.indexOf(pluginNotification.pluginId) === -1) {
|
|
store.dispatch(
|
|
updatePluginBlacklist([
|
|
...blacklistedPlugins,
|
|
pluginNotification.pluginId,
|
|
]),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
},
|
|
);
|
|
|
|
store.subscribe(() => {
|
|
const {notifications, pluginStates} = store.getState();
|
|
const pluginMap = store.getState().plugins.clientPlugins;
|
|
|
|
Object.keys(pluginStates).forEach(key => {
|
|
if (knownPluginStates.get(key) !== pluginStates[key]) {
|
|
knownPluginStates.set(key, pluginStates[key]);
|
|
const split = key.split('#');
|
|
const pluginId = split.pop();
|
|
const client = split.join('#');
|
|
const persistingPlugin: ?Class<FlipperPlugin<>> = pluginMap.get(
|
|
pluginId,
|
|
);
|
|
|
|
if (persistingPlugin && persistingPlugin.getActiveNotifications) {
|
|
store.dispatch(
|
|
setActiveNotifications({
|
|
notifications: persistingPlugin.getActiveNotifications(
|
|
pluginStates[key],
|
|
),
|
|
client,
|
|
pluginId,
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
});
|
|
|
|
const {
|
|
activeNotifications,
|
|
blacklistedPlugins,
|
|
blacklistedCategories,
|
|
} = notifications;
|
|
|
|
activeNotifications.forEach((n: PluginNotification) => {
|
|
if (
|
|
store.getState().connections.selectedPlugin !== 'notifications' &&
|
|
!knownNotifications.has(n.notification.id) &&
|
|
blacklistedPlugins.indexOf(n.pluginId) === -1 &&
|
|
(!n.notification.category ||
|
|
blacklistedCategories.indexOf(n.notification.category) === -1)
|
|
) {
|
|
ipcRenderer.send('sendNotification', {
|
|
payload: {
|
|
title: n.notification.title,
|
|
body: textContent(n.notification.message),
|
|
actions: [
|
|
{
|
|
type: 'button',
|
|
text: 'Show',
|
|
},
|
|
{
|
|
type: 'button',
|
|
text: 'Hide similar',
|
|
},
|
|
{
|
|
type: 'button',
|
|
text: `Hide all ${pluginMap.get(n.pluginId)?.title || ''}`,
|
|
},
|
|
],
|
|
closeButtonText: 'Hide',
|
|
},
|
|
closeAfter: 10000,
|
|
pluginNotification: n,
|
|
});
|
|
logger.track('usage', 'native-notification', n.notification);
|
|
knownNotifications.add(n.notification.id);
|
|
}
|
|
});
|
|
});
|
|
};
|