Build list dynamically

Author: wadewegner

lib/postgres.js

@@ -17,9 +17,7 @@ const config = {
 
 const pool = new Pool(config);
 
-exports.getDeploymentCount = () => {
-
-  return new Promise((resolve) => {
+exports.getDeploymentCount = () => new Promise((resolve) => {
 
     const selectQuery = 'SELECT count(guid) FROM deployments WHERE complete = true;';
 
@@ -30,11 +28,8 @@ exports.getDeploymentCount = () => {
       resolve(result);
     });
   });
-};
-
-exports.getNewDeployment = () => {
 
-  return new Promise((resolve, reject) => {
+exports.getNewDeployment = () => new Promise((resolve, reject) => {
 
     const selectQuery = "SELECT TOP 1 guid, username, repo, settings FROM deployments WHERE stage = 'init'";
 
@@ -45,14 +40,9 @@ exports.getNewDeployment = () => {
       resolve(result);
     });
   });
-};
-
-exports.insertDeploymentStep = (guid, stage, message) => {
 
-  return new Promise((resolve, reject) => {
+exports.insertDeploymentStep = (guid, stage, message) => new Promise((resolve, reject) => {
 
-    // TODO: INSERT INTO deployment_steps (guid, stage, message) VALUES ('8866fb1a-c64e-e711-de95-d8f17a37ed2f', 'permset', 'Permset 'nto' assigned.')
-    // need to escape
     const insertQuery = `INSERT INTO deployment_steps (guid, stage, message) VALUES ('${guid}', '${stage}', '${message}')`;
 
     pool.query(insertQuery, (insertErr) => {
@@ -63,26 +53,20 @@ exports.insertDeploymentStep = (guid, stage, message) => {
       resolve();
     });
   });
-};
 
 
-exports.insertDeployment = (insertQuery) => {
-  
-    return new Promise((resolve) => {
-  
-      pool.query(insertQuery, (insertErr) => {
-        if (insertErr) {
-          console.error('insertDeployment', insertErr);
-          resolve(insertErr);
-        }
-        resolve();
-      });
-    });
-  };
+exports.insertDeployment = insertQuery => new Promise((resolve) => {
 
-exports.updateDeploymentStatus = (guid, stage) => {
+    pool.query(insertQuery, (insertErr) => {
+      if (insertErr) {
+        console.error('insertDeployment', insertErr);
+        resolve(insertErr);
+      }
+      resolve();
+    });
+  });
 
-  return new Promise((resolve) => {
+exports.updateDeploymentStatus = (guid, stage) => new Promise((resolve) => {
 
     const selectQuery = `UPDATE deployments SET stage = '${stage}' WHERE guid = '${guid}'`;
 
@@ -94,11 +78,8 @@ exports.updateDeploymentStatus = (guid, stage) => {
       resolve(result);
     });
   });
-};
 
-exports.getDeploymentStatus = (guid) => {
-
-  return new Promise((resolve) => {
+exports.getDeploymentStatus = guid => new Promise((resolve) => {
 
     const selectQuery = `SELECT deployment_steps.message, deployment_steps.created_at, deployments.complete, deployments.stage, deployments.error_message, deployments.scratch_url FROM deployment_steps INNER JOIN deployments ON deployments.guid = deployment_steps.guid WHERE deployment_steps.guid = '${guid}' ORDER BY created_at;`;
 
@@ -110,4 +91,15 @@ exports.getDeploymentStatus = (guid) => {
       resolve(result);
     });
   });
-};
+
+exports.getChoices = () => new Promise((resolve) => {
+    const selectQuery = 'SELECT count(*) as depl, repo FROM deployments WHERE complete = true GROUP BY repo ORDER BY depl DESC';
+   
+    pool.query(selectQuery, (queryErr, result) => {
+      if (queryErr) {
+        console.error('getChoices', queryErr);
+        resolve(queryErr);
+      }
+      resolve(result);
+    });
+  });

lib/web.js

@@ -26,8 +26,7 @@ module.exports = function (app) {
 
       res.render('pages/index', {
         deploymentCount,
-        template: template ? template :
-          referrer && referrer.startsWith('https://github.com') ? referrer : null
+        template: template ? template : referrer && referrer.startsWith('https://github.com') ? referrer : null
       });
     });
   });
@@ -54,10 +53,15 @@ module.exports = function (app) {
     const user_name = req.cookies.user_name;
     const guid = Guid.raw();
 
-    res.render('pages/choose', {
-      user_name,
-      guid
-    });
+    postgresHelper.getChoices()
+      .then((result) => {
+
+        res.render('pages/choose', {
+          user_name,
+          guid,
+          rows: result.rows
+        });
+      });
   });
 
   app.get('/repo', (req, res) => {
@@ -81,11 +85,11 @@ module.exports = function (app) {
         guid
       });
     } else {
-        if (template) {
-          return res.redirect(`/login?template=${template}`);
-        } else {
-          return res.redirect('/login');          
-        }
+      if (template) {
+        return res.redirect(`/login?template=${template}`);
+      } else {
+        return res.redirect('/login');
+      }
     }
   });
 

views/pages/choose.ejs

@@ -14,16 +14,14 @@
 
       <fieldset class="slds-form-element">
         <div class="slds-form-element__control">
-          
-          <% var urls = ['https://github.com/forcedotcom/sfdx-dreamhouse', 'https://github.com/forcedotcom/sfdx-simple', 'https://github.com/ccoenraets/northern-trail', 'https://github.com/muenzpraeger/salesforce-einstein-platform-apex'] %>
-          <% for (var i = 0; i < urls.length; i++) { %>
-            
 
+          <% for (var i = 0; i < rows.length; i++) { %>
+            
             <span class="slds-radio">
-              <input type="radio" id="radio-<%=i%>" name="options" <% if (i == 0) {%>checked="checked"<% } %> value="<%= urls[i] %>">
+              <input type="radio" id="radio-<%=i%>" name="options" <% if (i == 0) {%>checked="checked"<% } %> value="<%= rows[i].repo %>">
               <label class="slds-radio__label" for="radio-<%=i%>">
-                <span class="slds-radio_faux"></span> <%= urls[i] %>
-            <span class="slds-form-element__label"><a href="<%= urls[i] %>" target="_blank">^</a></span>
+                <span class="slds-radio_faux"></span> <%= rows[i].repo %> (<%= rows[i].depl %>)
+            <span class="slds-form-element__label"><a href="<%= rows[i].repo %>" target="_blank">^</a></span>
             </label>
             </span>