@things-factory/organization 6.2.103 → 6.2.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.2.103",
+  "version": "6.2.111",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,5 +36,5 @@
     "@things-factory/contact": "^6.2.103",
     "@things-factory/shell": "^6.2.103"
   },
-  "gitHead": "941f06e7c042ed4da546f96cc770e803b3ee1d71"
+  "gitHead": "8424feb14ae84e99377321dc36454358631a560c"
 }

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

@@ -1,37 +1,22 @@
 import { Field, ID, ObjectType } from 'type-graphql'
 import { Column, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId } from 'typeorm'
 
-import {
-  HistoryActionColumn,
-  HistoryActionType,
-  HistoryEntityInterface,
-  HistoryOriginalIdColumn
-} from '@operato/typeorm-history'
+import { HistoryActionColumn, HistoryActionType, HistoryEntityInterface, HistoryOriginalIdColumn } from '@operato/typeorm-history'
 import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
 
-import { Department, DepartmentStatus } from './department'
+import { Department } from './department'
 import { Employee } from '../employee/employee'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
 @Entity()
-@Index(
-  'ix_department_history_0',
-  (departmentHistory: DepartmentHistory) => [departmentHistory.originalId, departmentHistory.version],
-  { unique: true }
-)
-@Index(
-  'ix_department_history_1',
-  (departmentHistory: DepartmentHistory) => [
-    departmentHistory.domain,
-    departmentHistory.originalId,
-    departmentHistory.version
-  ],
-  { unique: true }
-)
+@Index('ix_department_history_0', (departmentHistory: DepartmentHistory) => [departmentHistory.originalId, departmentHistory.version], { unique: true })
+@Index('ix_department_history_1', (departmentHistory: DepartmentHistory) => [departmentHistory.domain, departmentHistory.originalId, departmentHistory.version], {
+  unique: true
+})
 @ObjectType({ description: 'History Entity of Department' })
 export class DepartmentHistory implements HistoryEntityInterface<Department> {
   @PrimaryGeneratedColumn('uuid')
@@ -83,10 +68,6 @@ export class DepartmentHistory implements HistoryEntityInterface<Department> {
   @Field({ nullable: true })
   active?: boolean
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  state?: DepartmentStatus
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   extension?: string
@@ -125,12 +106,7 @@ export class DepartmentHistory implements HistoryEntityInterface<Department> {
 
   @HistoryActionColumn({
     nullable: false,
-    type:
-      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'enum'
-        : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+    type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'enum' : DATABASE_TYPE == 'oracle' ? 'varchar2' : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

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

@@ -9,13 +9,20 @@ import { Employee } from '../employee/employee'
 
 @Resolver(Department)
 export class DepartmentQuery {
-  @Query(returns => Department!, { nullable: true, description: 'To fetch a Root Department' })
-  async departmentRoot(@Ctx() context: ResolverContext): Promise<Department> {
+  @Query(returns => DepartmentList, { nullable: true, description: 'To fetch a Root Departments' })
+  async departmentRoots(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DepartmentList> {
     const { domain } = context.state
 
-    return await getRepository(Department).findOne({
-      where: { domain: { id: domain.id }, parent: { id: IsNull() } }
-    })
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(Department),
+      searchables: ['name', 'description', 'controlNo']
+    }).andWhere({ domain: { id: domain.id }, parent: { id: IsNull() } })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
   }
 
   @Query(returns => Department!, { nullable: true, description: 'To fetch a Department' })
@@ -64,11 +71,7 @@ export class DepartmentQuery {
   }
 
   @FieldResolver(type => [Department])
-  async children(
-    @Root() department: Department,
-    @Args() params: ListParam,
-    @Ctx() context: ResolverContext
-  ): Promise<Department[]> {
+  async children(@Root() department: Department, @Args() params: ListParam, @Ctx() context: ResolverContext): Promise<Department[]> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -4,7 +4,7 @@ import { ObjectType, Field, InputType, Int, ID, registerEnumType } from 'type-gr
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { Department, DepartmentStatus } from './department'
+import { Department } from './department'
 import { ObjectRefForEmployee } from '../employee/employee-type'
 
 @InputType()
@@ -18,9 +18,6 @@ export class NewDepartment {
   @Field({ nullable: true })
   description?: string
 
-  @Field(type => DepartmentStatus, { nullable: true })
-  state?: DepartmentStatus
-
   @Field({ nullable: true })
   active?: boolean
 
@@ -51,9 +48,6 @@ export class DepartmentPatch {
   @Field({ nullable: true })
   description?: string
 
-  @Field(type => DepartmentStatus, { nullable: true })
-  state?: DepartmentStatus
-
   @Field({ nullable: true })
   active?: boolean
 

package/server/service/department/department.ts

@@ -16,17 +16,6 @@ import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Employee } from '../employee/employee'
-import { ApprovalLine } from '../approval-line/approval-line'
-
-export enum DepartmentStatus {
-  STATUS_A = 'STATUS_A',
-  STATUS_B = 'STATUS_B'
-}
-
-registerEnumType(DepartmentStatus, {
-  name: 'DepartmentStatus',
-  description: 'state enumeration of a department'
-})
 
 @Entity()
 @Index('ix_department_0', (department: Department) => [department.domain, department.name], {
@@ -92,10 +81,6 @@ export class Department {
   @Field({ nullable: true })
   active?: boolean
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  state?: DepartmentStatus
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   extension?: string

package/translations/en.json

@@ -34,6 +34,7 @@
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",
   "title.department list": "department list",
+  "title.department tree": "department hierarchy",
   "title.contact list": "contact list",
   "title.organization": "organization",
   "title.employees-by-department": "Employees By Department"

package/translations/ja.json

@@ -34,6 +34,7 @@
   "title.my-approval-line template list": "マイ決裁ライン テンプレート リスト",
   "title.employee list": "職員リスト",
   "title.department list": "部署リスト",
+  "title.department tree": "部署階層図",
   "title.contact list": "連絡先リスト",
   "title.organization": "組織",
   "title.employees-by-department": "Employees By Department"

package/translations/ko.json

@@ -34,6 +34,7 @@
   "title.my-approval-line template list": "나의 결재라인 템플릿 목록",
   "title.employee list": "직원 목록",
   "title.department list": "부서 목록",
+  "title.department tree": "부서 조직도",
   "title.contact list": "연락처 관리",
   "title.organization": "조직",
   "title.employees-by-department": "부서별 직원"

package/translations/ms.json

@@ -34,6 +34,7 @@
   "title.my-approval-line template list": "senarai templat garis kelulusan saya",
   "title.employee list": "senarai pekerja",
   "title.department list": "senarai jabatan",
+  "title.department tree": "hierarki jabatan",
   "title.contact list": "senarai kenalan",
   "title.organization": "organisasi",
   "title.employees-by-department": "Employees By Department"

package/translations/zh.json

@@ -34,6 +34,7 @@
   "title.my-approval-line template list": "我的审批线模板列表",
   "title.employee list": "员工列表",
   "title.department list": "部门列表",
+  "title.department tree": "部门层级图",
   "title.contact list": "联系人列表",
   "title.organization": "组织",
   "title.employees-by-department": "Employees By Department"