Update schedule list (#17851)

1.Add Cron and Cron Type columns

Signed-off-by: AllForNothing <sshijun@vmware.com>

Signed-off-by: AllForNothing <sshijun@vmware.com>

src/portal/src/app/base/left-side-nav/job-service-dashboard/job-service-dashboard.interface.ts

@@ -24,3 +24,11 @@ export enum JobType {
     SCHEDULER = 'scheduler',
     ALL = 'all',
 }
+
+export const CronTypeI18nMap = {
+    None: 'SCHEDULE.NONE',
+    Daily: 'SCHEDULE.DAILY',
+    Weekly: 'SCHEDULE.WEEKLY',
+    Hourly: 'SCHEDULE.HOURLY',
+    Custom: 'SCHEDULE.CUSTOM',
+};

src/portal/src/app/base/left-side-nav/job-service-dashboard/schedule-list/schedule-list.component.html

@@ -15,11 +15,17 @@
     <clr-dg-column>{{
         'JOB_SERVICE_DASHBOARD.VENDOR_ID' | translate
     }}</clr-dg-column>
+    <clr-dg-column>{{
+        'JOB_SERVICE_DASHBOARD.CRON' | translate
+    }}</clr-dg-column>
+    <clr-dg-column>{{
+        'JOB_SERVICE_DASHBOARD.CRON_TYPE' | translate
+    }}</clr-dg-column>
     <clr-dg-column>{{
         'JOB_SERVICE_DASHBOARD.EXTRA_ATTR' | translate
     }}</clr-dg-column>
     <clr-dg-column [clrDgSortBy]="'creation_time'">{{
-        'PROJECT.CREATION_TIME' | translate
+        'REPLICATION.UPDATE_TIME' | translate
     }}</clr-dg-column>
     <clr-dg-placeholder>{{
         'JOB_SERVICE_DASHBOARD.NO_SCHEDULE' | translate
@@ -28,6 +34,8 @@
         <clr-dg-cell>{{ p.id }}</clr-dg-cell>
         <clr-dg-cell>{{ p.vendor_type }}</clr-dg-cell>
         <clr-dg-cell>{{ p.vendor_id }}</clr-dg-cell>
+        <clr-dg-cell>{{ p.cron }}</clr-dg-cell>
+        <clr-dg-cell>{{ toI18nString(p.cron_type) | translate }}</clr-dg-cell>
         <clr-dg-cell class="flex">
             <clr-signpost>
                 <a class="btn btn-link link-normal" clrSignpostTrigger>{{
@@ -44,7 +52,7 @@
                 </clr-signpost-content>
             </clr-signpost>
         </clr-dg-cell>
-        <clr-dg-cell>{{ p.creation_time | harborDatetime }}</clr-dg-cell>
+        <clr-dg-cell>{{ p.update_time | harborDatetime }}</clr-dg-cell>
     </clr-dg-row>
     <clr-dg-footer>
         <clr-dg-pagination

src/portal/src/app/base/left-side-nav/job-service-dashboard/schedule-list/schedule-list.component.ts

@@ -15,6 +15,7 @@ import {
 } from '../../../../services/event-service/event.service';
 import { Subscription } from 'rxjs';
 import { ScheduleService } from '../../../../../../ng-swagger-gen/services/schedule.service';
+import { CronTypeI18nMap } from '../job-service-dashboard.interface';
 
 @Component({
     selector: 'app-schedule-list',
@@ -96,4 +97,8 @@ export class ScheduleListComponent implements OnInit, OnDestroy {
         }
         return null;
     }
+
+    toI18nString(v: string): string {
+        return CronTypeI18nMap[v] ? CronTypeI18nMap[v] : v;
+    }
 }

src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.ts

@@ -12,7 +12,6 @@ import { OriginCron } from '../../services/interface';
 import { cronRegex } from '../../units/utils';
 import { TranslateService } from '@ngx-translate/core';
 import { ErrorHandler } from '../../units/error-handler/error-handler';
-import { JobserviceService } from '../../../../../ng-swagger-gen/services/jobservice.service';
 import { ScheduleService } from '../../../../../ng-swagger-gen/services/schedule.service';
 import { JobType } from '../../../base/left-side-nav/job-service-dashboard/job-service-dashboard.interface';
 const SCHEDULE_TYPE = {

src/portal/src/i18n/lang/de-de-lang.json

@@ -657,7 +657,7 @@
         "BANDWIDTH_TOOLTIP": "Legt die maximale Netzwerkbandbreite für jede Ausführung fest. Bitte auf die Anzahl der parallelen Ausführungen achten. Für umbegrenzte Bandbreite, bitte -1 eingeben",
         "UNLIMITED": "Unbegrenzt",
         "UNREACHABLE_SOURCE_REGISTRY": "Verbindung zur Quell-Registry fehlgeschlagen, bitte sicherstellen, dass die Quell-Registry verfügbar ist, bevor diese Regel angepasst wird: {{error}}",
-        "CRON_ERROR_TIP": "Das Feld ist erforderlich und \"*\" ist im \"Minuten\" Feld nicht erlaubt"
+        "CRON_ERROR_TIP": "Das Feld ist erforderlich und \"*\" ist im \"Minuten\" Feld nicht erlaubt",
         "COPY_BY_CHUNK": "Copy by chunk",
         "COPY_BY_CHUNK_TIP": "Specify whether to copy the blob by chunk. Transfer by chunk may increase the number of API requests."
     },
@@ -1829,11 +1829,21 @@
         "NO_WORKER": "Es konnte kein Arbeiter gefunden werden",
         "JOB_QUEUE": "Job-Warteschlange",
         "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+        "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+        "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+        "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+        "OPERATION_FREE_ALL": "Free all workers",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
         "QUEUE_STOP_BTN_INFO": "ANHALTEN — Hält alle Jobs einer Wartschlange an und entfernt sie von der Warteschlange.",
         "QUEUE_PAUSE_BTN_INFO": "PAUSIEREN — Pausiert die Ausführung von Jobs von diesem Typ der Warteschlange. Jobs können weiterhin der Warteschlange hinzugefügt werden.",
         "QUEUE_RESUME_BTN_INFO": "FORTSETZEN — Setzt die Ausführung von Jobs in der Warteschlange fort.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSIEREN — Pausiert die Ausführung aller Pläne.",
         "SCHEDULE_RESUME_BTN_INFO": "FORTSETZEN — Setzt die Ausführung aller Pläne fort.",
-        "WORKER_FREE_BTN_INFO": "Halte den aktuell laufenden Job an um den Arbeiter zu befreien."
+        "WORKER_FREE_BTN_INFO": "Halte den aktuell laufenden Job an um den Arbeiter zu befreien.",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/en-us-lang.json

@@ -1842,6 +1842,8 @@
         "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
         "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedules to execute.",
-        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/es-es-lang.json

@@ -1828,11 +1828,21 @@
         "NO_WORKER": "We could not find any worker",
         "JOB_QUEUE": "Job Queues",
         "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+        "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+        "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+        "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+        "OPERATION_FREE_ALL": "Free all workers",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
         "QUEUE_STOP_BTN_INFO": "STOP — Stop and remove all jobs in the selected queue(s).",
         "QUEUE_PAUSE_BTN_INFO": "PAUSE — Pause the execution of jobs in this type of job queue. Jobs can be enqueued when the queue is paused.",
         "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
         "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedules to execute.",
-        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/fr-fr-lang.json

@@ -1798,11 +1798,21 @@
         "NO_WORKER": "We could not find any worker",
         "JOB_QUEUE": "Job Queues",
         "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+        "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+        "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+        "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+        "OPERATION_FREE_ALL": "Free all workers",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
         "QUEUE_STOP_BTN_INFO": "STOP — Stop and remove all jobs in the selected queue(s).",
         "QUEUE_PAUSE_BTN_INFO": "PAUSE — Pause the execution of jobs in this type of job queue. Jobs can be enqueued when the queue is paused.",
         "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
         "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedule to execute.",
-        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/pt-br-lang.json

@@ -1825,11 +1825,21 @@
         "NO_WORKER": "We could not find any worker",
         "JOB_QUEUE": "Job Queues",
         "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+        "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+        "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+        "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+        "OPERATION_FREE_ALL": "Free all workers",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
         "QUEUE_STOP_BTN_INFO": "STOP — Stop and remove all jobs in the selected queue(s).",
         "QUEUE_PAUSE_BTN_INFO": "PAUSE — Pause the execution of jobs in this type of job queue. Jobs can be enqueued when the queue is paused.",
         "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
         "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedule to execute.",
-        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/tr-tr-lang.json

@@ -1829,11 +1829,21 @@
         "NO_WORKER": "We could not find any worker",
         "JOB_QUEUE": "Job Queues",
         "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+        "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+        "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+        "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+        "OPERATION_FREE_ALL": "Free all workers",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
         "QUEUE_STOP_BTN_INFO": "STOP — Stop and remove all jobs in the selected queue(s).",
         "QUEUE_PAUSE_BTN_INFO": "PAUSE — Pause the execution of jobs in this type of job queue. Jobs can be enqueued when the queue is paused.",
         "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
         "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
         "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedule to execute.",
-        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+        "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron Type"
     }
 }

src/portal/src/i18n/lang/zh-cn-lang.json

@@ -1827,11 +1827,21 @@
         "NO_WORKER": "未发现任何工作者",
         "JOB_QUEUE": "任务栈",
         "JOB_SERVICE_DASHBOARD": "任务中心",
+        "OPERATION_STOP_ALL_QUEUES": "停止全部任务栈",
+        "OPERATION_STOP_SPECIFIED_QUEUES": "停止指定任务栈",
+        "OPERATION_PAUSE_SPECIFIED_QUEUES": "暂停指定任务栈",
+        "OPERATION_RESUME_SPECIFIED_QUEUES": "重启指定任务栈",
+        "OPERATION_PAUSE_SCHEDULE": "暂停所有定时任务",
+        "OPERATION_RESUME_SCHEDULE": "重启所有定时任务",
+        "OPERATION_FREE_ALL": "停下所有工作者",
+        "OPERATION_FREE_SPECIFIED_WORKERS": "停下指定工作者",
         "QUEUE_STOP_BTN_INFO": "停止 — 停止选中的任务栈中所有正在执行的任务，并清空任务栈。",
         "QUEUE_PAUSE_BTN_INFO": "暂停 — 暂停执行选中的任务栈中的任务，当任务栈处于暂停状态时，进入该栈的任务会进入待执行状态。",
         "QUEUE_RESUME_BTN_INFO": "重启 — 重启选中的任务栈并开始执行栈中的任务。",
         "SCHEDULE_PAUSE_BTN_INFO": "暂停 — 暂停所有定时任务，暂停中的定时任务将不会被执行。",
         "SCHEDULE_RESUME_BTN_INFO": "重启 — 重启所有定时任务，定时任务在触发时会正常执行。",
-        "WORKER_FREE_BTN_INFO": "停下选中的工作者当前正在执行的任务以便释放该工作者，被释放的工作会继续执行其他任务。"
+        "WORKER_FREE_BTN_INFO": "停下选中的工作者当前正在执行的任务以便释放该工作者，被释放的工作者会继续执行其他任务。",
+        "CRON": "Cron",
+        "CRON_TYPE": "Cron 类型"
     }
 }

src/portal/src/i18n/lang/zh-tw-lang.json

@@ -1820,11 +1820,21 @@
     "NO_WORKER": "We could not find any worker",
     "JOB_QUEUE": "Job Queues",
     "JOB_SERVICE_DASHBOARD": "Job Service Dashboard",
+    "OPERATION_STOP_ALL_QUEUES": "Stop all job queues",
+    "OPERATION_STOP_SPECIFIED_QUEUES": "Stop specified job queues",
+    "OPERATION_PAUSE_SPECIFIED_QUEUES": "Pause specified job queues",
+    "OPERATION_RESUME_SPECIFIED_QUEUES": "Resume specified job queues",
+    "OPERATION_PAUSE_SCHEDULE": "Pause all schedules",
+    "OPERATION_RESUME_SCHEDULE": "Resume all schedules",
+    "OPERATION_FREE_ALL": "Free all workers",
+    "OPERATION_FREE_SPECIFIED_WORKERS": "Free specified workers",
     "QUEUE_STOP_BTN_INFO": "STOP — Stop and remove all jobs in the selected queue(s).",
     "QUEUE_PAUSE_BTN_INFO": "PAUSE — Pause the execution of jobs in this type of job queue. Jobs can be enqueued when the queue is paused.",
     "QUEUE_RESUME_BTN_INFO": "RESUME — Resume the execution of jobs in this type of job queue.",
     "SCHEDULE_PAUSE_BTN_INFO": "PAUSE — Pause all schedules to execute.",
     "SCHEDULE_RESUME_BTN_INFO": "RESUME — Resume all schedule to execute.",
-    "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker"
+    "WORKER_FREE_BTN_INFO": "Stop the current running job to free the worker",
+    "CRON": "Cron",
+    "CRON_TYPE": "Cron Type"
   }
 }