Fixup some errors

node-red · Nov 1, 2024 · d79471e · d79471e
1 parent 654bdf0
commit d79471e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/view.js b/lib/view.js
@@ -173,11 +173,11 @@ module.exports = {
         if (!query.collection) {
             dbQuery = dbQuery.sort(orderby)
         }
-        const foundCount = await dbQuery.count()
+        const foundCount = await db.flows.countDocuments(findQuery)
         if (proj) {
             const docs = await dbQuery.skip(skip).limit(perPage * numPages).toArray()
             if (process.env.FLOW_ENV !== 'PRODUCTION') {
-                console.log(findQuery, 'found=' + foundCount, 'count=' + docs.length)
+                console.log(findQuery, 'totalCount=' + foundCount, 'thisViewCount=' + docs.length)
             }
             const result = {
                 count: foundCount,

diff --git a/routes/flows.js b/routes/flows.js
@@ -116,6 +116,11 @@ async function getShareableFlow (id, collection, req, res) {
 async function getFlow (id, collection, req, res) {
     try {
         const gist = await gister.get(id)
+        if (!gist) {
+            const err = new Error()
+            err.code = 404
+            throw err
+        }
         gist.sessionuser = req.session.user
         gist.csrfToken = req.csrfToken()
         gist.collection = collection
@@ -188,7 +193,7 @@ async function getFlow (id, collection, req, res) {
         res.send(mustache.render(templates.gist, gist, templates.partials))
     } catch (err) {
         // TODO: better error logging without the full stack trace
-        if (err) {
+        if (err && err.code !== 404) {
             console.log('Error loading flow:', id)
             console.log(err)
         }