@things-factory/shell 6.0.0-zeta.27 → 6.0.0-zeta.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.0.0-zeta.27",
+  "version": "6.0.0-zeta.40",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -52,7 +52,7 @@
     "@operato/typeorm-history": "^1.1.65",
     "@operato/utils": "^1.0.1",
     "@things-factory/ejs-remote": "^6.0.0-zeta.1",
-    "@things-factory/env": "^6.0.0-zeta.1",
+    "@things-factory/env": "^6.0.0-zeta.30",
     "@things-factory/styles": "^6.0.0-zeta.27",
     "@things-factory/utils": "^6.0.0-zeta.27",
     "@webcomponents/webcomponentsjs": "^2.6.0",
@@ -131,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "ae1520f7482a72eef5bfb7ebf07ce672136579e8"
+  "gitHead": "8f2076b1512cc74d339c08577690a0c42fe4d3c3"
 }

package/server/service/domain/domain-resolver.ts

@@ -4,7 +4,8 @@ import { In, Repository } from 'typeorm'
 import { slugger } from '@things-factory/utils'
 
 import { getRepository } from '../../initializers/database'
-import { buildQuery } from '../../utils/list-query-builder'
+import { getQueryBuilderFromListParams } from '../../utils/get-query-builder-from-list-params'
+
 import { ListParam } from '../common-types/list-param'
 import { Domain } from './domain'
 import { DomainList, DomainPatch } from './domain-types'
@@ -22,12 +23,13 @@ export class DomainResolver {
   @Directive('@privilege(category: "system", privilege: "query", superUserGranted: true)')
   @Query(returns => DomainList, { description: 'To fetch multiple domain' })
   async domains(@Args() params: ListParam, @Ctx() context: any): Promise<DomainList> {
-    const queryBuilder = getRepository(Domain).createQueryBuilder()
-
-    buildQuery(queryBuilder, params || {}, context, {
-      domainRef: false,
+    const queryBuilder = await getQueryBuilderFromListParams({
+      repository: getRepository(Domain),
+      alias: 'ContactPoint',
+      params,
       searchables: ['name', 'description', 'subdomain']
     })
+
     const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
@@ -46,6 +48,7 @@ export class DomainResolver {
     return true
   }
 
+  @Directive('@transaction')
   @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
   @Mutation(returns => Domain, { description: 'To create domain' })
   async createDomain(@Arg('domainInput') domainInput: DomainPatch) {
@@ -61,12 +64,14 @@ export class DomainResolver {
     return await domainRepo.save({ name, description, subdomain })
   }
 
+  @Directive('@transaction')
   @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
   @Mutation(returns => Domain, { description: 'To delete domain' })
   async deleteDomain(@Arg('name') name: string) {
     return await getRepository(Domain).delete({ name })
   }
 
+  @Directive('@transaction')
   @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
   @Mutation(returns => Boolean, { description: 'To delete multiple domains' })
   async deleteDomains(@Arg('names', () => [String]) names: string[]) {
@@ -76,18 +81,24 @@ export class DomainResolver {
     await getRepository(Domain).delete({ id: In(domainIds) })
   }
 
+  @Directive('@transaction')
   @Directive('@privilege(category: "system", privilege: "mutation", domainOwnerGranted: true, superUserGranted: true)')
   @Mutation(returns => Domain, { description: 'To update domain' })
   async updateDomain(@Arg('name') name: string, @Arg('patch', () => DomainPatch) patch: DomainPatch) {
     const repository = getRepository(Domain)
     const domain: Domain = await repository.findOneBy({ name })
 
+    var owner = patch.ownerUser?.id
+    delete patch.ownerUser
+
     return await repository.save({
       ...domain,
-      ...patch
+      ...patch,
+      owner
     } as any)
   }
 
+  @Directive('@transaction')
   @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
   @Mutation(returns => Boolean, { description: 'To update multiple domains' })
   async updateDomains(@Arg('patches', () => [DomainPatch]) patches: DomainPatch[]): Promise<boolean> {
@@ -103,9 +114,13 @@ export class DomainResolver {
           updateRecord.subdomain = slugger(updateRecord.name)
         }
 
+        var owner = updateRecord.ownerUser?.id
+        delete updateRecord.ownerUser
+
         await domainRepo.save({
           ...domain,
-          ...updateRecord
+          ...updateRecord,
+          owner
         } as any)
       })
     }

package/server/service/domain/domain-types.ts

@@ -1,5 +1,6 @@
 import { ObjectType, InputType, Field, Int } from 'type-graphql'
 import { Domain } from './domain'
+import { ObjectRef } from '../common-types/object-ref'
 
 @InputType()
 export class DomainInput {
@@ -41,6 +42,9 @@ export class DomainPatch {
 
   @Field({ nullable: true })
   theme?: string
+
+  @Field(type => ObjectRef, { nullable: true })
+  ownerUser?: ObjectRef
 }
 
 @ObjectType()

package/server/service/domain/domain.ts

@@ -2,9 +2,9 @@ import { Column, CreateDateColumn, Entity, Index, UpdateDateColumn } from 'typeo
 import { ObjectType, Field, ID } from 'type-graphql'
 import { config } from '@things-factory/env'
 
-const numericTypes = ["int","int2","int4","int8","integer","tinyint","smallint","mediumint","bigint"]
-const generatedStrategy = ['uuid','rowid',"increment","identity"]
-const domainPrimaryOption =config.get('domainPrimaryOption')
+const numericTypes = ['int', 'int2', 'int4', 'int8', 'integer', 'tinyint', 'smallint', 'mediumint', 'bigint']
+const generatedStrategy = ['uuid', 'rowid', 'increment', 'identity']
+const domainPrimaryOption = config.get('domainPrimaryOption')
 const domainPrimaryType = domainPrimaryOption?.type
 const domainPrimaryStrategy = domainPrimaryOption?.strategy
 
@@ -14,33 +14,34 @@ const domainPrimaryStrategy = domainPrimaryOption?.strategy
 export class Domain {
   @Field(type => ID)
   @Column(
-    domainPrimaryOption?
-    {
-      type: domainPrimaryType,
-      primary:true,
-      transformer: {
-        //from(value: DatabaseType): EntityType
-        from: (value) => {
-          return value
-        },
-        //to(value: EntityType): DatabaseType
-        to: (value) => {
-          if(!value){
-            value = 0
-          }
-          if(numericTypes.indexOf(domainPrimaryType)>=0){
-            return parseInt(value)
-          }else{
-            return value
-          }
+    domainPrimaryOption
+      ? {
+          type: domainPrimaryType,
+          primary: true,
+          transformer: {
+            //from(value: DatabaseType): EntityType
+            from: value => {
+              return value
+            },
+            //to(value: EntityType): DatabaseType
+            to: value => {
+              if (!value) {
+                value = 0
+              }
+              if (numericTypes.indexOf(domainPrimaryType) >= 0) {
+                return parseInt(value)
+              } else {
+                return value
+              }
+            }
+          },
+          generated: generatedStrategy.indexOf(domainPrimaryStrategy) >= 0 ? domainPrimaryStrategy : false
+        }
+      : {
+          type: 'uuid',
+          primary: true,
+          generated: 'uuid'
         }
-      },
-      generated:generatedStrategy.indexOf(domainPrimaryStrategy)>=0?domainPrimaryStrategy:false
-    }:{
-      type: 'uuid',
-      primary:true,
-      generated:'uuid'
-    }
   )
   readonly id: string