@things-factory/organization 6.2.73 → 6.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.2.73",
+  "version": "6.2.79",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,9 +32,9 @@
     "@operato/data-tree": "^1.0.0",
     "@operato/graphql": "^1.0.0",
     "@operato/shell": "^1.0.0",
-    "@things-factory/auth-base": "^6.2.70",
-    "@things-factory/contact": "^6.2.73",
-    "@things-factory/shell": "^6.2.70"
+    "@things-factory/auth-base": "^6.2.79",
+    "@things-factory/contact": "^6.2.79",
+    "@things-factory/shell": "^6.2.79"
   },
-  "gitHead": "eb578bc7a3f5a2301af8ae599d00e929ef3bb6ca"
+  "gitHead": "79bd268667377c76554071d41c5ab50203110a52"
 }

package/server/service/department/department-query.ts

@@ -64,13 +64,25 @@ export class DepartmentQuery {
   }
 
   @FieldResolver(type => [Department])
-  async children(@Root() department: Department): Promise<Department[]> {
-    return (
-      department.children ||
-      (await getRepository(Department).findBy({
-        parent: { id: department.id }
-      }))
-    )
+  async children(
+    @Root() department: Department,
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<Department[]> {
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(Department),
+      searchables: ['name', 'description', 'controlNo']
+    }).andWhere({
+      parent: { id: department.id }
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return items
   }
 
   @FieldResolver(type => String)

package/server/service/employee/employee-type.ts

@@ -1,6 +1,7 @@
 import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { ObjectType, Field, InputType, Int, ID, registerEnumType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
@@ -11,18 +12,24 @@ export class ObjectRefForEmployee extends ObjectRef {
   @Field({ nullable: true })
   controlNo?: string
 
+  @Field(type => EmployeeType, { nullable: true })
+  type?: EmployeeType
+
   @Field({ nullable: true })
   alias?: string
 
   @Field({ nullable: true })
   photo?: string
 
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 
   @Field({ nullable: true })
   jobPosition?: string
 
+  @Field({ nullable: true })
+  jobResponsibility?: string
+
   @Field({ nullable: true })
   hiredOn?: string
 
@@ -32,7 +39,7 @@ export class ObjectRefForEmployee extends ObjectRef {
 
 @InputType()
 export class ObjectRefForUser extends ObjectRef {
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 }
 

package/server/service/employee/employee.ts

@@ -12,6 +12,7 @@ import {
   VersionColumn
 } from 'typeorm'
 import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
@@ -127,7 +128,7 @@ export class Employee {
   @RelationId((employee: Employee) => employee.contact)
   contactId?: string
 
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 
   @Field({ nullable: true })

package/things-factory.config.js

@@ -6,6 +6,7 @@ export default {
   routes: [
     { tagname: 'employee-list-page', page: 'employee-list' },
     { tagname: 'department-list-page', page: 'department-list' },
+    { tagname: 'department-tree-page', page: 'department-tree' },
     { tagname: 'employees-by-department', page: 'employees-by-department' },
     { tagname: 'common-approval-line-templates-page', page: 'common-approval-line-templates-page' },
     { tagname: 'my-approval-line-templates-page', page: 'my-approval-line-templates-page' }