@things-factory/organization 6.2.103 → 6.2.111

package/client/pages/department/department-tree-page.ts

@@ -8,8 +8,6 @@ import { customElement, property, query, state } from 'lit/decorators.js'
 import { ScopedElementsMixin } from '@open-wc/scoped-elements'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-import { DataGrist, FetchOption, GristRecord } from '@operato/data-grist'
 
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -20,7 +18,7 @@ import { Department } from '../../types/department'
 import { DepartmentView } from '../../component/department-view'
 
 const departmentFragment = gql`
-  fragment Department_department on Department {
+  fragment departmentFragment on Department {
     id
     controlNo
     name
@@ -34,7 +32,6 @@ const departmentFragment = gql`
       email
     }
     active
-    state
     picture
 
     updater {
@@ -48,21 +45,26 @@ const departmentFragment = gql`
 @customElement('department-tree-page')
 export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedElementsMixin(PageView))) {
   static styles = [
-    ScrollbarStyles,
     CommonHeaderStyles,
+    ScrollbarStyles,
     css`
       :host {
         display: flex;
+        flex-direction: column;
 
         width: 100%;
+        overflow: auto;
+      }
 
-        --grid-record-emphasized-background-color: #8b0000;
-        --grid-record-emphasized-color: #ff6b6b;
+      ox-tree-vertical {
+        flex: 1;
       }
 
-      ox-grist {
-        overflow-y: auto;
+      department-view {
         flex: 1;
+
+        max-width: 500px;
+        align-self: center;
       }
     `
   ]
@@ -76,7 +78,7 @@ export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedE
   @state() root?: Department
   @state() selected?: Department
 
-  @query('ox-grist') private grist!: DataGrist
+  @query('department-view') departmentView!: DepartmentView
 
   get context() {
     return {
@@ -88,10 +90,17 @@ export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedE
           title: i18next.t('button.add'),
           action: this.create.bind(this)
         },
+        this.selected
+          ? {
+              icon: 'save',
+              title: i18next.t('button.save'),
+              action: this.save.bind(this)
+            }
+          : null,
         {
-          icon: 'save',
-          title: i18next.t('button.save'),
-          action: this.save.bind(this)
+          icon: 'refresh',
+          title: i18next.t('button.reset'),
+          action: this.reset.bind(this)
         },
         {
           icon: 'delete',
@@ -110,74 +119,117 @@ export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedE
     }
   }
 
-  @property({ type: Object }) gristConfig: any
-
   render() {
-    const mode = isMobileDevice() ? 'CARD' : 'GRID'
-
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
-        <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.department list')}
-          </div>
-
-          <div class="filters">
-            <ox-filters-form class="filter" autofocus without-search></ox-filters-form>
-          </div>
-
-          <ox-context-page-toolbar class="actions" .context=${this.context}></ox-context-page-toolbar>
+      <div class="header">
+        <div class="title">
+          <mwc-icon>summarize</mwc-icon>
+          ${i18next.t('title.department list')}
         </div>
-      </ox-grist>
+
+        <ox-context-page-toolbar class="actions" .context=${this.context}></ox-context-page-toolbar>
+      </div>
+
+      <ox-tree-vertical .data=${this.root} .selected=${this.selected} @select=${this.onSelect.bind(this)} label-property="name"></ox-tree-vertical>
+
+      <department-view .department=${this.selected}></department-view>
     `
   }
 
-  async fetchHandler({ page = 1, limit = 100, sortings = [], filters = [] }: FetchOption) {
-    const response = await client.query({
-      query: gql`
-        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: departmentRoot {
-            ...Department_department
-            children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-              ...Department_department
-              children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                ...Department_department
-                children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                  ...Department_department
-                  children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                    ...Department_department
-                    children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                      ...Department_department
-                      children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                        ...Department_department
-                        children(filters: $filters, pagination: $pagination, sortings: $sortings) {
-                          ...Department_department
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
+  onSelect(e: CustomEvent) {
+    this.selected = e.detail as Department
+    this.updateContext()
+  }
+
+  reset() {
+    this.departmentView.department = {}
+  }
+
+  async create() {
+    const { id: parentId } = this.selected || {}
+    const { controlNo, name, description, picture, active, manager } = this.departmentView.department
+
+    var department = {
+      controlNo,
+      name,
+      description,
+      manager,
+      active
+    } as any
+
+    if (picture instanceof File) {
+      department.picture = picture
+    }
+
+    if (parentId) {
+      department.parent = { id: parentId }
+    }
+
+    const response = await client.mutate({
+      mutation: gql`
+        mutation ($department: NewDepartment!) {
+          createDepartment(department: $department) {
+            ...departmentFragment
           }
         }
 
         ${departmentFragment}
       `,
       variables: {
-        filters,
-        pagination: { page, limit },
-        sortings
+        department
+      },
+      context: {
+        hasUpload: true
       }
     })
 
-    const root = response.data.responses
+    this.selected = response.data.createDepartment
+    this.updateContext()
 
-    return {
-      total: 1, //response.data.responses.total || 0,
-      records: [root]
+    await this.fetch()
+  }
+
+  async save() {
+    const { id, controlNo, name, description, picture, active, manager } = this.departmentView.department
+
+    if (!id) {
+      alert('Please select department first.')
     }
+
+    var patch = {
+      controlNo,
+      name,
+      description,
+      active,
+      manager
+    } as any
+
+    if (picture instanceof File) {
+      patch.picture = picture
+    }
+
+    const response = await client.mutate({
+      mutation: gql`
+        mutation ($id: String!, $patch: DepartmentPatch!) {
+          updateDepartment(id: $id, patch: $patch) {
+            ...departmentFragment
+          }
+        }
+
+        ${departmentFragment}
+      `,
+      variables: {
+        id,
+        patch
+      },
+      context: {
+        hasUpload: true
+      }
+    })
+
+    this.selected = response.data.updateDepartment
+
+    this.fetch()
   }
 
   async delete() {
@@ -207,182 +259,12 @@ export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedE
       this.selected = {}
       this.updateContext()
 
-      await this.grist.fetch()
+      await this.fetch()
     }
   }
 
   async pageInitialized(lifecycle: any) {
-    this.gristConfig = {
-      pagination: { pages: [50, 100, 200] },
-      list: {
-        thumbnail: 'profile',
-        fields: ['controlNo', 'name'],
-        details: ['email', 'manager', 'updatedAt']
-      },
-      columns: [
-        {
-          type: 'gutter',
-          gutterName: 'dirty',
-          fixed: true
-        },
-        {
-          type: 'tree',
-          name: 'name',
-          label: true,
-          header: i18next.t('label.name'),
-          record: {
-            editable: true,
-            options: {
-              selectable: true
-            }
-          },
-          filter: 'search',
-          sortable: true,
-          width: 200,
-          fixed: true,
-          handlers: {
-            contextmenu: 'contextmenu-tree-mutation'
-          }
-        },
-        { name: 'id', hidden: true },
-        {
-          type: 'string',
-          name: 'controlNo',
-          header: i18next.t('label.control-no'),
-          record: {
-            editable: true
-          },
-          filter: 'search',
-          sortable: true,
-          width: 110
-        },
-        {
-          type: 'string',
-          name: 'description',
-          header: i18next.t('label.description'),
-          record: {
-            editable: true
-          },
-          filter: 'search',
-          sortable: true,
-          width: 110
-        },
-        {
-          type: 'string',
-          name: 'state',
-          header: i18next.t('label.state'),
-          record: {
-            editable: true
-          },
-          sortable: true,
-          width: 110
-        },
-        {
-          type: 'resource-object',
-          name: 'manager',
-          header: i18next.t('label.manager'),
-          record: {
-            editable: true,
-            options: {
-              title: i18next.t('title.employee list'),
-              queryName: 'employees',
-              pagination: { pages: [50, 100, 200] },
-              basicArgs: {
-                filters: [
-                  {
-                    name: 'active',
-                    operator: 'eq',
-                    value: true
-                  }
-                ]
-              },
-              list: { fields: ['controlNo', 'name', 'email'] },
-              columns: [
-                { name: 'id', hidden: true },
-                {
-                  name: 'controlNo',
-                  width: 120,
-                  header: { renderer: () => i18next.t('field.control-no') },
-                  filter: 'search',
-                  sortable: true
-                },
-                {
-                  name: 'name',
-                  width: 120,
-                  header: { renderer: () => i18next.t('field.name') },
-                  filter: 'search',
-                  sortable: true
-                },
-                {
-                  name: 'email',
-                  width: 150,
-                  header: { renderer: () => i18next.t('label.email') },
-                  filter: 'search',
-                  sortable: true
-                }
-              ],
-              valueField: 'id',
-              nameField: 'name',
-              descriptionField: 'controlNo'
-            }
-          },
-          sortable: true,
-          width: 120
-        },
-        {
-          type: 'checkbox',
-          name: 'active',
-          label: true,
-          header: i18next.t('field.active'),
-          width: 70,
-          record: {
-            align: 'center',
-            editable: true
-          },
-          filter: true,
-          sortable: true
-        },
-        {
-          type: 'resource-object',
-          name: 'updater',
-          header: i18next.t('field.updater'),
-          width: 90,
-          sortable: false
-        },
-        {
-          type: 'datetime',
-          name: 'updatedAt',
-          header: i18next.t('field.updated_at'),
-          width: 180,
-          sortable: true
-        },
-        {
-          type: 'image',
-          name: 'picture',
-          record: {
-            renderer: function (value, column, record, rowIndex, field) {
-              return html`<ox-pfp-view style="height:90%; width: unset; aspect-ratio: 1 / 1;" .profile=${record.picture} .name=${record.name}></ox-pfp-view>`
-            }
-          },
-          hidden: true
-        }
-      ],
-      rows: {
-        appendable: false,
-        selectable: {
-          multiple: true
-        }
-      },
-      sorters: [
-        {
-          name: 'controlNo'
-        }
-      ],
-      tree: {
-        childrenProperty: 'children',
-        expanded: () => true
-      }
-    }
+    this.fetch()
   }
 
   async pageUpdated(changes: any, lifecycle: any) {
@@ -391,177 +273,45 @@ export class DepartmentTreePage extends connect(store)(localize(i18next)(ScopedE
     }
   }
 
-  async create() {
-    // const { id: parentId } = this.selected || {}
-    // const { controlNo, name, description, state, picture, active, manager } = this.grist.department
-
-    // var department = {
-    //   controlNo,
-    //   name,
-    //   description,
-    //   state,
-    //   manager,
-    //   active
-    // } as any
-
-    // if (picture instanceof File) {
-    //   department.picture = picture
-    // }
-
-    // if (parentId) {
-    //   department.parent = { id: parentId }
-    // }
-
-    // const response = await client.mutate({
-    //   mutation: gql`
-    //     mutation ($department: NewDepartment!) {
-    //       createDepartment(department: $department) {
-    //         ...Department_department
-    //       }
-    //     }
-
-    //     ${departmentFragment}
-    //   `,
-    //   variables: {
-    //     department
-    //   },
-    //   context: {
-    //     hasUpload: true
-    //   }
-    // })
-
-    // this.selected = response.data.createDepartment
-    // this.updateContext()
-
-    await this.grist.fetch()
-  }
-
-  // async _deleteDataSet() {
-  //   if (confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
-  //     const ids = this.grist.selected.map(record => record.id)
-  //     if (ids && ids.length > 0) {
-  //       const response = await client.mutate({
-  //         mutation: gql`
-  //           mutation ($ids: [String!]!) {
-  //             deleteDataSets(ids: $ids)
-  //           }
-  //         `,
-  //         variables: {
-  //           ids
-  //         }
-  //       })
-
-  //       if (!response.errors) {
-  //         this.grist.fetch()
-  //         notify({
-  //           message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
-  //         })
-  //       }
-  //     }
-  //   }
-  // }
-
-  // async _copyDataSet() {
-  //   var selected = this.grist.selected
-  //   if (selected.length == 0) return
-
-  //   if (!confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.copy') }))) return
-  //   var response = await client.mutate({
-  //     mutation: gql`
-  //       mutation ($ids: [String!]!) {
-  //         copyDataSets(ids: $ids) {
-  //           id
-  //         }
-  //       }
-  //     `,
-  //     variables: {
-  //       ids: selected.map(r => r.id)
-  //     }
-  //   })
-
-  //   if (!response.errors) {
-  //     this.grist.fetch()
-  //   }
-  // }
-
-  // async save() {
-  //   const { id, controlNo, name, description, state, picture, active, manager } = this.departmentView.department
-
-  //   if (!id) {
-  //     alert('Please select department first.')
-  //   }
-
-  //   var patch = {
-  //     controlNo,
-  //     name,
-  //     description,
-  //     state,
-  //     active,
-  //     manager
-  //   } as any
-
-  //   if (picture instanceof File) {
-  //     patch.picture = picture
-  //   }
-
-  //   const response = await client.mutate({
-  //     mutation: gql`
-  //       mutation ($id: String!, $patch: DepartmentPatch!) {
-  //         updateDepartment(id: $id, patch: $patch) {
-  //           ...Department_department
-  //         }
-  //       }
-
-  //       ${departmentFragment}
-  //     `,
-  //     variables: {
-  //       id,
-  //       patch
-  //     },
-  //     context: {
-  //       hasUpload: true
-  //     }
-  //   })
-
-  //   this.selected = response.data.updateDepartment
-
-  //   this.fetch()
-  // }
-
-  async save() {
-    let patches = this.grist.dirtyRecords
-    if (patches && patches.length) {
-      patches = patches.map(patch => {
-        let patchField: any = patch.id ? { id: patch.id } : {}
-        const dirtyFields = patch.__dirtyfields__
-        for (let key in dirtyFields) {
-          patchField[key] = dirtyFields[key].after
-        }
-        patchField.cuFlag = patch.__dirty__
-
-        return patchField
-      })
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation ($patches: [DepartmentPatch!]!) {
-            updateMultipleDepartment(patches: $patches) {
-              name
+  async fetch() {
+    const response = await client.query({
+      query: gql`
+        query {
+          responses: departmentRoots {
+            total
+            items {
+              ...departmentFragment
+              children {
+                ...departmentFragment
+                children {
+                  ...departmentFragment
+                  children {
+                    ...departmentFragment
+                    children {
+                      ...departmentFragment
+                      children {
+                        ...departmentFragment
+                        children {
+                          ...departmentFragment
+                          children {
+                            ...departmentFragment
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
-        `,
-        variables: {
-          patches
-        },
-        context: {
-          hasUpload: true
         }
-      })
 
-      if (!response.errors) {
-        this.grist.fetch()
-      }
-    }
+        ${departmentFragment}
+      `
+    })
+    const { items: records, total } = response.data.responses
+
+    this.root = records[0]
   }
 
   async exportHandler() {}

package/client/route.ts

@@ -4,14 +4,14 @@ export default function route(page: string) {
       import('./pages/employee/employee-list-page')
       return page
 
-    case 'department-list':
-      import('./pages/department/department-list-page')
-      return page
-
     case 'department-tree':
       import('./pages/department/department-tree-page')
       return page
 
+    case 'department-list':
+      import('./pages/department/department-list-page')
+      return page
+
     case 'employees-by-department':
       import('./pages/employee/employees-by-department')
       return page

package/client/types/department.ts

@@ -1,11 +1,6 @@
 import { Domain, User } from '@operato/shell'
 import { Employee } from './employee'
 
-export enum DepartmentStatus {
-  STATUS_A = 'STATUS_A',
-  STATUS_B = 'STATUS_B'
-}
-
 export class Department {
   readonly id?: string
 
@@ -20,9 +15,6 @@ export class Department {
 
   manager?: Employee
 
-  active?: boolean
-  state?: DepartmentStatus
-
   extension?: string
   picture?: string