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

Progress loading check for null, not 0

Browse Source
This commit is contained in:
James Barnsley
2020-10-24 11:32:29 +13:00
parent 5724f102cf
commit df9749c677
9 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mopidy_iris/static/app.js
View File

@ -133374,13 +133374,14 @@ var makeProcessProgressSelector = function makeProcessProgressSelector(keys) {
}).filter(function (i) {
return i.status === 'running';
});
if (!selectedProcesses.length) return null;
var total = 0;
var remaining = 0;
selectedProcesses.forEach(function (process) {
if (process.total) total += process.total;
if (process.remaining) remaining += process.remaining;
});
return total && remaining ? ((total - remaining) / total).toFixed(4) : 1;
return total && remaining ? ((total - remaining) / total).toFixed(4) : 0;
});
};
@ -141335,7 +141336,7 @@ var LibraryAlbums = /*#__PURE__*/function (_React$Component) {
filter = _this$state2.filter;
var albums = _this.props.albums;
if (loading_progress < 1) {
if (loading_progress !== null) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_18__["default"], {
body: true,
loading: true,
@ -141416,7 +141417,7 @@ var LibraryAlbums = /*#__PURE__*/function (_React$Component) {
var _this$state3 = _this.state,
filter = _this$state3.filter,
per_page = _this$state3.per_page;
var loading = loading_progress < 1;
var loading = loading_progress !== null;
var source_options = [{
value: 'all',
label: Object(_locale__WEBPACK_IMPORTED_MODULE_17__["i18n"])('fields.filters.all')
@ -141840,7 +141841,7 @@ var LibraryArtists = /*#__PURE__*/function (_React$Component) {
filter = _this$state.filter;
var artists = _this.props.artists;
if (loading_progress < 1) {
if (loading_progress !== null) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_15__["default"], {
body: true,
loading: true,
@ -141917,7 +141918,7 @@ var LibraryArtists = /*#__PURE__*/function (_React$Component) {
spotify_available = _this$props6.spotify_available,
google_available = _this$props6.google_available,
loading_progress = _this$props6.loading_progress;
var loading = loading_progress < 1;
var loading = loading_progress !== null;
var source_options = [{
value: 'all',
label: Object(_locale__WEBPACK_IMPORTED_MODULE_13__["i18n"])('fields.filters.all')
@ -142957,7 +142958,7 @@ var LibraryPlaylists = /*#__PURE__*/function (_React$Component) {
filter = _this$state.filter,
limit = _this$state.limit;
if (loading_progress < 1) {
if (loading_progress !== null) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_17__["default"], {
body: true,
loading: true,
@ -143043,7 +143044,7 @@ var LibraryPlaylists = /*#__PURE__*/function (_React$Component) {
view = _this$props4.view,
loading_progress = _this$props4.loading_progress;
var filter = _this.state.filter;
var loading = loading_progress < 1;
var loading = loading_progress !== null;
var source_options = [{
value: 'all',
label: Object(_locale__WEBPACK_IMPORTED_MODULE_16__["i18n"])('fields.filters.all')
@ -143509,7 +143510,7 @@ var LibraryTracks = /*#__PURE__*/function (_React$Component) {
filter = _this$state2.filter;
var tracks = _this.props.tracks;
if (loading_progress < 1) {
if (loading_progress !== null) {
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_16__["default"], {
body: true,
loading: true,
@ -143558,7 +143559,7 @@ var LibraryTracks = /*#__PURE__*/function (_React$Component) {
var _this$state3 = _this.state,
filter = _this$state3.filter,
per_page = _this$state3.per_page;
var loading = loading_progress < 1;
var loading = loading_progress !== null;
var source_options = [{
value: 'all',
label: Object(_locale__WEBPACK_IMPORTED_MODULE_15__["i18n"])('fields.filters.all')

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

File diff suppressed because one or more lines are too long

4
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 = "1603447492";
var build = "1603492267";
var version = "3.53.0";
// Construct the script tag

4
src/js/util/selectors.js
View File

@ -60,13 +60,15 @@ const makeProcessProgressSelector = (keys) => createSelector(
.map((key) => processes[key] || {})
.filter((i) => i.status === 'running');
if (!selectedProcesses.length) return null;
let total = 0;
let remaining = 0;
selectedProcesses.forEach((process) => {
if (process.total) total += process.total;
if (process.remaining) remaining += process.remaining;
});
return total && remaining ? ((total - remaining) / total).toFixed(4) : 1;
return total && remaining ? ((total - remaining) / total).toFixed(4) : 0;
},
);

4
src/js/views/library/LibraryAlbums.js
View File

@ -195,7 +195,7 @@ class LibraryAlbums extends React.Component {
} = this.state;
let { albums } = this.props;
if (loading_progress < 1) {
if (loading_progress !== null) {
return <Loader body loading progress={loading_progress} />;
}
@ -261,7 +261,7 @@ class LibraryAlbums extends React.Component {
filter,
per_page,
} = this.state;
const loading = loading_progress < 1;
const loading = loading_progress !== null;
const source_options = [
{

7
src/js/views/library/LibraryArtists.js
View File

@ -17,7 +17,6 @@ import Button from '../../components/Button';
import Loader from '../../components/Loader';
import {
makeLibrarySelector,
makeLoadingSelector,
makeProcessProgressSelector,
} from '../../util/selectors';
@ -172,8 +171,8 @@ class LibraryArtists extends React.Component {
} = this.state;
let { artists } = this.props;
if (loading_progress < 1) {
return <Loader body loading progress={loading_progress} />
if (loading_progress !== null) {
return <Loader body loading progress={loading_progress} />;
}
if (sort) {
@ -229,7 +228,7 @@ class LibraryArtists extends React.Component {
google_available,
loading_progress,
} = this.props;
const loading = loading_progress < 1;
const loading = loading_progress !== null;
const source_options = [
{

4
src/js/views/library/LibraryPlaylists.js
View File

@ -159,7 +159,7 @@ class LibraryPlaylists extends React.Component {
limit,
} = this.state;
if (loading_progress < 1) {
if (loading_progress !== null) {
return <Loader body loading progress={loading_progress} />;
}
let playlists = [...playlistsProp];
@ -225,7 +225,7 @@ class LibraryPlaylists extends React.Component {
const {
filter,
} = this.state;
const loading = loading_progress < 1;
const loading = loading_progress !== null;
const source_options = [
{

4
src/js/views/library/LibraryTracks.js
View File

@ -173,7 +173,7 @@ class LibraryTracks extends React.Component {
} = this.state;
let { tracks } = this.props;
if (loading_progress < 1) {
if (loading_progress !== null) {
return <Loader body loading progress={loading_progress} />;
}
@ -214,7 +214,7 @@ class LibraryTracks extends React.Component {
filter,
per_page,
} = this.state;
const loading = loading_progress < 1;
const loading = loading_progress !== null;
const source_options = [
{