@luisrodrigues/nestjs-scheduler-dashboard 0.1.4 → 0.1.6

package/dist/decorators/track-job.decorator.js

@@ -54,6 +54,9 @@ function TrackJob(cronTime, options) {
         const original = descriptor.value;
         const jobName = options?.name ?? `${target.constructor.name}.${String(propertyKey)}`;
         const jobNoOverlap = options?.noOverlap;
+        if (options?.disabled) {
+            scheduler_dash_context_1.SchedulerDashContext.disabledJobs.add(jobName);
+        }
         descriptor.value = async function (...args) {
             const noOverlap = jobNoOverlap ?? scheduler_dash_context_1.SchedulerDashContext.noOverlap;
             const storage = scheduler_dash_context_1.SchedulerDashContext.storage;

package/dist/jobs.service.d.ts

@@ -8,6 +8,7 @@ export declare class JobsService {
         cron: {
             name: string;
             cronExpression: string;
+            active: boolean;
             running: boolean;
             nextRun: string;
             history: import(".").JobExecution[];
@@ -23,6 +24,7 @@ export declare class JobsService {
     getJob(name: string): {
         name: string;
         cronExpression: string;
+        active: boolean;
         running: boolean;
         nextRun: string;
         history: import(".").JobExecution[];

package/dist/jobs.service.js

@@ -15,6 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsService = void 0;
 const common_1 = require("@nestjs/common");
 const schedule_1 = require("@nestjs/schedule");
+const storage_abstract_1 = require("./storage/storage.abstract");
+const job_concurrency_1 = require("./decorators/job-concurrency");
+const scheduler_dash_context_1 = require("./scheduler-dash.context");
+const scheduler_dash_constants_1 = require("./scheduler-dash.constants");
 function resolveNextRun(job) {
     try {
         const next = job.nextDate?.();
@@ -37,30 +41,27 @@ function resolveCronExpression(cronTime) {
     const src = ct['source'] ?? ct['_source'];
     if (typeof src === 'string')
         return src;
-    if (typeof cronTime.toString === 'function') {
-        const str = cronTime.toString();
-        if (str !== '[object Object]')
-            return str;
-    }
-    return null;
+    const str = cronTime.toString?.();
+    return str && str !== '[object Object]' ? str : null;
 }
-const storage_abstract_1 = require("./storage/storage.abstract");
-const job_concurrency_1 = require("./decorators/job-concurrency");
-const scheduler_dash_constants_1 = require("./scheduler-dash.constants");
 let JobsService = class JobsService {
     constructor(schedulerRegistry, storage) {
         this.schedulerRegistry = schedulerRegistry;
         this.storage = storage;
     }
     getJobs() {
-        const cron = [...this.schedulerRegistry.getCronJobs().entries()].map(([name, job]) => ({
-            name,
-            cronExpression: resolveCronExpression(job.cronTime),
-            running: job.running ?? false,
-            nextRun: job.nextDate()?.toISO() ?? null,
-            history: this.storage.findByJob(name),
-            metrics: this.storage.getMetrics(name),
-        }));
+        const cron = [...this.schedulerRegistry.getCronJobs().entries()].map(([name, job]) => {
+            const nextRun = resolveNextRun(job);
+            return {
+                name,
+                cronExpression: resolveCronExpression(job.cronTime),
+                active: !scheduler_dash_context_1.SchedulerDashContext.disabledJobs.has(name),
+                running: job.running ?? false,
+                nextRun,
+                history: this.storage.findByJob(name),
+                metrics: this.storage.getMetrics(name),
+            };
+        });
         const intervals = this.schedulerRegistry.getIntervals().map((name) => ({ name }));
         const timeouts = this.schedulerRegistry.getTimeouts().map((name) => ({ name }));
         return { cron, intervals, timeouts };
@@ -69,11 +70,13 @@ let JobsService = class JobsService {
         const job = this.schedulerRegistry.getCronJobs().get(name);
         if (!job)
             return null;
+        const nextRun = resolveNextRun(job);
         return {
             name,
             cronExpression: resolveCronExpression(job.cronTime),
+            active: !scheduler_dash_context_1.SchedulerDashContext.disabledJobs.has(name),
             running: job.running ?? false,
-            nextRun: job.nextDate()?.toISO() ?? null,
+            nextRun,
             history: this.storage.findByJob(name),
             metrics: this.storage.getMetrics(name),
         };