Merge pull request #116 from node-red/add-downloads-to-catalog

Add downloads to catalog

Author: knolleary

lib/users.js

@@ -23,7 +23,7 @@ async function ensureExists (login, userData) {
     }
     const userRecord = extractGitHubInfo(userData)
     userRecord.npm_verified = false
-    await db.users.insert(userRecord)
+    await db.users.insertOne(userRecord)
 }
 
 async function refreshUserGitHub (login) {

lib/view.js

@@ -111,14 +111,15 @@ module.exports = {
                 }
             }
             // const typeNode = !findQuery.type || findQuery.type === 'node' || (Array.isArray(query.type) && query.type.indexOf('node') > -1)
-            if (includeCategories && query.category) {
-                const categories = Array.isArray(query.category) ? query.category : [query.category]
-                findQuery.categories = { $in: categories }
-                countQuery.categories = { $in: categories }
-            } else if (query.username || query.npm_username) {
+            if (query.username || query.npm_username) {
                 findQuery.$or = [{ gitOwners: query.username }, { npmOwners: query.npm_username || query.username }]
                 countQuery.$or = findQuery.$or
             } else {
+                if (includeCategories && query.category) {
+                    const categories = Array.isArray(query.category) ? query.category : [query.category]
+                    findQuery.categories = { $in: categories }
+                    countQuery.categories = { $in: categories }
+                }
                 // General search - exclude empty collections
                 findQuery.$or = [{ items: { $exists: false } }, { items: { $elemMatch: { $exists: true } } }]
                 if (query.term) {

public/js/utils.js

@@ -121,14 +121,26 @@ const utils = (function () {
         let done
         $.getJSON(thingUrl, function (data) {
             if (data.links.prev) {
-                thingList.find('.thing-list-nav-prev').attr('href', data.links.prev).css('opacity', 1)
+                thingList.find('.thing-list-nav-prev').attr('href', data.links.prev).css({
+                    opacity: 1,
+                    'pointer-events': 'auto'
+                })
             } else {
-                thingList.find('.thing-list-nav-prev').css('opacity', 0)
+                thingList.find('.thing-list-nav-prev').css({
+                    opacity: 0,
+                    'pointer-events': 'none'
+                })
             }
             if (data.links.next) {
-                thingList.find('.thing-list-nav-next').attr('href', data.links.next).css('opacity', 1)
+                thingList.find('.thing-list-nav-next').attr('href', data.links.next).css({
+                    opacity: 1,
+                    'pointer-events': 'auto'
+                })
             } else {
-                thingList.find('.thing-list-nav-next').css('opacity', 0)
+                thingList.find('.thing-list-nav-next').css({
+                    opacity: 0,
+                    'pointer-events': 'none'
+                })
             }
             if (data.meta.results.count === 0) {
                 thingList.find('.thing-list-nav-page-info').hide()
@@ -173,6 +185,7 @@ $(function () {
         thingList.find('a.thing-list-nav-link').on('click', function (evt) {
             evt.preventDefault()
             utils.loadThingList(thingList, true, $(this).attr('href'))
+            $(window).scrollTop(0)
         })
 
         utils.initThingList(thingList)

tasks/generate_catalog.js

@@ -12,7 +12,8 @@ const viewster = require('../lib/view')
             description: 1,
             keywords: 1,
             types: 1,
-            categories: 1
+            categories: 1,
+            downloads: 1
         })
         const modules = things.map(function (t) {
             return {
@@ -23,7 +24,8 @@ const viewster = require('../lib/view')
                 types: t.types,
                 keywords: t.keywords,
                 categories: t.categories,
-                url: 'https://flows.nodered.org/node/' + t._id
+                url: 'https://flows.nodered.org/node/' + t._id,
+                downloads: t.downloads
             }
         })
 

template/_gistlist.html

@@ -31,7 +31,7 @@
                 {{/hideTypeFilter}}
             </ul>
         </span>
-        <span class="filter-options-section" {{^isAdmin}}style="display: none;"{{/isAdmin}}>
+        <span class="filter-options-section">
             <div>Category</div>
             <ul class="filter-options-category">
                 {{#categories}}

template/node.html

@@ -43,7 +43,6 @@ <h4>Node Info</h4>
                 </div>
             {{/scorecard}}
           </div>
-          {{#isAdmin}}
           <div class="flowmeta">
             <h4>Categories</h4>
             <ul class="flow-tags">
@@ -57,7 +56,6 @@ <h4>Categories</h4>
                 {{/isAdmin}}
             {{/sessionuser}}
           </div>
-          {{/isAdmin}}
 
           <div class="flowmeta">
             <h4>Actions</h4>