secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Separating artist albums

Browse Source
This commit is contained in:
James Barnsley
2020-09-23 20:59:06 +12:00
parent d46ff41106
commit 4fbf64169c
7 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mopidy_iris/static/app.js
View File

@ -128801,13 +128801,13 @@ var getItems = function getItems(state) {
return state.core.items;
};
var makeItemSelector = function makeItemSelector(uris) {
var makeItemSelector = function makeItemSelector(uriOrUris) {
return Object(reselect__WEBPACK_IMPORTED_MODULE_0__["createSelector"])([getItems], function (items) {
if (Array.isArray(uris)) {
return Object(_arrays__WEBPACK_IMPORTED_MODULE_1__["indexToArray"])(items, uris);
if (Array.isArray(uriOrUris)) {
return Object(_arrays__WEBPACK_IMPORTED_MODULE_1__["indexToArray"])(items, uriOrUris);
}
return items[uris];
return items[uriOrUris];
});
};
@ -129664,8 +129664,8 @@ var Artist = /*#__PURE__*/function (_React$Component) {
sort_reverse = _this$props5.sort_reverse,
filter = _this$props5.filter;
var tracks = artist.tracks,
related_artists = artist.related_artists,
albums = artist.albums;
related_artists = artist.related_artists;
var albums = _this.props.albums;
if (sort && albums) {
albums = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_23__["sortItems"])(albums, sort, sort_reverse);
@ -130012,7 +130012,6 @@ var Artist = /*#__PURE__*/function (_React$Component) {
loading = _this$props7.loading,
artist = _this$props7.artist,
history = _this$props7.history;
console.log('artist render', loading);
if (loading) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_17__["default"], {
@ -130230,15 +130229,17 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
var loadingSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_27__["makeLoadingSelector"])(["(.*)".concat(uri, "(.*)")]);
var artistSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_27__["makeItemSelector"])(uri);
var artist = artistSelector(state);
var albums = [];
if (artist && artist.albums_uris) {
var albumsSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_27__["makeItemSelector"])(artist.albums_uris);
artist.albums = albumsSelector(state);
albums = albumsSelector(state);
}
return {
uri: uri,
artist: artist,
albums: albums,
loading: loadingSelector(state),
theme: state.ui.theme,
slim_mode: state.ui.slim_mode,
@ -131079,6 +131080,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _services_spotify_actions__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../services/spotify/actions */ "./src/js/services/spotify/actions.js");
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../util/helpers */ "./src/js/util/helpers.js");
/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../locale */ "./src/js/locale/index.js");
/* harmony import */ var _util_selectors__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../util/selectors */ "./src/js/util/selectors.js");
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -131124,6 +131126,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
var Playlist = /*#__PURE__*/function (_React$Component) {
@ -131403,13 +131406,12 @@ var Playlist = /*#__PURE__*/function (_React$Component) {
var _this$props9 = _this.props,
uri = _this$props9.uri,
playlist = _this$props9.playlist,
load_queue = _this$props9.load_queue,
loading = _this$props9.loading,
slim_mode = _this$props9.slim_mode;
console.log('RENDERING');
var playlist_id = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["getFromUri"])('playlistid', uri);
if (!playlist) {
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id, "(.*)")])) {
if (loading) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
body: true,
loading: true,
@ -131523,12 +131525,7 @@ var Playlist = /*#__PURE__*/function (_React$Component) {
date: Object(_components_Dater__WEBPACK_IMPORTED_MODULE_9__["dater"])('ago', playlist.last_modified_date),
"data-qa-node": "I18n",
"data-qa-file": "Playlist"
})))), _this.renderActions(), (!playlist.tracks || playlist.tracks.length <= 0) && Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id, "/tracks(.*)")]) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
body: true,
loading: true,
"data-qa-node": "Loader",
"data-qa-file": "Playlist"
}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("section", {
})))), _this.renderActions(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("section", {
className: "list-wrapper",
"data-qa-node": "section",
"data-qa-file": "Playlist"
@ -131541,7 +131538,12 @@ var Playlist = /*#__PURE__*/function (_React$Component) {
reorderTracks: _this.reorderTracks,
"data-qa-node": "TrackList",
"data-qa-file": "Playlist"
})));
})), loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
body: true,
loading: true,
"data-qa-node": "Loader",
"data-qa-file": "Playlist"
}));
});
var _uri = props.uri; // Spotify upgraded their playlists URI to remove user component (Sept 2018)
@ -131577,10 +131579,6 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
var allow_reporting = _state$ui.allow_reporting,
slim_mode = _state$ui.slim_mode,
theme = _state$ui.theme,
load_queue = _state$ui.load_queue,
_state$core = state.core;
_state$core = _state$core === void 0 ? {} : _state$core;
var items = _state$core.items,
_state$spotify = state.spotify;
_state$spotify = _state$spotify === void 0 ? {} : _state$spotify;
var spotify_library_playlists = _state$spotify.library_playlists,
@ -131591,13 +131589,16 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
_state$mopidy = _state$mopidy === void 0 ? {} : _state$mopidy;
var local_library_playlists = _state$mopidy.library_playlists;
var uri = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["decodeMopidyUri"])(ownProps.match.params.uri);
var playlistId = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["getFromUri"])('playlistid', uri);
var itemSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_22__["makeItemSelector"])(uri);
var loadingSelector = Object(_util_selectors__WEBPACK_IMPORTED_MODULE_22__["makeLoadingSelector"])(["(.*)".concat(playlistId, "(?!.*(following))(.*)")]);
return {
uri: uri,
allow_reporting: allow_reporting,
slim_mode: slim_mode,
theme: theme,
load_queue: load_queue,
playlist: items[uri],
loading: loadingSelector(state),
playlist: itemSelector(state),
spotify_library_playlists: spotify_library_playlists,
local_library_playlists: local_library_playlists,
spotify_authorized: spotify_authorized,

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

16
mopidy_iris/static/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -106,7 +106,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1600759874";
var build = "1600850263";
var version = "3.52.4";
// Construct the script tag