speed + typo

Author: ThomasTJdev

assets/js/mails.js

@@ -366,7 +366,7 @@ function loadMail(id) {
                     }),
                     jsCreateElement('option', {
                       attrs: {
-                        value: 'flow',
+                        value: 'archived',
                         selected: data.category == 'archived' ? 'selected' : false
                       },
                       children: ['Archived']

assets/js/table_load.js

@@ -204,6 +204,7 @@ function tableMails() {
     layout:"fitColumns",
     ajaxURL:"/api/mails/all",
     progressiveLoad:"load",
+    paginationSize: 1000,
     initialSort:[
       {column:"name", dir:"asc"},
       {column:"category", dir:"asc"},
@@ -250,7 +251,12 @@ function tableMails() {
   });
 
   objTableMails.on("rowClick", function(e, row){
-    loadMail(row.getData().id);
+    // loadMail(row.getData().id);
+    if (e.ctrlKey) {
+      window.open("/mails?viewMail=" + row.getData().id, "_blank");
+    } else {
+      window.location.href = "/mails?viewMail=" + row.getData().id;
+    }
   });
 
   // Query parameter is viewMail=<id> then open the mail
@@ -277,6 +283,7 @@ function tableLists() {
     layout:"fitColumns",
     ajaxURL:"/api/lists/all",
     progressiveLoad:"load",
+    paginationSize: 1000,
     // rowHeight:50,
     columns:[
       {title:"ID", field:"id", width:60, headerFilter:true},
@@ -319,6 +326,7 @@ function tableFlows() {
     layout:"fitColumns",
     ajaxURL:"/api/flows/all",
     progressiveLoad:"load",
+    paginationSize: 1000,
     columns:[
       {title:"ID", field:"id", width:60, headerFilter:true},
       // {title:"UUID", field:"uuid", width:200},
@@ -356,6 +364,7 @@ function tableFlowsteps(flowID) {
     layout:"fitColumns",
     ajaxURL:"/api/flowsteps/all?flowID=" + flowID,
     progressiveLoad:"load",
+    paginationSize: 1000,
     columns:[
       {title:"ID", field:"id", width:100},
       {title:"Flow ID", field:"flow_id", width:200},

nimletter.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.6.3"
+version       = "0.6.4"
 author        = "ThomasTJdev"
 description   = "Newsletter"
 license       = "AGPL v3"

src/routes/routes_mail.nim

@@ -375,25 +375,25 @@ proc(request: Request) =
     mails = getAllRows(conn, sqlSelect(
       table   = "mails",
       select  = [
-        "DISTINCT ON (mails.id) mails.id",
+        "mails.id",
         "mails.name",
         "mails.subject",
         "array_to_string(mails.tags, ',')",
         "mails.category",
         "to_char(mails.created_at, 'YYYY-MM-DD HH24:MI:SS') as created_at",
         "to_char(mails.updated_at, 'YYYY-MM-DD HH24:MI:SS') as updated_at",
-        "(SELECT COUNT(*) FROM pending_emails WHERE flow_step_id = flow_steps.id AND status = 'sent') as sent_count",
-        "(SELECT COUNT(*) FROM pending_emails WHERE flow_step_id = flow_steps.id AND status = 'pending') as pending_count",
+        "COUNT(pending_emails.id) FILTER (WHERE pending_emails.status = 'sent') as sent_count",
+        "COUNT(pending_emails.id) FILTER (WHERE pending_emails.status = 'pending') as pending_count",
         "mails.identifier"
       ],
       joinargs = [
-        (table: "flow_steps", tableAs: "", on: @["flow_steps.mail_id = mails.id"])
+        (table: "pending_emails", tableAs: "", on: @["pending_emails.mail_id = mails.id"])
       ],
-      customSQL = "ORDER BY mails.id, mails.name ASC LIMIT $1 OFFSET $2".format(
+      customSQL = "GROUP BY mails.category, mails.name, mails.subject, mails.id, mails.subject, mails.tags, mails.created_at, mails.updated_at, mails.identifier ORDER BY mails.id, mails.name ASC LIMIT $1 OFFSET $2".format(
         $limit,
         $offset
       )
-      ))
+    ))
 
     mailsCount = getRow(conn, sqlSelect(
       table   = "mails",