expressa 1.0.5 → 1.1.3

package/modules/admin/src/router/index.js

@@ -1,185 +1,185 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-// in development-env not use lazy-loading, because lazy-loading too many pages will cause webpack hot update too slow. so only in production use lazy-loading;
-// detail: https://panjiachen.github.io/vue-element-admin-site/#/lazy-loading
-
-Vue.use(Router)
-
-/* Layout */
-import Layout from '../views/layout/Layout'
-
-const capitalize = (s) => {
-  if (typeof s !== 'string') return ''
-  return s.charAt(0).toUpperCase() + s.slice(1)
-}
-
-/**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
-    title: 'title'               the name show in submenu and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar,
-  }
-**/
-
-export const constantRouterMap = [
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
-  { path: '/install', component: () => import('@/views/Install'), hidden: true },
-  { path: '/404', component: () => import('@/views/404'), hidden: true },
-
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/home',
-    name: 'Home',
-    meta: { title: 'Home', icon: 'home-alt' },
-    children: [{
-      path: 'home',
-      meta: { title: 'Home', icon: 'home-alt' },
-      component: () => import('@/views/Home')
-    }, {
-      path: '/edit/:collectionName/:id',
-      component: () => import('@/views/EditDocument'),
-      hidden: true
-    }]
-  },
-
-  {
-    path: '/users',
-    redirect: '/users/list',
-    component: Layout,
-    name: 'Users',
-    meta: { title: 'People', icon: 'users-alt' },
-    children: [{
-      path: 'list',
-      meta: { title: 'Users', icon: 'users-alt' },
-      name: 'users2',
-      component: () => import('@/views/ListDocuments2'),
-      props: { collectionName: 'users' },
-    }, {
-      path: 'add',
-      meta: { title: 'Add User', icon: 'plus' },
-      name: 'newuser',
-      component: () => import('@/views/EditDocument'),
-      props: { collectionName: 'users', id: 'create' },
-    }, {
-      path: 'role',
-      meta: { title: 'Roles', icon: 'shield-check' },
-      name: 'role',
-      component: () => import('@/views/ListDocuments2'),
-      props: { collectionName: 'role' },
-    }, {
-      path: 'addrole',
-      meta: { title: 'Add Role', icon: 'plus' },
-      name: 'newrole',
-      component: () => import('@/views/EditDocument'),
-      props: { collectionName: 'role', id: 'create' },
-    }],
-  },
-
-  {
-    path: '/list/:collectionName',
-    component: Layout,
-    hidden: true,
-    name: 'Data',
-    meta: { title: 'Data', icon: 'database' },
-    children: [{
-      path: '',
-      name: ':collectionName',
-      component: () => import('@/views/ListDocuments2'),
-      props: route => ({ collectionName: route.params.collectionName }),
-      meta: { title: capitalize(name) }
-    }]
-  },
-
-  {
-    path: '/manage/permissions',
-    component: Layout,
-    name: 'permissions',
-    meta: { title: 'Manage' },
-    children: [
-      {
-        path: '',
-        name: 'permissions',
-        component: () => import('@/views/ManagePermissions'),
-        meta: { title: 'Permissions' }
-      }
-    ]
-  },
-
-  {
-    path: '/dev',
-    component: Layout,
-    meta: { title: 'Dev', icon: 'flask' },
-    name: 'Dev',
-    children: [
-      {
-        path: '',
-        name: '',
-        component: () => import('@/views/Dev'),
-        meta: { title: '' },
-        hidden: true,
-      },
-      {
-        path: 'listeners',
-        name: 'listeners',
-        component: () => import('@/views/ManageListeners'),
-        meta: { title: 'Listeners' }
-      },
-      {
-        path: 'middleware',
-        name: 'middleware',
-        component: () => import('@/views/ManageMiddleware'),
-        meta: { title: 'Middleware' }
-      }, {
-        path: 'requestlogs',
-        meta: { title: 'Request Logs', icon: 'diary' },
-        name: 'requestlogs',
-        component: () => import('@/views/ListDocuments2'),
-        props: { collectionName: 'requestlog', columns: ['method', 'url', 'req.ip', 'user', 'res.message', 'res.statusCode', 'res.headers.content-length'] },
-      }, {
-        path: 'viewrequest/:requestId',
-        hidden: true,
-        meta: { title: 'View Request', icon: 'diary' },
-        name: 'viewrequest',
-        component: () => import('@/views/ViewRequest'),
-      }, {
-        path: '/edit/collection',
-        component: Layout,
-        name: 'Schema',
-        hidden: true,
-        meta: { title: 'Schemas', icon: 'cog' },
-        children: [{
-          hidden: true,
-          path: '/:collectionName',
-          name: name,
-          meta: { title: capitalize(name) }
-        }]
-      },
-    ]
-  },
-
-  {
-    path: 'external-link',
-    component: Layout,
-    children: [
-      {
-        path: 'https://github.com/thomas4019/expressa',
-        meta: { title: 'Expressa Docs', icon: 'link' }
-      }
-    ]
-  },
-
-  { path: '*', redirect: '/404', hidden: true }
-]
-
-export default new Router({
-  // mode: 'history',
-  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRouterMap
-})
+import Vue from 'vue'
+import Router from 'vue-router'
+
+// in development-env not use lazy-loading, because lazy-loading too many pages will cause webpack hot update too slow. so only in production use lazy-loading;
+// detail: https://panjiachen.github.io/vue-element-admin-site/#/lazy-loading
+
+Vue.use(Router)
+
+/* Layout */
+import Layout from '../views/layout/Layout'
+
+const capitalize = (s) => {
+  if (typeof s !== 'string') return ''
+  return s.charAt(0).toUpperCase() + s.slice(1)
+}
+
+/**
+* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
+* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
+*                                if not set alwaysShow, only more than one route under the children
+*                                it will becomes nested mode, otherwise not show the root menu
+* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
+* name:'router-name'             the name is used by <keep-alive> (must set!!!)
+* meta : {
+    title: 'title'               the name show in submenu and breadcrumb (recommend set)
+    icon: 'svg-name'             the icon show in the sidebar,
+  }
+**/
+
+export const constantRouterMap = [
+  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/install', component: () => import('@/views/Install'), hidden: true },
+  { path: '/404', component: () => import('@/views/404'), hidden: true },
+
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/home',
+    name: 'Home',
+    meta: { title: 'Home', icon: 'home' },
+    children: [{
+      path: 'home',
+      meta: { title: 'Home', icon: 'home' },
+      component: () => import('@/views/Home')
+    }, {
+      path: '/edit/:collectionName/:id',
+      component: () => import('@/views/EditDocument'),
+      hidden: true
+    }]
+  },
+
+  {
+    path: '/users',
+    redirect: '/users/list',
+    component: Layout,
+    name: 'Users',
+    meta: { title: 'People', icon: 'users-alt' },
+    children: [{
+      path: 'list',
+      meta: { title: 'Users', icon: 'users-alt' },
+      name: 'users2',
+      component: () => import('@/views/ListDocuments2'),
+      props: { collectionName: 'users' },
+    }, {
+      path: 'add',
+      meta: { title: 'Add User', icon: 'plus' },
+      name: 'newuser',
+      component: () => import('@/views/EditDocument'),
+      props: { collectionName: 'users', id: 'create' },
+    }, {
+      path: 'role',
+      meta: { title: 'Roles', icon: 'shield-check' },
+      name: 'role',
+      component: () => import('@/views/ListDocuments2'),
+      props: { collectionName: 'role' },
+    }, {
+      path: 'addrole',
+      meta: { title: 'Add Role', icon: 'plus' },
+      name: 'newrole',
+      component: () => import('@/views/EditDocument'),
+      props: { collectionName: 'role', id: 'create' },
+    }],
+  },
+
+  {
+    path: '/list/:collectionName',
+    component: Layout,
+    hidden: true,
+    name: 'Data',
+    meta: { title: 'Data', icon: 'database' },
+    children: [{
+      path: '',
+      name: ':collectionName',
+      component: () => import('@/views/ListDocuments2'),
+      props: route => ({ collectionName: route.params.collectionName }),
+      meta: { title: capitalize(name) }
+    }]
+  },
+
+  {
+    path: '/manage/permissions',
+    component: Layout,
+    name: 'permissions',
+    meta: { title: 'Manage', icon: 'shield-check' },
+    children: [
+      {
+        path: '',
+        name: 'permissions',
+        component: () => import('@/views/ManagePermissions'),
+        meta: { title: 'Permissions' }
+      }
+    ]
+  },
+
+  {
+    path: '/dev',
+    component: Layout,
+    meta: { title: 'Dev', icon: 'flask' },
+    name: 'Dev',
+    children: [
+      {
+        path: '',
+        name: '',
+        component: () => import('@/views/Dev'),
+        meta: { title: '' },
+        hidden: true,
+      },
+      {
+        path: 'listeners',
+        name: 'listeners',
+        component: () => import('@/views/ManageListeners'),
+        meta: { title: 'Listeners' }
+      },
+      {
+        path: 'middleware',
+        name: 'middleware',
+        component: () => import('@/views/ManageMiddleware'),
+        meta: { title: 'Middleware' }
+      }, {
+        path: 'requestlogs',
+        meta: { title: 'Request Logs', icon: 'diary' },
+        name: 'requestlogs',
+        component: () => import('@/views/ListDocuments2'),
+        props: { collectionName: 'requestlog', columns: ['method', 'url', 'req.ip', 'user', 'res.message', 'res.statusCode', 'res.headers.content-length'] },
+      }, {
+        path: 'viewrequest/:requestId',
+        hidden: true,
+        meta: { title: 'View Request', icon: 'diary' },
+        name: 'viewrequest',
+        component: () => import('@/views/ViewRequest'),
+      }, {
+        path: '/edit/collection',
+        component: Layout,
+        name: 'Schema',
+        hidden: true,
+        meta: { title: 'Schemas', icon: 'cog' },
+        children: [{
+          hidden: true,
+          path: '/:collectionName',
+          name: name,
+          meta: { title: capitalize(name) }
+        }]
+      },
+    ]
+  },
+
+  {
+    path: 'external-link',
+    component: Layout,
+    children: [
+      {
+        path: 'https://github.com/thomas4019/expressa',
+        meta: { title: 'Expressa Docs', icon: 'link' }
+      }
+    ]
+  },
+
+  { path: '*', redirect: '/404', hidden: true }
+]
+
+export default new Router({
+  // mode: 'history',
+  scrollBehavior: () => ({ y: 0 }),
+  routes: constantRouterMap
+})

package/modules/admin/src/views/ListDocuments2.vue

@@ -155,12 +155,12 @@ export default {
       return Object.keys(this.searchFilters).reduce((filter, fieldName) => {
         const searchKeyword = this.searchFilters[fieldName]
 
-        if (!searchKeyword) {
+        const fieldtype = this.getFieldType(fieldName)
+
+        if (!searchKeyword || fieldtype === 'custom') {
           return filter
         }
 
-        const fieldtype = this.getFieldType(fieldName)
-
         const queryBuilder = this.getQueryBuilder(fieldtype)
 
         return {
@@ -221,9 +221,31 @@ export default {
       const columns = this.columns || (this.collection.admin && this.collection.admin.columns)
       const info = (await request({ url: `/${this.collectionName}/`, params })).data
       this.count = info.itemsTotal
-      this.data = info.data
+      this.data = this.applyCustomColumnFilter(info.data)
       this.listedProperties = columns || Object.keys(this.schema.properties)
     },
+    applyCustomColumnFilter(tableData) {
+      const customColumnSearches = Object.keys(this.searchFilters)
+        .filter((fieldName) => this.getFieldType(fieldName) === 'custom')
+
+      return tableData.filter((row) => {
+        return customColumnSearches.every(fieldName => {
+          const searchKeyword = this.searchFilters[fieldName]
+
+          if (!searchKeyword) {
+            return true
+          }
+
+          const stringified = row[fieldName].toString()
+
+          if (this.exactSearches[fieldName]) {
+            return stringified === searchKeyword
+          } else {
+            return stringified.toLowerCase().includes(searchKeyword.toLowerCase())
+          }
+        })
+      })
+    },
     downloadCSV(data = this.data) {
       const collection = this.collectionName
       let text = this.listedProperties.map((name) => '"' + name + '"').join(',') + '\n'
@@ -252,11 +274,11 @@ export default {
         page += 1
       }
 
-      this.downloadCSV(rows)
+      this.downloadCSV(this.applyCustomColumnFilter(rows))
     },
     getFieldType(fieldName) {
-      return this.schema.properties[fieldName] &&
-      this.schema.properties[fieldName].type
+      return (this.schema.properties[fieldName] &&
+      this.schema.properties[fieldName].type) || 'custom'
     },
     getQueryBuilder(fieldType) {
       const queryBuilders = {

package/modules/permissions/permissions.js

@@ -71,12 +71,18 @@ exports.init = async function (api) {
       try {
         const admin = await api.db.role.get('Admin')
         collectionPermissions(data._id).forEach(function (permission) {
-          admin.permissions[permission] = 1
+          if (admin.permissions[permission] == null) {
+            admin.permissions[permission] = 1
+          }
         })
         collectionOwnerPermissions(data._id).forEach(function (permission) {
-          delete admin.permissions[permission]
           if (data.documentsHaveOwners) {
-            admin.permissions[permission] = 1
+            if (admin.permissions[permission] == null) {
+              admin.permissions[permission] = 1
+            }
+          }
+          else {
+            delete admin.permissions[permission]
           }
         })
         await api.db.role.update('Admin', admin)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "1.0.5",
+  "version": "1.1.3",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",

package/util.js

@@ -230,8 +230,8 @@ exports.createLogEntry = function (req, res) {
     },
     res: {
       statusCode: res.statusCode,
-      requestId: res._headers['x-request-id'],
-      headers: res._headers,
+      requestId: res.getHeader('x-request-id'),
+      headers: res.getHeaders(),
       message: req.returnedError ? req.returnedError.message : undefined,
     },
     meta: {

package/modules/admin/dist/static/css/chunk-0884.40d0b632.css

@@ -1 +0,0 @@
-h3 textarea{resize:both}.jsoneditor-vue button.btn{font-size:14px!important;padding:3px}.jsoneditor-vue .form-control-label,label{font-weight:700}.jsoneditor-vue input[type=checkbox]{margin-right:5px;margin-top:3px}.error-message[data-v-3c5b79e9]{color:red}

package/modules/admin/dist/static/css/chunk-34ab.f9393b1e.css

@@ -1 +0,0 @@
-h3 textarea{resize:both}.jsoneditor-vue button.btn{font-size:14px!important;padding:3px}.jsoneditor-vue .form-control-label,label{font-weight:700}.jsoneditor-vue input[type=checkbox]{margin-right:5px;margin-top:3px}.comment-link{margin-top:-15px}.error-message{color:red}

package/modules/admin/dist/static/css/chunk-fb07.ac81d7d6.css

@@ -1 +0,0 @@
-.el-table[data-v-a8e6aab2] th{background-color:#343a40!important;border-color:#454d55;color:#fff}