@things-factory/dataset 5.0.0-alpha.2 → 5.0.0-alpha.22

package/server/service/data-set/data-set-query.ts

@@ -1,7 +1,7 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { getRepository } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Role, User } from '@things-factory/auth-base'
 import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
@@ -38,6 +38,13 @@ export class DataSetQuery {
     })
   }
 
+  @FieldResolver(type => Role)
+  async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
+    return await getRepository(Role).findOne({
+      id: dataSet.supervisoryRoleId
+    })
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSet: DataSet): Promise<Domain> {
     return await getRepository(Domain).findOne(dataSet.domainId)

package/server/service/data-set/data-set-type.ts

@@ -1,6 +1,5 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
-
-import { ScalarObject } from '@things-factory/shell'
+import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
 import { DataSet } from './data-set'
 
@@ -12,14 +11,20 @@ export class NewDataSet {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  supervisoryRole?: ObjectRef
+
   @Field({ nullable: true })
   active?: boolean
 
   @Field({ nullable: true })
-  type?: string
+  type?: 'manual' | 'automatic' | string
+
+  @Field({ nullable: true })
+  useCase?: string
 
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: object
+  partitionKeys?: ScalarObject
 
   @Field({ nullable: true })
   schedule?: string
@@ -39,14 +44,20 @@ export class DataSetPatch {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  supervisoryRole?: ObjectRef
+
   @Field({ nullable: true })
   active?: boolean
 
   @Field({ nullable: true })
-  type?: string
+  type?: 'manual' | 'automatic' | string
+
+  @Field({ nullable: true })
+  useCase?: string
 
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: object
+  partitionKeys?: ScalarObject
 
   @Field({ nullable: true })
   schedule?: string

package/server/service/data-set/data-set.ts

@@ -11,11 +11,10 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Role, User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
-import { DataSample } from '../data-sample/data-sample'
 
 @Entity()
 @Index('ix_data_set_0', (dataSet: DataSet) => [dataSet.domain, dataSet.name], { unique: true })
@@ -48,15 +47,30 @@ export class DataSet {
   @Field({ nullable: true })
   active?: boolean
 
+  @ManyToOne(type => Role, {
+    nullable: true
+  })
+  @Field(type => Role, { nullable: true })
+  supervisoryRole?: Role
+
+  @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)
+  supervisoryRoleId?: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+
   @Column({
     nullable: true
   })
   @Field({ nullable: true })
-  type?: string
+  useCase?: string
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: object
+  partitionKeys?: ScalarObject
 
   @Column({
     nullable: true
@@ -68,10 +82,6 @@ export class DataSet {
   @Field(type => [DataItem], { nullable: true })
   dataItems: DataItem[]
 
-  @OneToMany(type => DataSample, dataSample => dataSample.dataSet)
-  @Field(type => [DataSample], { nullable: true })
-  dataSamples: DataSample[]
-
   @Column({
     nullable: true
   })

package/server/service/data-spec/data-spec-manager.ts

@@ -0,0 +1,21 @@
+import { DataSpec } from './data-spec'
+
+export class DataSpecManager {
+  static specRegistry: { [type: string]: DataSpec } = {}
+
+  static getDataSpec(type: string): DataSpec {
+    return DataSpecManager.specRegistry[type]
+  }
+
+  static registerDataSpec(type: string, dataSpec: DataSpec) {
+    DataSpecManager.specRegistry[type] = dataSpec
+  }
+
+  static unregisterDataSpec(type: string) {
+    delete DataSpecManager.specRegistry[type]
+  }
+
+  static getDataSpecs(): DataSpec[] {
+    return Object.values(DataSpecManager.specRegistry)
+  }
+}

package/server/service/data-spec/data-spec-query.ts

@@ -0,0 +1,21 @@
+import { Resolver, Query, Arg } from 'type-graphql'
+import { DataSpec, DataSpecList } from './data-spec'
+import { DataSpecManager } from './data-spec-manager'
+
+@Resolver(DataSpec)
+export class DataSpecQuery {
+  @Query(returns => DataSpec, { description: 'To fetch a data-spec' })
+  dataSpec(@Arg('name') name: string): DataSpec {
+    return DataSpecManager.getDataSpec(name)
+  }
+
+  @Query(returns => DataSpecList, { description: 'To fetch all data-specs' })
+  dataSpecs(): DataSpecList {
+    const items = DataSpecManager.getDataSpecs()
+
+    return {
+      items,
+      total: items.length
+    }
+  }
+}

package/server/service/data-spec/data-spec.ts

@@ -0,0 +1,44 @@
+import { ObjectType, Field, Int } from 'type-graphql'
+import { ScalarObject } from '@things-factory/shell'
+
+@ObjectType()
+export class DataSpecItem {
+  @Field()
+  type: string
+
+  @Field()
+  label: string
+
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  placeholder?: string
+
+  @Field(type => ScalarObject, { nullable: true })
+  property?: ScalarObject
+}
+
+@ObjectType()
+export class DataSpec {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description: string
+
+  @Field({ nullable: true })
+  help: string
+
+  @Field(type => [DataSpecItem], { nullable: true })
+  specItems: DataSpecItem[]
+}
+
+@ObjectType()
+export class DataSpecList {
+  @Field(type => [DataSpec])
+  items: DataSpec[]
+
+  @Field(type => Int)
+  total: number
+}

package/server/service/data-spec/index.ts

@@ -0,0 +1,5 @@
+import { DataSpec } from './data-spec'
+import { DataSpecQuery } from './data-spec-query'
+
+export const entities = [DataSpec]
+export const resolvers = [DataSpecQuery]

package/server/service/index.ts

@@ -1,29 +1,37 @@
+import { entities as DataItemEntities, resolvers as DataItemResolvers } from './data-item'
 /* IMPORT ENTITIES AND RESOLVERS */
-import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from './data-sensor'
+import { entities as DataOocEntities, resolvers as DataOocResolvers } from './data-ooc'
 import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
-import { entities as DataItemEntities, resolvers as DataItemResolvers } from './data-item'
+import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from './data-sensor'
 import { entities as DataSetEntities, resolvers as DataSetResolvers } from './data-set'
+import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
 
 /* EXPORT ENTITY TYPES */
+export * from './data-ooc/data-ooc'
 export * from './data-sensor/data-sensor'
 export * from './data-sample/data-sample'
 export * from './data-item/data-item'
 export * from './data-set/data-set'
+export * from './data-spec/data-spec'
 
 export const entities = [
   /* ENTITIES */
-	...DataSensorEntities,
-	...DataSampleEntities,
+  ...DataOocEntities,
+  ...DataSensorEntities,
+  ...DataSampleEntities,
   ...DataItemEntities,
-  ...DataSetEntities
+  ...DataSetEntities,
+  ...DataSpecEntities
 ]
 
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...DataSensorResolvers,
-		...DataSampleResolvers,
+    ...DataOocResolvers,
+    ...DataSensorResolvers,
+    ...DataSampleResolvers,
     ...DataItemResolvers,
-    ...DataSetResolvers
+    ...DataSetResolvers,
+    ...DataSpecResolvers
   ]
 }

package/things-factory.config.js

@@ -15,6 +15,10 @@ export default {
     {
       tagname: 'data-sample-page',
       page: 'data-sample'
+    },
+    {
+      tagname: 'data-ooc-page',
+      page: 'data-ooc'
     }
   ],
   bootstrap

package/translations/en.json

@@ -1,19 +1,40 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
+  "field.corrective-action": "corrective action",
+  "field.corrector": "corrector",
+  "field.corrected-at": "corrected at",
   "field.data": "data",
+  "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
+  "field.oos": "out of critical limit",
+  "field.ooc": "out of control limit",
+  "field.options": "options",
   "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
+  "field.state": "state",
+  "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
+  "field.unit": "unit",
+  "field.use-case": "use case",
+  "field.work-date": "work date",
+  "field.work-shift": "work shift",
+  "text.data sample created successfully": "a data sample created successfully",
+  "text.data ooc updated successfully": "a data ooc updated successfully",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
 }

package/translations/ko.json

@@ -1,19 +1,40 @@
 {
+  "button.corrected": "조치완료",
+  "button.reviewed": "검토완료",
   "field.appliance": "어플라이언스",
   "field.collected_at": "수집일시",
+  "field.corrective-action": "조치 활동",
+  "field.corrector": "조치자",
+  "field.corrected-at": "조치 시간",
   "field.data": "데이타",
+  "field.data-sample": "데이타 샘플",
   "field.data-set": "데이타셋",
   "field.device-id": "디바이스 아이디",
   "field.netmask": "네트워크마스크",
+  "field.oos": "허용한계 이탈여부",
+  "field.ooc": "관리한계 이탈여부",
+  "field.options": "선택옵션",
   "field.partition-keys": "파티션 키",
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
-  "field.tag": "태크이름",
+  "field.state": "상태",
+  "field.supervisory-role": "관리자 역할",
+  "field.tag": "태그이름",
+  "field.unit": "단위",
+  "field.use-case": "사용 사례",
+  "field.work-date": "작업기준일",
+  "field.work-shift": "교대근무조",
+  "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
+  "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
+  "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
+  "title.data-ooc list": "데이타 이탈점 조회",
+  "title.data-ooc view": "데이타 이탈점 상세",
   "title.data-sample list": "데이타 샘플 조회",
+  "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회"
 }

package/translations/ms.json

@@ -1,19 +1,40 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
+  "field.corrective-action": "corrective action",
+  "field.corrector": "corrector",
+  "field.corrected-at": "corrected at",
   "field.data": "data",
+  "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
+  "field.oos": "out of critical limit",
+  "field.ooc": "out of control limit",
+  "field.options": "options",
   "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
+  "field.state": "keadaan",
+  "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
+  "field.unit": "unit",
+  "field.use-case": "use case",
+  "field.work-date": "work date",
+  "field.work-shift": "work shift",
+  "text.data sample created successfully": "a data sample created successfully",
+  "text.data ooc updated successfully": "a data ooc updated successfully",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
 }

package/translations/zh.json

@@ -1,19 +1,40 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
+  "field.corrective-action": "corrective action",
+  "field.corrector": "corrector",
+  "field.corrected-at": "corrected at",
   "field.data": "data",
+  "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
+  "field.oos": "out of critical limit",
+  "field.ooc": "out of control limit",
+  "field.options": "options",
   "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
+  "field.state": "状态",
+  "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
+  "field.unit": "unit",
+  "field.use-case": "use case",
+  "field.work-date": "work date",
+  "field.work-shift": "work shift",
+  "text.data sample created successfully": "a data sample created successfully",
+  "text.data ooc updated successfully": "a data ooc updated successfully",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
 }