Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
truenas-rk3588
webui
Commits
106a3ed6
Commit
106a3ed6
authored
1 year ago
by
Oleksandr Karpov
Browse files
Options
Download
Email Patches
Plain Diff
NAS-127794: Dashboard - Backup Tasks - Infinite loading on m40
parent
fce73381
NAS-127794
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/pages/dashboard/components/widget-backup/widget-backup.component.ts
+9
-4
...board/components/widget-backup/widget-backup.component.ts
with
9 additions
and
4 deletions
+9
-4
src/app/pages/dashboard/components/widget-backup/widget-backup.component.ts
View file @
106a3ed6
...
...
@@ -5,11 +5,16 @@ import { MediaObserver } from '@angular/flex-layout';
import
{
UntilDestroy
,
untilDestroyed
}
from
'
@ngneat/until-destroy
'
;
import
{
TranslateService
}
from
'
@ngx-translate/core
'
;
import
{
differenceInDays
}
from
'
date-fns
'
;
import
{
filter
,
forkJoin
}
from
'
rxjs
'
;
import
{
catchError
,
filter
,
forkJoin
,
of
,
}
from
'
rxjs
'
;
import
{
Direction
}
from
'
app/enums/direction.enum
'
;
import
{
JobState
}
from
'
app/enums/job-state.enum
'
;
import
{
ScreenType
}
from
'
app/enums/screen-type.enum
'
;
import
{
ApiTimestamp
}
from
'
app/interfaces/api-date.interface
'
;
import
{
CloudSyncTask
}
from
'
app/interfaces/cloud-sync-task.interface
'
;
import
{
ReplicationTask
}
from
'
app/interfaces/replication-task.interface
'
;
import
{
RsyncTask
}
from
'
app/interfaces/rsync-task.interface
'
;
import
{
WidgetComponent
}
from
'
app/pages/dashboard/components/widget/widget.component
'
;
import
{
CloudsyncWizardComponent
}
from
'
app/pages/data-protection/cloudsync/cloudsync-wizard/cloudsync-wizard.component
'
;
import
{
ReplicationWizardComponent
}
from
'
app/pages/data-protection/replication/replication-wizard/replication-wizard.component
'
;
...
...
@@ -123,9 +128,9 @@ export class WidgetBackupComponent extends WidgetComponent implements OnInit {
getBackups
():
void
{
this
.
isLoading
=
true
;
forkJoin
([
this
.
ws
.
call
(
'
replication.query
'
),
this
.
ws
.
call
(
'
rsynctask.query
'
),
this
.
ws
.
call
(
'
cloudsync.query
'
),
this
.
ws
.
call
(
'
replication.query
'
)
.
pipe
(
catchError
(()
=>
of
([]
as
ReplicationTask
[])))
,
this
.
ws
.
call
(
'
rsynctask.query
'
)
.
pipe
(
catchError
(()
=>
of
([]
as
RsyncTask
[])))
,
this
.
ws
.
call
(
'
cloudsync.query
'
)
.
pipe
(
catchError
(()
=>
of
([]
as
CloudSyncTask
[])))
,
]).
pipe
(
untilDestroyed
(
this
)).
subscribe
(([
replicationTasks
,
rsyncTasks
,
cloudSyncTasks
])
=>
{
this
.
isLoading
=
false
;
this
.
backups
=
[
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help