Skip to content

Fixes #2250 - Don't show loader after the collection has been loaded. #2252

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

Merged
raclim merged 4 commits into from
Aug 30, 2023
Merged

Fixes #2250 - Don't show loader after the collection has been loaded. #2252

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6560702
Don't show loader after the collection has been loaded.
lindapaiste Jun 17, 2023
ef55cb4
Merge branch 'develop' into fix/collection-loading
lindapaiste Jul 13, 2023
e74b8cb
Merge branch 'develop' into fix/collection-loading
lindapaiste Aug 7, 2023
22ac45b
Merge branch 'develop' into fix/collection-loading
raclim Aug 29, 2023
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
20 changes: 5 additions & 15 deletions client/modules/User/components/Collection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class Collection extends React.Component {
if (
this.props.user != null &&
this.props.user.username &&
this.props.collection.owner.username === this.props.user.username
this.props.collection?.owner?.username === this.props.user.username
) {
isOwner = true;
}
Expand All @@ -214,15 +214,15 @@ class Collection extends React.Component {
}

hasCollection() {
return !this.props.loading && this.props.collection != null;
return !!this.props.collection;
}

hasCollectionItems() {
return this.hasCollection() && this.props.collection.items.length > 0;
}

_renderLoader() {
if (this.props.loading) return <Loader />;
if (this.props.loading && !this.hasCollection()) return <Loader />;
return null;
}

Expand Down Expand Up @@ -336,11 +336,7 @@ class Collection extends React.Component {
}

_renderEmptyTable() {
const isLoading = this.props.loading;
const hasCollectionItems =
this.props.collection != null && this.props.collection.items.length > 0;

if (!isLoading && !hasCollectionItems) {
if (this.hasCollection() && !this.hasCollectionItems()) {
return (
<p className="collection-empty-message">
{this.props.t('Collection.NoSketches')}
Expand Down Expand Up @@ -516,13 +512,7 @@ Collection.propTypes = {

Collection.defaultProps = {
username: undefined,
collection: {
id: undefined,
items: [],
owner: {
username: undefined
}
}
collection: null
};

function mapStateToProps(state, ownProps) {
Expand Down