agendash 2.0.0 → 3.1.0

package/lib/middlewares/hapi.js

@@ -1,76 +1,101 @@
-const path = require('path');
-const pack = require('../../package.json');
+const path = require("path");
+const pack = require("../../package.json");
+const csp = require("../csp");
 
-module.exports = agendash => {
-  const {api, requeueJobs, deleteJobs, createJob} = agendash;
+module.exports = (agendash) => {
+  const { api, requeueJobs, deleteJobs, createJob } = agendash;
   return {
     pkg: pack,
     register: (server, options) => {
+      server.ext("onPreResponse", (req, h) => {
+        req.response.header("Content-Security-Policy", csp);
+        return h.continue;
+      });
+
       server.route([
         {
-          method: 'GET',
-          path: '/{param*}',
+          method: "GET",
+          path: "/{param*}",
           handler: {
             directory: {
-              path: path.join(__dirname, '../../public')
-            }
+              path: path.join(__dirname, "../../public"),
+            },
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'GET',
-          path: '/api',
+          method: "GET",
+          path: "/api",
           handler(request) {
-            const {job, state, limit, skip, q, property, isObjectId} = request.query;
-            return api(job, state, {query: q, property, isObjectId, skip, limit});
+            const {
+              job,
+              state,
+              limit,
+              skip,
+              q,
+              property,
+              isObjectId,
+            } = request.query;
+            return api(job, state, {
+              query: q,
+              property,
+              isObjectId,
+              skip,
+              limit,
+            });
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/requeue',
+          method: "POST",
+          path: "/api/jobs/requeue",
           handler(request) {
             return requeueJobs(request.payload.jobIds);
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/delete',
+          method: "POST",
+          path: "/api/jobs/delete",
           async handler(request, h) {
             const deleted = await deleteJobs(request.payload.jobIds);
             if (deleted) {
-              return h.response({deleted: true});
+              return h.response({ deleted: true });
             }
 
             return h.code(404);
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/create',
+          method: "POST",
+          path: "/api/jobs/create",
           async handler(request, h) {
-            const created = await createJob(request.payload.jobName, request.payload.jobSchedule, request.payload.jobRepeatEvery, request.payload.jobData);
+            const created = await createJob(
+              request.payload.jobName,
+              request.payload.jobSchedule,
+              request.payload.jobRepeatEvery,
+              request.payload.jobData
+            );
             if (created) {
-              return h.response({created: true});
+              return h.response({ created: true });
             }
 
             return h.code(404);
           },
           config: {
-            auth: options.auth || false
-          }
-        }
+            auth: options.auth || false,
+          },
+        },
       ]);
-    }
+    },
   };
 };

package/lib/middlewares/koa.js

@@ -1,28 +1,42 @@
-const path = require('path');
-const bodyParser = require('koa-bodyparser');
-const Router = require('koa-router');
-const koaStatic = require('koa-static');
+const path = require("path");
+const bodyParser = require("koa-bodyparser");
+const Router = require("koa-router");
+const koaStatic = require("koa-static");
+const csp = require("../csp");
 
-module.exports = agendash => {
+module.exports = (agendash) => {
   const middlewares = [];
 
-  middlewares.push(koaStatic(path.resolve(__dirname, '../../public'), {defer: true}));
+  middlewares.push(async (ctx, next) => {
+    await next();
+    ctx.set("Content-Security-Policy", csp);
+  });
+
+  middlewares.push(
+    koaStatic(path.resolve(__dirname, "../../public"), { defer: true })
+  );
 
   middlewares.push(bodyParser());
 
   const routerApi = new Router();
 
-  routerApi.get('/api', async({response, query}) => {
-    const {job, state, skip, limit, q, property, isObjectId} = query;
+  routerApi.get("/api", async ({ response, query }) => {
+    const { job, state, skip, limit, q, property, isObjectId } = query;
     try {
-      response.body = await agendash.api(job, state, {query: q, property, isObjectId, skip, limit});
+      response.body = await agendash.api(job, state, {
+        query: q,
+        property,
+        isObjectId,
+        skip,
+        limit,
+      });
     } catch (error) {
       response.status = 400;
       response.body = error;
     }
   });
 
-  routerApi.post('/api/jobs/requeue', async({request, response}) => {
+  routerApi.post("/api/jobs/requeue", async ({ request, response }) => {
     try {
       response.body = await agendash.requeueJobs(request.body.jobIds);
     } catch (error) {
@@ -31,11 +45,11 @@ module.exports = agendash => {
     }
   });
 
-  routerApi.post('/api/jobs/delete', async({request, response}) => {
+  routerApi.post("/api/jobs/delete", async ({ request, response }) => {
     try {
       await agendash.deleteJobs(request.body.jobIds);
       response.body = {
-        deleted: true
+        deleted: true,
       };
     } catch (error) {
       response.status = 404;
@@ -43,18 +57,13 @@ module.exports = agendash => {
     }
   });
 
-  routerApi.post('/api/jobs/create', async({request, response}) => {
-    const {
-      jobData,
-      jobName,
-      jobSchedule,
-      jobRepeatEvery
-    } = request.body;
+  routerApi.post("/api/jobs/create", async ({ request, response }) => {
+    const { jobData, jobName, jobSchedule, jobRepeatEvery } = request.body;
 
     try {
       await agendash.createJob(jobName, jobSchedule, jobRepeatEvery, jobData);
       response.body = {
-        created: true
+        created: true,
       };
     } catch (error) {
       response.status = 404;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agendash",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "description": "A modern dashboard for Agenda.js with Pagination and Search capabilities",
   "main": "app.js",
   "bin": "bin/agendash-standalone.js",
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "test": "run-p lint ava",
-    "lint": "xo",
+    "lint": "eslint ./",
     "ava": "ava -v -c 1"
   },
   "keywords": [
@@ -27,8 +27,17 @@
   },
   "homepage": "https://github.com/agenda/agendash#readme",
   "license": "MIT",
+  "files": [
+    "bin",
+    "lib",
+    "public",
+    "app.js",
+    "*.png",
+    "Dockerfile",
+    "entrypoint.sh"
+  ],
   "dependencies": {
-    "agenda": "^3.1.0 || ^4.0.0",
+    "agenda": "^4.2.1",
     "body-parser": "^1.15.0",
     "commander": "^2.9.0",
     "express": "^4.0.0",
@@ -36,38 +45,31 @@
     "semver": "^7.3.4"
   },
   "devDependencies": {
-    "@hapi/hapi": "^19.1.1",
-    "@hapi/inert": "^6.0.1",
-    "ava": "^3.5.1",
-    "koa": "^2.13.1",
-    "koa-bodyparser": "^4.3.0",
-    "koa-router": "^10.0.0",
-    "koa-static": "^5.0.0",
-    "npm-run-all": "^4.1.2",
-    "supertest": "^6.1.1",
-    "xo": "^0.37.1"
+    "@hapi/hapi": "^20.2.1",
+    "@hapi/inert": "^6.0.5",
+    "ava": "3.15.0",
+    "eslint": "7.19.0",
+    "fastify": "^3.24.0",
+    "fastify-static": "^4.5.0",
+    "koa": "2.13.1",
+    "koa-bodyparser": "4.3.0",
+    "koa-router": "10.0.0",
+    "koa-static": "5.0.0",
+    "npm-run-all": "4.1.5",
+    "prettier": "2.2.1",
+    "supertest": "^6.2.2"
   },
-  "xo": {
-    "space": 2,
-    "rules": {
-      "space-before-function-paren": [
-        "error",
-        "never"
-      ],
-      "max-params": [
-        "error",
-        5
-      ],
-      "max-nested-callbacks": [
-        "error",
-        5
-      ]
+  "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 2019
+    },
+    "env": {
+      "es6": true,
+      "node": true
     },
-    "envs": [
-      "node"
-    ],
-    "ignores": [
-      "public/**/*"
-    ]
-  }
+    "extends": "eslint:recommended"
+  },
+  "eslintIgnore": [
+    "public"
+  ]
 }

package/public/app/js/confirmDelete.js

@@ -1,17 +1,18 @@
-const confirmDelete = Vue.component('confirm-delete', {
-  props: ['job'],
+const confirmDelete = Vue.component("confirm-delete", {
+  props: ["job"],
   methods: {
-    deleteOne(id){
+    deleteOne(id) {
       const url = `api/jobs/delete`;
-      let body = {jobIds: [id]};
-      return axios.post(url, body)
-        .then(result => result.data)
-        .then(data => {
-          this.$emit('popup-message', 'delete');
-          this.$emit('refresh-data');
+      let body = { jobIds: [id] };
+      return axios
+        .post(url, body)
+        .then((result) => result.data)
+        .then((data) => {
+          this.$emit("popup-message", "delete");
+          this.$emit("refresh-data");
         })
-        .catch(console.log)
-    }
+        .catch(console.log);
+    },
   },
   template: `
   <div class="modal fade" id="modalDeleteSure" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
@@ -35,5 +36,5 @@ const confirmDelete = Vue.component('confirm-delete', {
       </div>
     </div>
   </div>
-  `
-})
+  `,
+});

package/public/app/js/confirmDeleteMulti.js

@@ -1,17 +1,18 @@
-const confirmDeleteMulti = Vue.component('confirm-multi-delete', {
-  props: ['jobs'],
+const confirmDeleteMulti = Vue.component("confirm-multi-delete", {
+  props: ["jobs"],
   methods: {
-    deleteMulti(ids){
+    deleteMulti(ids) {
       const url = `api/jobs/delete`;
-      let body = {jobIds: ids};
-      return axios.post(url, body)
-        .then(result => result.data)
-        .then(data => {
-          this.$emit('popup-message', 'delete');
-          this.$emit('refresh-data');
+      let body = { jobIds: ids };
+      return axios
+        .post(url, body)
+        .then((result) => result.data)
+        .then((data) => {
+          this.$emit("popup-message", "delete");
+          this.$emit("refresh-data");
         })
-        .catch(console.log)
-    }
+        .catch(console.log);
+    },
   },
   template: `
   <div class="modal fade" id="modalDeleteSureMulti" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
@@ -40,5 +41,5 @@ const confirmDeleteMulti = Vue.component('confirm-multi-delete', {
       </div>
     </div>
   </div>
-  `
-})
+  `,
+});

package/public/app/js/confirmRequeue.js

@@ -1,17 +1,18 @@
-const confirmRequeue = Vue.component('confirm-requeue', {
-  props: ['job'],
+const confirmRequeue = Vue.component("confirm-requeue", {
+  props: ["job"],
   methods: {
-    RequeueOne(id){
+    RequeueOne(id) {
       const url = `api/jobs/requeue`;
-      let body = {jobIds: [id]};
-      return axios.post(url, body)
-        .then(result => result.data)
-        .then(data => {
-          this.$emit('popup-message');
-          this.$emit('refresh-data');
+      let body = { jobIds: [id] };
+      return axios
+        .post(url, body)
+        .then((result) => result.data)
+        .then((data) => {
+          this.$emit("popup-message");
+          this.$emit("refresh-data");
         })
-        .catch(console.log)
-    }
+        .catch(console.log);
+    },
   },
   template: `
   <div class="modal fade" id="modalRequeueSure" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
@@ -35,5 +36,5 @@ const confirmRequeue = Vue.component('confirm-requeue', {
       </div>
     </div>
   </div>
-  `
-})
+  `,
+});

package/public/app/js/confirmRequeueMulti.js

@@ -1,18 +1,19 @@
-const confirmRequeueMulti = Vue.component('confirm-multi-requeue', {
-  props: ['jobs'],
+const confirmRequeueMulti = Vue.component("confirm-multi-requeue", {
+  props: ["jobs"],
   methods: {
-    RequeueMulti(ids){
+    RequeueMulti(ids) {
       const url = `api/jobs/requeue`;
-      let body = {jobIds: ids};
-      return axios.post(url, body)
-        .then(result => result.data)
-        .then(data => {
-          this.$emit('popup-message');
-          this.$emit('refresh-data');
-          this.$emit('ready-clean')
+      let body = { jobIds: ids };
+      return axios
+        .post(url, body)
+        .then((result) => result.data)
+        .then((data) => {
+          this.$emit("popup-message");
+          this.$emit("refresh-data");
+          this.$emit("ready-clean");
         })
-        .catch(console.log)
-    }
+        .catch(console.log);
+    },
   },
   template: `
   <div class="modal fade" id="modalRequeueSureMulti" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
@@ -40,5 +41,5 @@ const confirmRequeueMulti = Vue.component('confirm-multi-requeue', {
       </div>
     </div>
   </div>
-  `
-})
+  `,
+});

package/public/app/js/confirms.js

@@ -1,8 +1,8 @@
-const popupmessage = Vue.component('popup-message', {
-  props: ['job','deletec','requeuec','createc'],
+const popupmessage = Vue.component("popup-message", {
+  props: ["job", "deletec", "requeuec", "createc"],
   template: `
    <div v-if="deletec" class="alert alert-success popupmessage">Job Deleted successfull</div>
    <div v-else-if="requeuec" class="alert alert-success popupmessage">Job Requeue successfull</div>
    <div v-else-if="createc" class="alert alert-success popupmessage">Job Created successfull</div>
-  `
-})
+  `,
+});

package/public/app/js/jobdetail.js

@@ -1,14 +1,14 @@
-const jobDetail = Vue.component('job-detail', {
-  props: ['job'],
+const jobDetail = Vue.component("job-detail", {
+  props: ["job"],
   filters: {
-    formatJSON(jsonstr){
+    formatJSON(jsonstr) {
       return JSON.stringify(jsonstr, null, 2);
     },
   },
   methods: {
-    formatDate(date){
-      return moment(date).format('DD-MM-YYYY HH:mm:ss')
-    }
+    formatDate(date) {
+      return moment(date).format("DD-MM-YYYY HH:mm:ss");
+    },
   },
   template: `
   <div class="modal fade" id="modalData" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
@@ -24,7 +24,7 @@ const jobDetail = Vue.component('job-detail', {
         <div class="modal-body">
         <div class="row my-3">
           <div class="col">
-            <p><strong>Next run starts: </strong>{{ formatDate(job.job.lastRunAt) }}</p>
+            <p><strong>Next run starts: </strong>{{ formatDate(job.job.nextRunAt) }}</p>
             <p><strong>Last run started: </strong>{{ formatDate(job.job.lastRunAt) }}</p>
           </div>
         </div>
@@ -44,5 +44,5 @@ const jobDetail = Vue.component('job-detail', {
       </div>
     </div>
   </div>
-  `
-})
+  `,
+});