Skip to content

Commit b7b9e5e

Browse files
committed
[C] Remove unstyled LoadingBlock
1 parent 767c870 commit b7b9e5e

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

client/src/frontend/containers/ProjectResources/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import PropTypes from "prop-types";
33
import { useTranslation } from "react-i18next";
44
import { useDispatch } from "react-redux";
55
import { useParams } from "react-router-dom";
6-
import LoadingBlock from "global/components/loading-block";
76
import { uiFrontendModeActions } from "actions";
87
import { projectsAPI } from "api";
98
import lh from "helpers/linkHandler";
@@ -61,7 +60,7 @@ export default function ProjectResourcesContainer({
6160
: [projectCrumb, resourcesCrumb].filter(Boolean);
6261
}, [journalBreadcrumbs, slug, titlePlaintext, t]);
6362

64-
if (!project) return <LoadingBlock />;
63+
if (!project) return null;
6564

6665
return (
6766
<>

client/src/frontend/containers/ResourceDetail/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { entityStoreActions, fatalErrorActions } from "actions";
77
import { select } from "utils/entityUtils";
88
import { resourcesAPI, resourceCollectionsAPI, requests } from "api";
99
import lh from "helpers/linkHandler";
10-
import LoadingBlock from "global/components/loading-block";
1110
import { RegisterBreadcrumbs } from "global/components/atomic/Breadcrumbs";
1211
import EntityHeadContent from "frontend/components/entity/HeadContent";
1312
import some from "lodash/some";
@@ -159,7 +158,7 @@ export class ResourceDetailContainer extends PureComponent {
159158
const { project, resource } = this.props;
160159

161160
if (!project || !resource) {
162-
return <LoadingBlock />;
161+
return null;
163162
}
164163

165164
return (
@@ -171,16 +170,14 @@ export class ResourceDetailContainer extends PureComponent {
171170
<CheckFrontendMode debugLabel="ResourceDetail" isProjectSubpage />
172171
<EntityHeadContent entity={resource} parentEntity={project} />
173172
<RegisterBreadcrumbs breadcrumbs={this.breadcrumbs()} />
174-
{resource ? (
173+
{resource && (
175174
<Resource.Detail
176175
projectId={project.id}
177176
projectUrl={this.projectUrl()}
178177
resourceUrl={this.resourceUrl()}
179178
resource={resource}
180179
dispatch={this.props.dispatch}
181180
/>
182-
) : (
183-
<LoadingBlock />
184181
)}
185182
</>
186183
);

client/src/global/components/loading-block/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)