@qodalis/cli-server-jobs 2.4.2 → 2.5.0

package/umd/index.global.js

@@ -2053,6 +2053,7 @@ var jobs = (() => {
     }
     return resolveHeaders(configHeaders);
   }
+  var ICliSecretStore_TOKEN = createCliToken("cli-secret-store");
   var ICliCommandGuard_TOKEN = createCliToken("cli-command-guard");
   var ICliEventBus_TOKEN = createCliToken("cli-event-bus");
   var DefaultLibraryAuthor = {
@@ -2943,11 +2944,11 @@ var jobs = (() => {
       context,
       rows,
       (cmd) => cmd,
-      (comment) => writer.wrapInColor(
+      (comment) => comment ? writer.wrapInColor(
         `# ${comment}`,
         "\x1B[32m"
         /* Green */
-      )
+      ) : ""
     );
   }
   function writeWrapped(context, text, indent = 0) {
@@ -3157,6 +3158,14 @@ var jobs = (() => {
   };
 
   // src/lib/services/cli-jobs-service.ts
+  function jobHasTags(job, tags) {
+    const own = new Set((job.tags ?? []).map((t) => t.toLowerCase()));
+    return tags.every((t) => own.has(t.toLowerCase()));
+  }
+  function parseTagArgs(value) {
+    const values = Array.isArray(value) ? value : value === void 0 || value === null || value === true ? [] : [value];
+    return values.flatMap((v) => String(v).split(",")).map((t) => t.trim()).filter(Boolean);
+  }
   var CliJobsService = class {
     constructor(baseUrl, headers = {}) {
       this.baseUrl = baseUrl;
@@ -3189,8 +3198,15 @@ var jobs = (() => {
       }
       return JSON.parse(text);
     }
-    async listJobs() {
-      return this.request("");
+    /**
+     * The jobs; with `tags`, only those that have every tag (ignoring case). The server filters
+     * (`?tag=`), and the list is filtered here too, so a server without job tags lists nothing
+     * for a tag filter instead of every job.
+     */
+    async listJobs(tags = []) {
+      const query = tags.map((t) => `tag=${encodeURIComponent(t)}`).join("&");
+      const jobs = await this.request(query ? `?${query}` : "");
+      return tags.length ? jobs.filter((j) => jobHasTags(j, tags)) : jobs;
     }
     async getJob(id) {
       return this.request(`/${encodeURIComponent(id)}`);
@@ -3338,6 +3354,9 @@ var jobs = (() => {
     if (job.queued) parts.push("1 queued");
     return parts.join(", ");
   }
+  function formatTags(tags) {
+    return tags && tags.length > 0 ? tags.join(", ") : "-";
+  }
   function formatDuration(ms) {
     if (ms == null) return "-";
     if (ms < 1e3) return `${ms}ms`;
@@ -3435,12 +3454,14 @@ var jobs = (() => {
                 context.writer.writeln();
                 writeUsage(context, [
                   ["server jobs list", t.t("cli.server.jobs.list.help.jobs_all_connected_servers", "Jobs on all connected servers")],
-                  ["server jobs ls --group <name>", t.t("cli.server.jobs.list.help.only_one_group", "Only one group")]
+                  ["server jobs ls --group <name>", t.t("cli.server.jobs.list.help.only_one_group", "Only one group")],
+                  ["server jobs ls --tag <tag> [--tag <tag>]", t.t("cli.server.jobs.list.help.only_tagged", "Only the jobs that have every tag given")]
                 ]);
                 context.writer.writeln();
                 writeExamples(context, [
                   ["server jobs ls --server node", t.t("cli.server.jobs.list.help.jobs_node_server", "Jobs on the node server")],
-                  ["server jobs list --group reports", t.t("cli.server.jobs.list.help.jobs_reports_group", "Jobs in the reports group")]
+                  ["server jobs list --group reports", t.t("cli.server.jobs.list.help.jobs_reports_group", "Jobs in the reports group")],
+                  ["server jobs list --tag country:ro --tag bank", t.t("cli.server.jobs.list.help.jobs_tagged", "Jobs tagged both country:ro and bank")]
                 ]);
               },
               aliases: ["ls"],
@@ -3451,6 +3472,12 @@ var jobs = (() => {
                   description: "Filter jobs by group",
                   required: false,
                   type: "string"
+                },
+                {
+                  name: "tag",
+                  description: "Only jobs that have this tag (repeatable or comma-separated; every tag must match)",
+                  required: false,
+                  type: "array"
                 }
               ],
               processCommand: async (cmd, context) => {
@@ -3765,10 +3792,11 @@ var jobs = (() => {
         return;
       }
       const groupFilter = cmd.args["group"];
+      const tagFilter = parseTagArgs(cmd.args["tag"]);
       const multiServer = services.length > 1;
       for (const { name, service } of services) {
         try {
-          let jobs = await service.listJobs();
+          let jobs = await service.listJobs(tagFilter);
           if (groupFilter) {
             jobs = jobs.filter(
               (j) => j.group?.toLowerCase() === groupFilter.toLowerCase()
@@ -3786,9 +3814,11 @@ var jobs = (() => {
             context.writer.writeInfo("  No jobs found.");
             continue;
           }
+          const showTags = jobs.some((j) => (j.tags?.length ?? 0) > 0);
           const headers = [
             "Name",
             "Group",
+            ...showTags ? ["Tags"] : [],
             "Status",
             "Schedule",
             "Last Run",
@@ -3798,6 +3828,7 @@ var jobs = (() => {
           const rows = jobs.map((j) => [
             j.name,
             j.group ?? "-",
+            ...showTags ? [formatTags(j.tags)] : [],
             statusColor(j.status, context.writer),
             j.schedule ?? (formatSpan(j.interval) ? `every ${formatSpan(j.interval)}` : "-"),
             formatRelativeTime(j.lastRunAt),
@@ -3834,6 +3865,7 @@ var jobs = (() => {
           ["Name", job.name],
           ["Description", job.description],
           ["Group", job.group ?? "-"],
+          ["Tags", formatTags(job.tags)],
           ["Status", statusColor(job.status, context.writer)],
           [
             "Schedule",
@@ -4090,6 +4122,10 @@ var jobs = (() => {
         const newGroup = await ask(`Group [${job.group ?? "none"}]: `);
         if (newGroup == null) return cancelled();
         if (newGroup) update.group = newGroup;
+        const newTags = await ask(`Tags, comma-separated, - for none [${formatTags(job.tags)}]: `);
+        if (newTags == null) return cancelled();
+        if (newTags.trim() === "-") update.tags = null;
+        else if (newTags.trim()) update.tags = parseTagArgs(newTags);
         const currentSchedule = job.schedule ?? (formatSpan(job.interval) ? `interval: ${formatSpan(job.interval)}` : "none");
         const newSchedule = await ask(
           `Cron schedule [${currentSchedule}]: `