Release 2.8.0

src/web/routes/data-sources/api-sources/routes.js

@@ -5,6 +5,7 @@ const renderApiSourcesPage = require('./list');
 const renderApiSourceAddPage = require('./add');
 const renderApiSourceEditPage = require('./edit');
 const { buildDuplicateApiSourceName, buildDuplicateApiSource } = require('./duplicate');
+const { fetchAppSettings } = require('../../../../data/app-settings');
 
 function toIsoTimestamp(value) {
   if (!value) {
@@ -123,8 +124,16 @@ module.exports = function registerApiSourceRoutes(app, deps) {
     }
   });
 
-  app.get('/data-sources/api-sources/new', requirePermission('api-sources.create'), function (req, res) {
-    res.send(renderApiSourceAddPage(null, req.query.message ? String(req.query.message) : '', req.currentUser));
+  app.get('/data-sources/api-sources/new', requirePermission('api-sources.create'), async function (req, res, next) {
+    try {
+      const settings = await fetchAppSettings(pool);
+      res.send(renderApiSourceAddPage({
+        updateIntervalValue: settings['data-sources.api_default_interval_value'],
+        updateIntervalUnit: settings['data-sources.api_default_interval_unit']
+      }, req.query.message ? String(req.query.message) : '', req.currentUser));
+    } catch (error) {
+      next(error);
+    }
   });
 
   app.get('/data-sources/api-sources/:id/edit', requirePermission('api-sources.update'), async function (req, res, next) {

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

@@ -5,6 +5,7 @@ const renderRssFeedsPage = require('./list');
 const renderRssFeedAddPage = require('./add');
 const renderRssFeedEditPage = require('./edit');
 const { buildDuplicateRssFeedName, buildDuplicateRssFeed } = require('./duplicate');
+const { fetchAppSettings } = require('../../../../data/app-settings');
 
 async function getDataSourceUsageMaps(pool, common) {
   const [slides] = await pool.query('SELECT content_json FROM c_slides WHERE content_json IS NOT NULL');
@@ -99,8 +100,16 @@ module.exports = function registerRssFeedRoutes(app, deps) {
     }
   });
 
-  app.get('/data-sources/rss-feeds/new', requirePermission('rss-feeds.create'), function (req, res) {
-    res.send(renderRssFeedAddPage(null, req.query.message ? String(req.query.message) : '', req.currentUser));
+  app.get('/data-sources/rss-feeds/new', requirePermission('rss-feeds.create'), async function (req, res, next) {
+    try {
+      const settings = await fetchAppSettings(pool);
+      res.send(renderRssFeedAddPage({
+        updateIntervalValue: settings['data-sources.rss_default_interval_value'],
+        updateIntervalUnit: settings['data-sources.rss_default_interval_unit']
+      }, req.query.message ? String(req.query.message) : '', req.currentUser));
+    } catch (error) {
+      next(error);
+    }
   });
 
   app.get('/data-sources/rss-feeds/:id/edit', requirePermission('rss-feeds.update'), async function (req, res, next) {