Correctly fetching type (may need to split source vs items)

This commit is contained in:
James Barnsley
2021-12-02 21:05:59 +13:00
parent 46f31a0b7e
commit 6f591d51e6

View File

@ -115,8 +115,8 @@ class ContextMenu extends React.Component {
const { const {
menu: { menu: {
items, items,
source = {},
}, },
source = {},
} = props; } = props;
return { return {
name: null, name: null,
@ -616,16 +616,16 @@ class ContextMenu extends React.Component {
uris, uris,
} = {}, } = {},
} = this.props; } = this.props;
const { nice_name } = this.getContext(); const { type } = this.getContext();
const uri = uris[0];
switch (nice_name) { switch (type) {
case 'artist': case 'artist':
case 'album': case 'album':
case 'playlist': case 'playlist':
case 'track': case 'track':
case 'user': case 'user':
const uri = uris[0]; actions[`load${titleCase(type)}`](uri, { forceRefetch: true, full: true });
actions[`load${titleCase(nice_name)}`](uri, { forceRefetch: true, full: true });
break; break;
default: default:
actions.handleException(`Cannot refresh; unexpected URI: ${uri}`); actions.handleException(`Cannot refresh; unexpected URI: ${uri}`);
@ -652,7 +652,7 @@ class ContextMenu extends React.Component {
return ( return (
<div className="context-menu__title"> <div className="context-menu__title">
<div className="context-menu__title__text"> <div className="context-menu__title__text">
{`${context.items_count} ${context.name}${context.items_count > 1 ? 's' : ''} selected`} {`${context.items_count} ${context.type}${context.items_count > 1 ? 's' : ''} selected`}
<span <span
className="context-menu__title__deselect" className="context-menu__title__deselect"
onClick={() => { onClick={() => {
@ -667,7 +667,7 @@ class ContextMenu extends React.Component {
); );
} }
if (context.items_count === 1 && context.name === 'queue-track' && context.item !== undefined) { if (context.items_count === 1 && context.context === 'queue-track' && context.item !== undefined) {
if (queue_metadata[`tlid_${context.item.tlid}`] !== undefined) { if (queue_metadata[`tlid_${context.item.tlid}`] !== undefined) {
const { const {
added_from, added_from,
@ -686,7 +686,7 @@ class ContextMenu extends React.Component {
} }
} }
if (context.name === 'custom') { if (context.type === 'custom') {
if (!title) return null; if (!title) return null;
return ( return (
@ -1119,7 +1119,7 @@ class ContextMenu extends React.Component {
</div> </div>
); );
switch (context.name) { switch (context.context) {
case 'album': case 'album':
return ( return (
<div> <div>