Access lists

src/backend/internal/access-list.js

@@ -128,7 +128,7 @@ const internalAccessList = {
             .then(row => {
                 if (row) {
                     if (typeof row.items !== 'undefined' && row.items) {
-                        row.items = internalAccessList.maskItems(row.items);
+                        row = internalAccessList.maskItems(row);
                     }
 
                     return _.omit(row, omissions());
@@ -180,11 +180,14 @@ const internalAccessList = {
             .then(access_data => {
                 let query = accessListModel
                     .query()
-                    .where('is_deleted', 0)
+                    .select('access_list.*', accessListModel.raw('COUNT(proxy_hosts.id) as proxy_host_count'), accessListModel.raw('COUNT(items.id) as item_count'))
-                    .groupBy('id')
+                    .leftJoinRelation('proxy_hosts')
-                    .omit(['is_deleted'])
+                    .leftJoinRelation('items')
+                    .where('access_list.is_deleted', 0)
+                    .groupBy('access_list.id')
+                    .omit(['access_list.is_deleted'])
                     .allowEager('[owner,items]')
-                    .orderBy('name', 'ASC');
+                    .orderBy('access_list.name', 'ASC');
 
                 if (access_data.permission_visibility !== 'all') {
                     query.andWhere('owner_user_id', access.token.get('attrs').id);
@@ -207,7 +210,7 @@ const internalAccessList = {
                 if (rows) {
                     rows.map(function (row, idx) {
                         if (typeof row.items !== 'undefined' && row.items) {
-                            rows[idx].items = internalAccessList.maskItems(row.items);
+                            rows[idx] = internalAccessList.maskItems(row);
                         }
                     });
                 }

src/backend/models/access_list.js

@@ -33,6 +33,8 @@ class AccessList extends Model {
     }
 
     static get relationMappings () {
+        const ProxyHost = require('./proxy_host');
+
         return {
             owner: {
                 relation:   Model.HasOneRelation,
@@ -56,6 +58,18 @@ class AccessList extends Model {
                 modify:     function (qb) {
                     qb.omit(['id', 'created_on', 'modified_on']);
                 }
+            },
+            proxy_hosts: {
+                relation:   Model.HasManyRelation,
+                modelClass: ProxyHost,
+                join:       {
+                    from: 'access_list.id',
+                    to:   'proxy_host.access_list_id'
+                },
+                modify:     function (qb) {
+                    qb.where('proxy_host.is_deleted', 0);
+                    qb.omit(['id', 'created_on', 'modified_on', 'is_deleted', 'meta']);
+                }
             }
         };
     }

src/frontend/js/app/nginx/access/list/item.ejs

@@ -5,25 +5,17 @@
 </td>
 <td>
     <div>
-        <% domain_names.map(function(host) {
+        <%- name %>
-        %>
-        <span class="tag"><%- host %></span>
-        <%
-        });
-        %>
     </div>
     <div class="small text-muted">
         <%- i18n('str', 'created-on', {date: formatDbDate(created_on, 'Do MMMM YYYY')}) %>
     </div>
 </td>
 <td>
-    <div class="text-monospace"><%- forward_ip %>:<%- forward_port %></div>
+    <%- i18n('access-lists', 'item-count', {count: item_count}) %>
 </td>
 <td>
-    <div><%- ssl_enabled && ssl_provider ? i18n('ssl', ssl_provider) : i18n('ssl', 'none') %></div>
+    <%- i18n('access-lists', 'proxy-host-count', {count: proxy_host_count}) %>
-</td>
-<td>
-    <div><%- access_list_id ? access_list.name : i18n('str', 'public') %></div>
 </td>
 <% if (canManage) { %>
 <td class="text-right">
@@ -31,10 +23,9 @@
         <a href="#" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a>
         <div class="dropdown-menu dropdown-menu-right">
             <a href="#" class="edit dropdown-item"><i class="dropdown-icon fe fe-edit"></i> <%- i18n('str', 'edit') %></a>
-            <a href="#" class="logs dropdown-item"><i class="dropdown-icon fe fe-book"></i> <%- i18n('str', 'logs') %></a>
             <div class="dropdown-divider"></div>
             <a href="#" class="delete dropdown-item"><i class="dropdown-icon fe fe-trash-2"></i> <%- i18n('str', 'delete') %></a>
         </div>
     </div>
 </td>
-<% } %>
+<% } %>

src/frontend/js/app/nginx/access/list/item.js

@@ -16,17 +16,17 @@ module.exports = Mn.View.extend({
     events: {
         'click @ui.edit': function (e) {
             e.preventDefault();
-            App.Controller.showNginxProxyForm(this.model);
+            App.Controller.showNginxAccessListForm(this.model);
         },
 
         'click @ui.delete': function (e) {
             e.preventDefault();
-            App.Controller.showNginxProxyDeleteConfirm(this.model);
+            App.Controller.showNginxAccessListDeleteConfirm(this.model);
         }
     },
 
     templateContext: {
-        canManage: App.Cache.User.canManage('proxy_hosts')
+        canManage: App.Cache.User.canManage('access_lists')
     },
 
     initialize: function () {

src/frontend/js/app/nginx/access/list/main.ejs

@@ -1,9 +1,8 @@
 <thead>
     <th width="30">&nbsp;</th>
-    <th><%- i18n('str', 'source') %></th>
+    <th><%- i18n('str', 'name') %></th>
-    <th><%- i18n('str', 'destination') %></th>
+    <th><%- i18n('users', 'title') %></th>
-    <th><%- i18n('str', 'ssl') %></th>
+    <th><%- i18n('proxy-hosts', 'title') %></th>
-    <th><%- i18n('str', 'access') %></th>
     <% if (canManage) { %>
     <th>&nbsp;</th>
     <% } %>

src/frontend/js/app/nginx/access/main.js

@@ -42,7 +42,7 @@ module.exports = Mn.View.extend({
     onRender: function () {
         let view = this;
 
-        App.Api.Nginx.AccessLists.getAll(['owner'])
+        App.Api.Nginx.AccessLists.getAll(['owner', 'items'])
             .then(response => {
                 if (!view.isDestroyed()) {
                     if (response && response.length) {

src/frontend/js/app/ui/main.ejs

@@ -16,4 +16,4 @@
     <!-- Footer View -->
 </footer>
 
-<div class="modal fade" id="modal-dialog" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal fade" id="modal-dialog" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false"></div>

src/frontend/js/i18n/messages.json

@@ -155,7 +155,9 @@
       "delete-confirm": "Are you sure you want to delete this access list? Any hosts using it will need to be updated later.",
       "public": "Publicly Accessible",
       "help-title": "What is an Access List?",
-      "help-content": "Access Lists provide authentication for the Proxy Hosts via Basic HTTP Authentication.\nYou can configure multiple usernames and passwords for a single Access List and then apply that to a Proxy Host.\nThis is most useful for forwarded web services that do not have authentication mechanisms built in."
+      "help-content": "Access Lists provide authentication for the Proxy Hosts via Basic HTTP Authentication.\nYou can configure multiple usernames and passwords for a single Access List and then apply that to a Proxy Host.\nThis is most useful for forwarded web services that do not have authentication mechanisms built in.",
+      "item-count": "{count} {count, select, 1{User} other{Users}}",
+      "proxy-host-count": "{count} {count, select, 1{Proxy Host} other{Proxy Hosts}}"
     },
     "users": {
       "title": "Users",