NAS-131464: Make task history more prominent (#10808)

truenas · Oct 7, 2024 · 50b4b6c · 50b4b6c
1 parent f6f872a
commit 50b4b6c
Show file tree

Hide file tree

Showing 92 changed files with 271 additions and 95 deletions.
diff --git a/src/app/helptext/topbar.ts b/src/app/helptext/topbar.ts
@@ -23,7 +23,7 @@ export const helptextTopbar = {
     directory_services_monitor: T('Directory Services Monitor'),
     resilvering: T('Resilvering'),
     replication: T('Replication'),
-    task_manager: T('Jobs'),
+    task_manager: T('Running Jobs'),
     alerts: T('Alerts'),
     settings: T('Settings'),
     power: T('Power'),

diff --git a/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.html b/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.html
@@ -1,6 +1,6 @@
 <mat-dialog-content>
   <div class="jobs-header">
-    <h3>{{ 'Jobs' | translate }}</h3>
+    <h3>{{ 'Running Jobs' | translate }}</h3>
 
     <div class="badges">
       <div
@@ -51,7 +51,7 @@ <h3>{{ 'Jobs' | translate }}</h3>
       } @else {
         <div class="no-jobs">
           <ix-icon name="info"></ix-icon>
-          <h4 class="message">{{ 'There are no tasks.' | translate }}</h4>
+          <h4 class="message">{{ 'No jobs running.' | translate }}</h4>
         </div>
       }
     </div>
@@ -75,6 +75,6 @@ <h4 class="message">
     ixTest="history"
     (click)="goToJobs()"
   >
-    {{ 'History' | translate }}
+    {{ 'Go to Jobs Page' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.scss b/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.scss
@@ -6,7 +6,7 @@ $component-header: 50px;
 
     button {
       display: flex;
-      width: 100%;
+      margin: 0 auto;
     }
   }
 

diff --git a/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.spec.ts b/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.spec.ts
@@ -136,7 +136,7 @@ describe('JobsPanelComponent', () => {
   it('checks component header is present', () => {
     spectator.inject(Store).dispatch(adminUiInitialized());
 
-    expect(jobPanel.title).toHaveExactText('Jobs');
+    expect(jobPanel.title).toHaveExactText('Running Jobs');
     expect(jobPanel.runningBadgeCount).toHaveText('1');
     expect(jobPanel.waitingBadgeCount).toHaveText('1');
     expect(jobPanel.failedBadgeCount).toHaveText('1');
@@ -164,7 +164,7 @@ describe('JobsPanelComponent', () => {
   });
 
   it('checks redirect when "History" button is pressed', async () => {
-    const historyButton = await loader.getHarness(MatButtonHarness.with({ text: 'History' }));
+    const historyButton = await loader.getHarness(MatButtonHarness.with({ text: 'Go to Jobs Page' }));
     await historyButton.click();
 
     expect(spectator.inject(Router).navigate).toHaveBeenCalledWith(['/jobs']);

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -1965,6 +1965,7 @@
   "Go to Datasets": "",
   "Go to Documentation": "",
   "Go to HA settings": "",
+  "Go to Jobs Page": "",
   "Go to Storage": "",
   "Google Cloud Storage": "",
   "Google Drive": "",
@@ -2832,6 +2833,7 @@
   "No events to display.": "",
   "No interfaces configured with Virtual IP.": "",
   "No items have been added yet.": "",
+  "No jobs running.": "",
   "No logs are available": "",
   "No logs are available for this task.": "",
   "No logs available": "",
@@ -3446,6 +3448,7 @@
   "Run «{name}» Cloud Sync now?": "",
   "Run «{name}» Rsync now?": "",
   "Running": "",
+  "Running Jobs": "",
   "S.M.A.R.T.": "",
   "S.M.A.R.T. Extra Options": "",
   "S.M.A.R.T. Info for {disk}": "",
@@ -4350,7 +4353,6 @@
   "Theme": "",
   "There are no alerts.": "",
   "There are no records to show.": "",
-  "There are no tasks.": "",
   "There are pending network interface changes. Review them now?": "",
   "There are unapplied network interface changes that must be tested before being permanently saved. Test changes now?": "",
   "There is an upgrade waiting to finish.": "",