jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename star/unstar actions to enable/disable/switch

Browse Source 
Summary:
Renamed actions "star" and "unstar" everywhere to "enable", "disable" and "switch". The logic behind original "star" action changed significantly, so this rename just makes everything much clearer.

Please note that as a part of rename persisted state fields "userStarredPlugins" and "userStarredDevicePlugins" were renamed. I've added a "redux-persist" migration for seamless transition.

Reviewed By: passy

Differential Revision: D26606459

fbshipit-source-id: 83ad475f9b0231194701c40a2cdbda36f02c3d10
This commit is contained in:
Anton Nikolaev
2021-02-24 05:28:25 -08:00
committed by Facebook GitHub Bot
parent e9bab76614
commit fa3ff83595
29 changed files with 230 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
desktop/app/src/utils/pluginUtils.tsx
View File

@@ -83,8 +83,8 @@ export function getExportablePlugins(
undefined,
client,
state.plugins,
state.connections.userStarredPlugins,
state.connections.userStarredDevicePlugins,
state.connections.enabledPlugins,
state.connections.enabledDevicePlugins,
);
return [
@@ -179,8 +179,8 @@ export function computePluginLists(
metroDevice: BaseDevice | undefined,
client: Client | undefined,
plugins: State['plugins'],
userStarredPlugins: State['connections']['userStarredPlugins'],
userStarredDevicePlugins: Set<string>,
enabledPluginsState: State['connections']['enabledPlugins'],
enabledDevicePluginsState: Set<string>,
_pluginsChanged?: number, // this argument is purely used to invalidate the memoization cache
) {
const uninstalledMarketplacePlugins = filterNewestVersionOfEachPlugin(
@@ -191,12 +191,12 @@ export function computePluginLists(
...plugins.devicePlugins.values(),
]
.filter((p) => device?.supportsPlugin(p))
.filter((p) => userStarredDevicePlugins.has(p.id));
.filter((p) => enabledDevicePluginsState.has(p.id));
const metroPlugins: DevicePluginDefinition[] = [
...plugins.devicePlugins.values(),
]
.filter((p) => metroDevice?.supportsPlugin(p))
.filter((p) => userStarredDevicePlugins.has(p.id));
.filter((p) => enabledDevicePluginsState.has(p.id));
const enabledPlugins: ClientPluginDefinition[] = [];
const disabledPlugins: PluginDefinition[] = [
...plugins.devicePlugins.values(),
@@ -206,7 +206,7 @@ export function computePluginLists(
device?.supportsPlugin(p.details) ||
metroDevice?.supportsPlugin(p.details),
)
.filter((p) => !userStarredDevicePlugins.has(p.id));
.filter((p) => !enabledDevicePluginsState.has(p.id));
const unavailablePlugins: [plugin: PluginDetails, reason: string][] = [];
const downloadablePlugins: (
| DownloadablePluginDetails
@@ -263,7 +263,7 @@ export function computePluginLists(
device,
client,
clientPlugins,
client && userStarredPlugins[client.query.app],
client && enabledPluginsState[client.query.app],
true,
);
clientPlugins.forEach((plugin) => {
@@ -323,7 +323,7 @@ function getFavoritePlugins(
device: BaseDevice,
client: Client,
allPlugins: PluginDefinition[],
starredPlugins: undefined | string[],
enabledPlugins: undefined | string[],
returnFavoredPlugins: boolean, // if false, unfavoried plugins are returned
): PluginDefinition[] {
if (device.isArchived) {
@@ -335,11 +335,11 @@ function getFavoritePlugins(
(plugin) => client.plugins.indexOf(plugin.id) !== -1,
);
}
if (!starredPlugins || !starredPlugins.length) {
if (!enabledPlugins || !enabledPlugins.length) {
return returnFavoredPlugins ? [] : allPlugins;
}
return allPlugins.filter((plugin) => {
const idx = starredPlugins.indexOf(plugin.id);
const idx = enabledPlugins.indexOf(plugin.id);
return idx === -1 ? !returnFavoredPlugins : returnFavoredPlugins;
});
}