feat(common): add auto fills and auto filters to resources

add .disableAutoFills() and .disableAutoFilters() to resources

examples/blog/index.js

@@ -38,6 +38,7 @@ tensei()
             .fields([
                 text('Name').notNullable().rules('required'),
                 textarea('Description'),
+                belongsTo('User').nullable(),
                 hasMany('Post')
             ])
             .displayField('Name')
@@ -46,7 +47,7 @@ tensei()
         welcome(),
         cms().plugin(),
         auth().rolesAndPermissions()
-        .cookieSessions()
+        // .cookieSessions()
         .plugin(),
         rest().plugin(),
         graphql().plugin()

packages/auth/src/config.ts

@@ -46,6 +46,8 @@ export interface AuthPluginConfig {
     userResource: string
     tokenResource: string
     prefix: string
+    autoFillUser: boolean
+    autoFilterForUser: boolean
     excludedPathsFromCsrf: string[]
     enableRefreshTokens?: boolean
     registered?: (ctx: ApiContext) => Promise<void> | void

packages/auth/src/index.ts

@@ -2,6 +2,7 @@ import Dayjs from 'dayjs'
 import crypto from 'crypto'
 import Bcrypt from 'bcryptjs'
 import Jwt from 'jsonwebtoken'
+import { ReferenceType } from '@mikro-orm/core'
 import { validateAll } from 'indicative/validator'
 import {
     plugin,
@@ -17,6 +18,7 @@ import {
     hasMany,
     boolean,
     select,
+    filter,
     password,
     graphQlQuery,
     GraphQLPluginContext,
@@ -55,6 +57,8 @@ class Auth {
         setupFn: AuthSetupFn
     } = {
         prefix: '',
+        autoFillUser: true,
+        autoFilterForUser: true,
         tokenResource: 'Token',
         enableRefreshTokens: false,
         userResource: 'User',
@@ -476,6 +480,78 @@ class Auth {
         return this
     }
 
+    public noAutofillUser() {
+        this.config.autoFillUser = false
+
+        return this
+    }
+
+    public noAutoFilters() {
+        this.config.autoFilterForUser = false
+
+        return this
+    }
+
+    private registerAutofillUserHooks(resources: ResourceContract[]) {
+        resources
+            .filter(
+                resource =>
+                    resource.data.fields.find(
+                        field =>
+                            field.relatedProperty.reference ===
+                                ReferenceType.MANY_TO_ONE &&
+                            field.relatedProperty.type ===
+                                this.config.userResource
+                    ) && !resource.data.disableAutoFills
+            )
+            .forEach(resource => {
+                resource.beforeCreate(({ entity, em }, { request }) => {
+                    if (request.user && request.user.id) {
+                        em.assign(entity, {
+                            user: request.user.id
+                        })
+                    }
+                })
+            })
+    }
+
+    private registerAutoFilterUserHooks(resources: ResourceContract[]) {
+        resources
+            .filter(
+                resource =>
+                    resource.data.fields.find(
+                        field =>
+                            field.relatedProperty.reference ===
+                                ReferenceType.MANY_TO_ONE &&
+                            field.relatedProperty.type ===
+                                this.config.userResource
+                    ) && !resource.data.disableAutoFilters
+            )
+            .forEach(resource => {
+                resource.filters([
+                    filter(
+                        `${this.resources.user.data.label} ${resource.data.label}`
+                    )
+                        .default()
+                        .noArgs()
+                        .query((args, request) =>
+                            request.user && request.user.id
+                                ? {
+                                      [this.resources.user.data.snakeCaseName]:
+                                          request.user.id
+                                  }
+                                : resource.data.noTimestamps
+                                ? false
+                                : {
+                                      created_at: Dayjs()
+                                          .add(1, 'month')
+                                          .toDate()
+                                  }
+                        )
+                ])
+            })
+    }
+
     public plugin() {
         return plugin('Auth')
             .extra(this.config)
@@ -530,6 +606,14 @@ class Auth {
                     extendGraphQlTypeDefs([this.extendGraphQLTypeDefs(gql)])
                     extendGraphQlQueries(this.extendGraphQlQueries())
                     extendRoutes(this.extendRoutes())
+
+                    if (this.config.autoFillUser) {
+                        this.registerAutofillUserHooks(currentCtx().resources)
+                    }
+
+                    if (this.config.autoFilterForUser) {
+                        this.registerAutoFilterUserHooks(currentCtx().resources)
+                    }
                 }
             )
 

packages/cli/_templates/default/new/package.json.ejs.t

@@ -21,8 +21,8 @@ to: <%= h.changeCase.param(name) %>/package.json
         "build": "yarn build:server && yarn build:client"
     },
     "devDependencies": {
-        "@tensei/common": "^0.8.0",
-        "@tensei/components": "^0.8.0",
+        "@tensei/common": "^0.8.1",
+        "@tensei/components": "^0.8.1",
         "autoprefixer": "^10.2.4",
         "cross-env": "^7.0.3",
         "laravel-mix": "^6.0.5",

packages/cms/plugin.d.ts

@@ -1,4 +1,12 @@
-import { SessionData } from 'express-session'
+import { User } from '@tensei/common'
+
+declare global {
+    namespace Express {
+        export interface Request {
+            user: User
+        }
+    }
+}
 
 declare module 'express-session' {
     interface SessionData {

packages/cms/plugin/index.ts

@@ -440,7 +440,7 @@ class CmsPlugin {
         query: RouteContract
     ) => {
         const authorized = await Promise.all(
-            query.config.authorize.map(fn => fn(ctx))
+            query.config.authorize.map(fn => fn(ctx as any))
         )
 
         if (

packages/cms/tsconfig.server.json

@@ -12,9 +12,10 @@
         "types": [
             "@types/jest",
             "@types/express-session",
-            "express-response-formatter"
+            "express-response-formatter",
         ]
     },
+    "include": ["plugin.d.ts"],
     "exclude": [
         "__tests__",
         "build",

packages/common/src/resources/Resource.ts

@@ -35,13 +35,15 @@ export class Resource<ResourceType = {}> implements ResourceContract {
         authorizedToUpdate: AuthorizeFunction[]
         authorizedToDelete: AuthorizeFunction[]
         authorizedToRunAction: AuthorizeFunction[]
+        authorizedToFetchRelation: AuthorizeFunction[]
     } = {
         authorizedToShow: [],
         authorizedToFetch: [],
         authorizedToCreate: [],
         authorizedToUpdate: [],
         authorizedToDelete: [],
-        authorizedToRunAction: []
+        authorizedToRunAction: [],
+        authorizedToFetchRelation: []
     }
 
     public dashboardAuthorizeCallbacks: {
@@ -109,8 +111,20 @@ export class Resource<ResourceType = {}> implements ResourceContract {
         return this
     }
 
+    public disableAutoFilters() {
+        this.data.disableAutoFilters = true
+
+        return this
+    }
+
+    public disableAutoFills() {
+        this.data.disableAutoFills = true
+
+        return this
+    }
+
     public filters(filters: FilterContract[]) {
-        this.data.filters = filters
+        this.data.filters = [...this.data.filters, ...filters]
 
         return this
     }
@@ -140,6 +154,8 @@ export class Resource<ResourceType = {}> implements ResourceContract {
                 .hideOnIndex()
                 .hideOnUpdate()
         ],
+        disableAutoFills: false,
+        disableAutoFilters: false,
         actions: [],
         table: '',
         name: '',
@@ -251,7 +267,15 @@ export class Resource<ResourceType = {}> implements ResourceContract {
         return this
     }
 
-    public canCreate(authorizeFunction: AuthorizeFunction) {
+    public canFetchRelation(authorizeFunction: AuthorizeFunction) {
+        this.authorizeCallbacks.authorizedToFetchRelation.push(
+            authorizeFunction
+        )
+
+        return this
+    }
+
+    public canInsert(authorizeFunction: AuthorizeFunction) {
         this.authorizeCallbacks.authorizedToCreate.push(authorizeFunction)
 
         return this
@@ -291,7 +315,7 @@ export class Resource<ResourceType = {}> implements ResourceContract {
         return this
     }
 
-    public canCreateOnDashboard(authorizeFunction: AuthorizeFunction) {
+    public canInsertOnDashboard(authorizeFunction: AuthorizeFunction) {
         this.dashboardAuthorizeCallbacks.authorizedToCreate.push(
             authorizeFunction
         )

packages/common/src/utils/Validator.ts

@@ -84,8 +84,6 @@ export class Validator {
                 ])
             ).join('|')
 
-            console.log('_________________', field.arrayValidationRules)
-
             if (field.relatedProperty.reference) {
                 const relatedResource = this.resourcesMap[
                     field.relatedProperty.type!

packages/common/typings/config.d.ts

@@ -280,8 +280,8 @@ declare module '@tensei/common/config' {
         roles: UserRole[]
         permissions: string[]
     }
-    type AuthorizeFunction<ModelType = any> = (
-        ctx: GraphQLPluginContext
+    type AuthorizeFunction<RequestType = Request> = (
+        ctx: RequestType
     ) => boolean | Promise<boolean>
     type HookFunction<EntityType = DataPayload> = (
         payload: EventArgs<EntityType>,

packages/common/typings/express.d.ts

@@ -23,7 +23,6 @@ declare global {
             }
             mailer: MailManagerContract
             config: Config
-            user: User
             orm: MikroORM
             storage: StorageManager
             manager: EntityManager

packages/common/typings/resources.d.ts

@@ -24,6 +24,8 @@ declare module '@tensei/common/resources' {
         table: string
         icon: SupportedIcons
         group: string
+        disableAutoFilters: boolean
+        disableAutoFills: boolean
         slug: string
         label: string
         groupSlug: string
@@ -75,6 +77,7 @@ declare module '@tensei/common/resources' {
             authorizedToUpdate: AuthorizeFunction[]
             authorizedToDelete: AuthorizeFunction[]
             authorizedToRunAction: AuthorizeFunction[]
+            authorizedToFetchRelation: AuthorizeFunction[]
         }
         dashboardAuthorizeCallbacks: {
             authorizedToShow: AuthorizeFunction[]
@@ -104,6 +107,8 @@ declare module '@tensei/common/resources' {
         hideOnUpdateApi(): this
         hideOnDeleteApi(): this
         hideOnFetchApi(): this
+        disableAutoFills(): this
+        disableAutoFilters(): this
         showOnInsertSubscription(): this
         showOnUpdateSubscription(): this
         showOnDeleteSubscription(): this
@@ -116,13 +121,14 @@ declare module '@tensei/common/resources' {
         permissions(permissions: Permission[]): this
         canShow(authorizeFunction: AuthorizeFunction): this
         canFetch(authorizeFunction: AuthorizeFunction): this
-        canCreate(authorizeFunction: AuthorizeFunction): this
+        canFetchRelation(authorizeFunction: AuthorizeFunction): this
+        canInsert(authorizeFunction: AuthorizeFunction): this
         canUpdate(authorizeFunction: AuthorizeFunction): this
         canDelete(authorizeFunction: AuthorizeFunction): this
         canRunAction(authorizeFunction: AuthorizeFunction): this
         canShowOnDashboard(authorizeFunction: AuthorizeFunction): this
         canFetchOnDashboard(authorizeFunction: AuthorizeFunction): this
-        canCreateOnDashboard(authorizeFunction: AuthorizeFunction): this
+        canInsertOnDashboard(authorizeFunction: AuthorizeFunction): this
         canUpdateOnDashboard(authorizeFunction: AuthorizeFunction): this
         canDeleteOnDashboard(authorizeFunction: AuthorizeFunction): this
         canRunActionOnDashboard(authorizeFunction: AuthorizeFunction): this

packages/components/src/Icon/Icon.tsx

@@ -17,11 +17,11 @@ function toPascalCase(iconName: string) {
         .replace(new RegExp(/[^\w\s]/, 'g'), '')
         .replace(
             new RegExp(/\s+(.)(\w+)/, 'g'),
-                // @ts-ignore
-                ($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`
+            // @ts-ignore
+            ($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`
         )
         .replace(new RegExp(/\s/, 'g'), '')
-        .replace(new RegExp(/\w/), s => s.toUpperCase());
+        .replace(new RegExp(/\w/), s => s.toUpperCase())
 }
 
 const Icon: React.FC<IconProps> = ({
@@ -35,13 +35,22 @@ const Icon: React.FC<IconProps> = ({
     console.log('@@@@@@->', icon)
     const iconName = `${toPascalCase(icon)}Icon`
 
-    const Icon = (Icons as any)[iconName] || (Icons as any)[`${icon}Icon`] || (Icons as any)[icon]
+    const Icon =
+        (Icons as any)[iconName] ||
+        (Icons as any)[`${icon}Icon`] ||
+        (Icons as any)[icon]
 
-    if (! Icon) {
+    if (!Icon) {
         return null
     }
 
-    return <Icon width={width} height={height} color={active ? activeFill : fill} />
+    return (
+        <Icon
+            width={width}
+            height={height}
+            color={active ? activeFill : fill}
+        />
+    )
 }
 
 export default Icon

packages/core/Tensei.ts

@@ -289,7 +289,7 @@ export class Tensei implements TenseiContract {
         query: RouteContract
     ) => {
         const authorized = await Promise.all(
-            query.config.authorize.map(fn => fn(ctx))
+            query.config.authorize.map(fn => fn(ctx as any))
         )
 
         if (