Skip to content

feat(subscriptions): add subscription to group from channel context menu #929

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.

Sign up for GitHub

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

Open
guthubrx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(subscriptions): add subscription to group from channel context menu #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions Grayjay.Desktop.Web/src/Menus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MenuItemButton, MenuItemCheckbox, MenuItemToggle, MenuSeperator } from "./components/menus/Overlays/SettingsMenu";
import { MenuItemButton, MenuItemCheckbox, MenuItemGroup, MenuItemOption, MenuItemToggle, MenuSeperator } from "./components/menus/Overlays/SettingsMenu";

import ic_notifications from './assets/icons/notifications.svg';
import ic_streams from './assets/icons/streams.svg';
Expand All @@ -15,7 +15,7 @@ import { IPlaylist } from "./backend/models/IPlaylist";
import { SubscriptionsBackend } from "./backend/SubscriptionsBackend";

export class Menus {
static getSubscriptionMenu(subscription: ISubscription, subscriptionSettings: ISubscriptionSettings, sourceState?: ISourceConfigState) {
static getSubscriptionMenu(subscription: ISubscription, subscriptionSettings: ISubscriptionSettings, sourceState?: ISourceConfigState, groups: ISubscriptionGroup[] = []) {
const hasStreams = (sourceState?.capabilitiesChannel?.types?.indexOf("STREAMS") ?? -1) !== -1;
const hasVideos = (sourceState?.capabilitiesChannel?.types?.indexOf("VIDEOS") ?? -1) !== -1
|| (sourceState?.capabilitiesChannel?.types?.indexOf("MIXED") ?? -1) !== -1
Expand Down Expand Up @@ -61,7 +61,27 @@ export class Menus {
onToggle: (v) => {
subscriptionSettings.doFetchStreams = v;
}
})] : []
})] : [],
...groups.length > 0 ? [
new MenuSeperator(),
new MenuItemGroup("Add to group", "", {
title: "Add to group",
items: groups.map(g => new MenuItemOption(
g.name,
g.id,
g.urls.includes(subscription.channel.url),
(id: string) => {
const group = groups.find(x => x.id === id);
if (!group) return;
const url = subscription.channel.url;
group.urls = group.urls.includes(url)
? group.urls.filter(u => u !== url)
: [...group.urls, url];
SubscriptionsBackend.subscriptionGroupSave(group).catch(console.error);
}
))
})
] : []
]
}
};
Expand Down
7 changes: 5 additions & 2 deletions Grayjay.Desktop.Web/src/pages/Channel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ const ChannelTopBar: Component<ChannelTopBarProps> = (props) => {
}

const sourceState = StateGlobal.getSourceState(subscription.channel.id.pluginID);
const subscriptionSettings: ISubscriptionSettings = await SubscriptionsBackend.subscriptionSettings(subscription.channel.url);
const [subscriptionSettings, groups] = await Promise.all([
SubscriptionsBackend.subscriptionSettings(subscription.channel.url),
SubscriptionsBackend.subscriptionGroups().catch(() => [] as ISubscriptionGroup[])
]);
anchor.setElement(el);
setSubscriptionMenu(Menus.getSubscriptionMenu(subscription, subscriptionSettings, sourceState));
setSubscriptionMenu(Menus.getSubscriptionMenu(subscription, subscriptionSettings, sourceState, groups));
setShowSettings(true);
};

Expand Down