Release 2.9.0

src/web/routes/data-sources/rss-feeds/form-view-model.js

@@ -3,6 +3,7 @@
 function buildDefaultRssFeed() {
   return {
     id: null,
+    enabled: 1,
     name: '',
     feedUrl: '',
     updateIntervalValue: 60,

src/web/routes/data-sources/rss-feeds/routes.js

@@ -249,6 +249,19 @@ module.exports = function registerRssFeedRoutes(app, deps) {
         return res.status(404).send('RSS feed not found');
       }
 
+      if (String(req.body && req.body.data_source_action || '').trim() === 'toggle') {
+        const enabled = rssFeed.enabled === 0 || rssFeed.enabled === false ? 1 : 0;
+        await connection.query('UPDATE i_rss_feeds SET enabled = ?, modified_by = ? WHERE id = ?', [enabled, getAuditUserId(req), rssFeed.id]);
+        if (enabled) {
+          dataSourceTasks.registerRecurringRefresh('rss-feed', rssFeed.id, rssFeed.name, rssFeed.update_interval_value, rssFeed.update_interval_unit, function () {
+            return dataSourceTasks.refreshRssFeedInBackground(rssFeed.id, rssFeed.feed_url, rssFeed.item_limit, getAuditUserId(req));
+          });
+        } else {
+          dataSourceTasks.removeRecurringRefresh('rss-feed', rssFeed.id);
+        }
+        return res.redirect('/data-sources/rss-feeds/' + rssFeed.id + '/edit?message=' + encodeURIComponent(enabled ? 'RSS feed enabled.' : 'RSS feed disabled.'));
+      }
+
       const payload = common.buildRssFeedPayload(req, rssFeed);
       if (await common.fetchDuplicateName(pool, 'i_rss_feeds', payload.name, rssFeed.id)) {
         return res.redirect('/data-sources/rss-feeds/' + rssFeed.id + '/edit?message=' + encodeURIComponent('An RSS feed with that name already exists.'));
@@ -260,31 +273,17 @@ module.exports = function registerRssFeedRoutes(app, deps) {
         [payload.name, payload.feedUrl, payload.updateIntervalValue, payload.updateIntervalUnit, payload.itemLimit, actorId, rssFeed.id]
       );
       await connection.commit();
-      dataSourceTasks.registerRecurringRefresh('rss-feed', rssFeed.id, payload.name, payload.updateIntervalValue, payload.updateIntervalUnit, function () {
-        return dataSourceTasks.refreshRssFeedInBackground(rssFeed.id, payload.feedUrl, payload.itemLimit, actorId);
-      });
-      const message = 'RSS feed updated. Refresh is running in the background.';
-      const refreshTask = await backgroundTaskQueue.enqueueTask({
-        key: 'rss-feed-refresh:' + rssFeed.id,
-        title: 'RSS feed refresh',
-        category: 'data-source',
-        taskType: 'data-source-refresh',
-        payload: {
-          sourceType: 'rss-feed',
-          sourceId: rssFeed.id,
-          sourceName: payload.name,
-          actorId: actorId
-        },
-        metadata: {
-          sourceType: 'rss-feed',
-          sourceId: rssFeed.id,
-          sourceName: payload.name
-        }
-      });
-      redirectAfterSave(req, res, '/data-sources/rss-feeds/' + rssFeed.id + '/edit?refresh_task_id=' + encodeURIComponent(refreshTask && refreshTask.id ? refreshTask.id : ''), {
+      if (rssFeed.enabled === 0 || rssFeed.enabled === false) {
+        dataSourceTasks.removeRecurringRefresh('rss-feed', rssFeed.id);
+      } else {
+        dataSourceTasks.registerRecurringRefresh('rss-feed', rssFeed.id, payload.name, payload.updateIntervalValue, payload.updateIntervalUnit, function () {
+          return dataSourceTasks.refreshRssFeedInBackground(rssFeed.id, payload.feedUrl, payload.itemLimit, actorId);
+        });
+      }
+      redirectAfterSave(req, res, '/data-sources/rss-feeds/' + rssFeed.id + '/edit', {
         closeUrl: '/data-sources/rss-feeds',
         newUrl: '/data-sources/rss-feeds/new',
-        message: message
+        message: 'RSS feed updated.'
       });
     } catch (error) {
       try {
@@ -298,6 +297,18 @@ module.exports = function registerRssFeedRoutes(app, deps) {
     }
   });
 
+  app.post('/data-sources/rss-feeds/:id/refresh', requirePermission('rss-feeds.allow'), async function (req, res, next) {
+    try {
+      const rssFeed = await common.fetchRssFeedById(pool, Number(req.params.id));
+      if (!rssFeed) return res.status(404).send('RSS feed not found');
+      if (rssFeed.enabled === 0 || rssFeed.enabled === false) {
+        return res.redirect('/data-sources/rss-feeds/' + rssFeed.id + '/edit?message=' + encodeURIComponent('RSS feed is disabled.'));
+      }
+      await backgroundTaskQueue.enqueueTask({ key: 'rss-feed-refresh:' + rssFeed.id, title: 'RSS feed refresh', category: 'data-source', taskType: 'data-source-refresh', payload: { sourceType: 'rss-feed', sourceId: rssFeed.id, sourceName: rssFeed.name, actorId: getAuditUserId(req) }, metadata: { sourceType: 'rss-feed', sourceId: rssFeed.id, sourceName: rssFeed.name } });
+      res.redirect('/data-sources/rss-feeds/' + rssFeed.id + '/edit?message=' + encodeURIComponent('RSS feed refresh queued.'));
+    } catch (error) { next(error); }
+  });
+
   app.post('/data-sources/rss-feeds/:id/delete', requirePermission('rss-feeds.delete'), async function (req, res, next) {
     try {
       const rssFeed = await common.fetchRssFeedById(pool, Number(req.params.id));