Skip to content
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

Jump to bottom

Add loading state for the all domain list item component #43864

Merged
merged 4 commits into from
Jul 7, 2020
Merged

Add loading state for the all domain list item component #43864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94539cb
Renamed loading state prop/name
olaseni Jul 2, 2020
bfe41f3
Setup the loading state for `DomainItem` items
olaseni Jul 2, 2020
bf9004b
Install placeholders for action items
olaseni Jul 7, 2020
14a0a6b
Renamed state booleans
olaseni Jul 7, 2020
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
64 changes: 44 additions & 20 deletions client/my-sites/domains/domain-management/list/domain-item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ class DomainItem extends PureComponent {
onClick: PropTypes.func.isRequired,
onAddEmailClick: PropTypes.func.isRequired,
onToggle: PropTypes.func,
isLoadingDomainDetails: PropTypes.bool,
};

static defaultProps = {
isManagingAllSites: false,
showSite: false,
showCheckbox: false,
onToggle: null,
isLoadingDomainDetails: false,
};

handleClick = () => {
Expand Down Expand Up @@ -110,6 +112,47 @@ class DomainItem extends PureComponent {
);
}

renderActionItems() {
const { isLoadingDomainDetails, domainDetails } = this.props;

if ( isLoadingDomainDetails ) {
return (
<>
<div className="list__domain-transfer-lock list__action_item_placeholder" />
<div className="list__domain-privacy list__action_item_placeholder" />
<div className="list__domain-auto-renew list__action_item_placeholder" />
<div className="list__domain-email list__action_item_placeholder" />
<div className="list__domain-options list__action_item_placeholder" />
</>
);
}

return (
<>
<div className="list__domain-transfer-lock">
{ domainDetails?.isLocked && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-privacy">
{ domainDetails?.privateDomain && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-auto-renew">
{ domainDetails?.bundledPlanSubscriptionId && (
<Gridicon className="domain-item__icon" size={ 18 } icon="minus" />
) }
{ ! domainDetails?.bundledPlanSubscriptionId && domainDetails?.isAutoRenewing && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-email">{ this.renderEmail( domainDetails ) }</div>
{ this.renderOptionsButton() }
</>
);
}

getSiteName( site ) {
if ( site.name ) {
return `${ site.name } (${ withoutHttp( site.URL ) })`;
Expand Down Expand Up @@ -151,26 +194,7 @@ class DomainItem extends PureComponent {
</div>
) }
</div>
<div className="list__domain-transfer-lock">
{ domainDetails?.isLocked && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-privacy">
{ domainDetails?.privateDomain && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-auto-renew">
{ domainDetails?.bundledPlanSubscriptionId && (
<Gridicon className="domain-item__icon" size={ 18 } icon="minus" />
) }
{ ! domainDetails?.bundledPlanSubscriptionId && domainDetails?.isAutoRenewing && (
<Gridicon className="domain-item__icon" size={ 18 } icon="checkmark" />
) }
</div>
<div className="list__domain-email">{ this.renderEmail( domainDetails ) }</div>
{ this.renderOptionsButton() }
{ this.renderActionItems() }
</CompactCard>
);
}
Expand Down
23 changes: 18 additions & 5 deletions client/my-sites/domains/domain-management/list/list-all.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ import DocumentHead from 'components/data/document-head';
import DomainItem from './domain-item';
import ListHeader from './list-header';
import FormattedHeader from 'components/formatted-header';
import { getAllDomains, getFlatDomainsList } from 'state/sites/domains/selectors';
import {
getAllDomains,
getFlatDomainsList,
getAllRequestingSiteDomains,
} from 'state/sites/domains/selectors';
import { getCurrentUser } from 'state/current-user/selectors';
import { getCurrentRoute } from 'state/selectors/get-current-route';
import { getDomainManagementPath } from './utils';
Expand All @@ -47,6 +51,7 @@ class ListAll extends Component {
sites: PropTypes.object.isRequired,
user: PropTypes.object.isRequired,
addDomainClick: PropTypes.func.isRequired,
requestingSiteDomains: PropTypes.object,
};

clickAddDomain = () => {
Expand Down Expand Up @@ -79,8 +84,8 @@ class ListAll extends Component {
}

isLoading() {
const { domainsList, requestingDomains, sites } = this.props;
return ! sites || ( requestingDomains && domainsList.length === 0 );
const { domainsList, requestingFlatDomains, sites } = this.props;
return ! sites || ( requestingFlatDomains && domainsList.length === 0 );
}

findDomainDetails( domainsDetails = [], domain = {} ) {
Expand All @@ -94,7 +99,13 @@ class ListAll extends Component {
return times( 3, ( n ) => <ListItemPlaceholder key={ `item-${ n }` } /> );
}

const { domainsList, sites, domainsDetails, canManageSitesMap } = this.props;
const {
domainsList,
sites,
domainsDetails,
canManageSitesMap,
requestingSiteDomains,
} = this.props;

const domainListItems = domainsList
.filter(
Expand All @@ -108,6 +119,7 @@ class ListAll extends Component {
domainDetails={ this.findDomainDetails( domainsDetails, domain ) }
site={ sites[ domain?.blogId ] }
isManagingAllSites={ true }
isLoadingDomainDetails={ requestingSiteDomains[ domain?.blogId ] ?? false }
showSite={ true }
onClick={ this.handleDomainItemClick }
onAddEmailClick={ this.handleAddEmailClick }
Expand Down Expand Up @@ -154,7 +166,8 @@ export default connect(
currentRoute: getCurrentRoute( state ),
domainsList: getFlatDomainsList( state ),
domainsDetails: getAllDomains( state ),
requestingDomains: isRequestingAllDomains( state ),
requestingFlatDomains: isRequestingAllDomains( state ),
requestingSiteDomains: getAllRequestingSiteDomains( state ),
sites,
user: getCurrentUser( state ),
};
Expand Down
4 changes: 4 additions & 0 deletions client/my-sites/domains/domain-management/list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,7 @@ input[type='radio'].domain-management-list-item__radio {
.domain-item__icon {
fill: var( --color-text-subtle );
}

.list__action_item_placeholder {
@include placeholder( --color-neutral-5 );
}