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

[SDESK-5998] feat(loader): Added improved loader for basic components #4055

Merged
merged 1 commit into from
Feb 1, 2022
Merged

[SDESK-5998] feat(loader): Added improved loader for basic components #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scripts/apps/monitoring/views/monitoring-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h2 id="monitoring-heading" class="a11y-only" ng-if="type === 'monitoring'" translate>Monitoring</h2>
<h2 id="monitoring-heading" class="a11y-only" ng-if="type === 'spike'" translate>Spiked items</h2>
<div class="preview-layout monitoring-preview-layout" sd-media-query min-width="700" element-class="narrowList" data-test-id="monitoring-view">
<div class="content-list monitoring__content" ng-if="!aggregate.loading">
<div class="content-list monitoring__content" ng-class="{'sd-loader': aggregate.loading}">
<div class="monitoring__toolbar-container" ng-if="hideMonitoringToolbar1 !== true || hideMonitoringToolbar2 !== true">
<div class="subnav" ng-if="hideMonitoringToolbar1 !== true">
<div class="flat-searchbar monitoring-backlink" ng-if="monitoring.singleGroup">
Expand Down Expand Up @@ -254,7 +254,7 @@ <h2 class="subnav__page-title sd-flex-no-grow sd-empty" ng-hide="monitoring.sing
</div>
</div>

<div class="monitoring__main-content">
<div class="monitoring__main-content" ng-if="!aggregate.loading">
<div class="sd-column-box--3">
<div ng-style="{{contentStyle}}" class="sd-column-box__main-column">
<!-- list view -->
Expand Down
3 changes: 2 additions & 1 deletion scripts/apps/search/components/SmoothLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, {CSSProperties} from 'react';
import {Loader} from 'superdesk-ui-framework/react/components/Loader';
import {ListItemLoader} from 'superdesk-ui-framework/react';

interface IProps {
loading: boolean;
Expand Down Expand Up @@ -54,7 +55,7 @@ export class SmoothLoader extends React.Component<IProps> {
{
loading && (
<div style={{height: '100%', position: 'relative'}}>
<Loader overlay />
<ListItemLoader />
<div
dangerouslySetInnerHTML={{__html: this.lastSnapshotHtml ?? '<div></div>'}}
style={{height: '100%'}}
Expand Down