@things-factory/reference-app 7.0.1-alpha.2 → 7.0.1-alpha.5

package/client/pages/operation/operation-master.js

@@ -11,7 +11,7 @@ import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 import { CommonButtonStyles, CommonGristStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
-import { CustomAlert, PageView } from '@things-factory/shell'
+import { CustomAlert, PageView } from '@operato/shell'
 
 import { createOperation, deleteOperations, fetchOperations, saveOperations } from './operation-api'
 
@@ -46,6 +46,7 @@ class OperationMaster extends localize(i18next)(PageView) {
   constructor() {
     super()
     this.mode = isMobileDevice() ? 'CARD' : 'GRID'
+    this.importHandler = this.defaultImportHandler
   }
 
   render() {
@@ -292,7 +293,7 @@ class OperationMaster extends localize(i18next)(PageView) {
     }
   }
 
-  async importHandler(patches) {
+  async defaultImportHandler(patches) {
     const response = await saveOperations(patches)
 
     if (!response.errors) {
@@ -417,9 +418,7 @@ class OperationMaster extends localize(i18next)(PageView) {
         ...this._columns
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[column.imex.key] = column.imex.key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }

package/client/pages/product/product-master.js

@@ -38,6 +38,7 @@ class ProductMaster extends localize(i18next)(PageView) {
   constructor() {
     super()
     this.mode = isMobileDevice() ? 'LIST' : 'GRID'
+    this.importHandler = this.defaultImportHandler
   }
 
   static get properties() {
@@ -725,7 +726,7 @@ class ProductMaster extends localize(i18next)(PageView) {
     }
   }
 
-  async importHandler(patches) {
+  async defaultImportHandler(patches) {
     const response = await saveProducts(patches)
 
     if (!response.errors) {
@@ -842,9 +843,7 @@ class ProductMaster extends localize(i18next)(PageView) {
         ...this._columns
           .filter(column => column.type !== 'gutter' && !!column.imex)
           .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[column.imex.key] = column.imex.key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }
@@ -866,15 +865,13 @@ class ProductMaster extends localize(i18next)(PageView) {
         if (!errors.find(err => err.type == 'type')) errors.push({ type: 'type', value: 'Product type is required' })
       }
       if (_.isEmpty(itm.packingType) || '') {
-        if (!errors.find(err => err.type == 'packingType'))
-          errors.push({ type: 'packingType', value: 'Packing type is required' })
+        if (!errors.find(err => err.type == 'packingType')) errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
       if (_.isEmpty(itm.uom) || '') {
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
       if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue < 0) {
-        if (!errors.find(err => err.type == 'uomValue'))
-          errors.push({ type: 'uomValue', value: 'UOM Value is required' })
+        if (!errors.find(err => err.type == 'uomValue')) errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }
       return itm
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/reference-app",
-  "version": "7.0.1-alpha.2",
+  "version": "7.0.1-alpha.5",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -67,43 +67,43 @@
     "@operato/scene-tab": "^2.0.0-alpha.0",
     "@operato/shell": "^2.0.0-alpha.0",
     "@operato/utils": "^2.0.0-alpha.0",
-    "@things-factory/api": "^7.0.1-alpha.1",
-    "@things-factory/apptool-ui": "^7.0.1-alpha.1",
-    "@things-factory/attachment-base": "^7.0.1-alpha.1",
-    "@things-factory/auth-ui": "^7.0.1-alpha.1",
-    "@things-factory/board-service": "^7.0.1-alpha.1",
-    "@things-factory/board-ui": "^7.0.1-alpha.1",
-    "@things-factory/ccp": "^7.0.1-alpha.1",
-    "@things-factory/code-ui": "^7.0.1-alpha.2",
-    "@things-factory/contact": "^7.0.1-alpha.1",
-    "@things-factory/context-ui": "^7.0.1-alpha.1",
-    "@things-factory/dashboard": "^7.0.1-alpha.1",
-    "@things-factory/dataset": "^7.0.1-alpha.1",
-    "@things-factory/export-ui": "^7.0.1-alpha.1",
-    "@things-factory/export-ui-excel": "^7.0.1-alpha.1",
-    "@things-factory/help": "^7.0.1-alpha.1",
-    "@things-factory/integration-ui": "^7.0.1-alpha.1",
-    "@things-factory/lite-menu": "^7.0.1-alpha.1",
-    "@things-factory/more-ui": "^7.0.1-alpha.1",
-    "@things-factory/notification": "^7.0.1-alpha.1",
-    "@things-factory/oauth2-client": "^7.0.1-alpha.1",
-    "@things-factory/organization": "^7.0.1-alpha.1",
-    "@things-factory/print-ui": "^7.0.1-alpha.1",
-    "@things-factory/product-base": "^7.0.1-alpha.1",
-    "@things-factory/qc": "^7.0.1-alpha.1",
-    "@things-factory/resource-ui": "^7.0.1-alpha.1",
-    "@things-factory/routing-base": "^7.0.1-alpha.1",
-    "@things-factory/setting-base": "^7.0.1-alpha.1",
-    "@things-factory/setting-ui": "^7.0.1-alpha.1",
-    "@things-factory/shell": "^7.0.1-alpha.1",
-    "@things-factory/system": "^7.0.1-alpha.1",
-    "@things-factory/web-editor": "^7.0.1-alpha.1",
-    "@things-factory/work-shift": "^7.0.1-alpha.1",
+    "@things-factory/api": "^7.0.1-alpha.5",
+    "@things-factory/apptool-ui": "^7.0.1-alpha.5",
+    "@things-factory/attachment-base": "^7.0.1-alpha.5",
+    "@things-factory/auth-ui": "^7.0.1-alpha.5",
+    "@things-factory/board-service": "^7.0.1-alpha.5",
+    "@things-factory/board-ui": "^7.0.1-alpha.5",
+    "@things-factory/ccp": "^7.0.1-alpha.5",
+    "@things-factory/code-ui": "^7.0.1-alpha.5",
+    "@things-factory/contact": "^7.0.1-alpha.5",
+    "@things-factory/context-ui": "^7.0.1-alpha.5",
+    "@things-factory/dashboard": "^7.0.1-alpha.5",
+    "@things-factory/dataset": "^7.0.1-alpha.5",
+    "@things-factory/export-ui": "^7.0.1-alpha.5",
+    "@things-factory/export-ui-excel": "^7.0.1-alpha.5",
+    "@things-factory/help": "^7.0.1-alpha.5",
+    "@things-factory/integration-ui": "^7.0.1-alpha.5",
+    "@things-factory/lite-menu": "^7.0.1-alpha.5",
+    "@things-factory/more-ui": "^7.0.1-alpha.5",
+    "@things-factory/notification": "^7.0.1-alpha.5",
+    "@things-factory/oauth2-client": "^7.0.1-alpha.5",
+    "@things-factory/organization": "^7.0.1-alpha.5",
+    "@things-factory/print-ui": "^7.0.1-alpha.5",
+    "@things-factory/product-base": "^7.0.1-alpha.5",
+    "@things-factory/qc": "^7.0.1-alpha.5",
+    "@things-factory/resource-ui": "^7.0.1-alpha.5",
+    "@things-factory/routing-base": "^7.0.1-alpha.5",
+    "@things-factory/setting-base": "^7.0.1-alpha.5",
+    "@things-factory/setting-ui": "^7.0.1-alpha.5",
+    "@things-factory/shell": "^7.0.1-alpha.5",
+    "@things-factory/system": "^7.0.1-alpha.5",
+    "@things-factory/web-editor": "^7.0.1-alpha.5",
+    "@things-factory/work-shift": "^7.0.1-alpha.5",
     "@tinymce/tinymce-webcomponent": "^2.0.1",
     "random-words": "^1.2.0"
   },
   "devDependencies": {
     "@things-factory/builder": "^7.0.1-alpha.0"
   },
-  "gitHead": "a86c8c91120135535386cbe3659f50798f3f9c01"
+  "gitHead": "3a1ceb942521a89f14c4b16a323b506ff676d349"
 }

package/schema.graphql

@@ -404,6 +404,7 @@ input ActivityTemplatePatch {
 type ActivityThread {
   activityApprovals: [ActivityApproval!]!
   activityInstance: ActivityInstance
+  activityThreadHistories: [ActivityThreadHistory!]!
   assignedAt: DateTimeISO
   assignee: User
   createdAt: DateTimeISO
@@ -412,6 +413,34 @@ type ActivityThread {
   dueAt: DateTimeISO
   id: ID!
   output: Object
+
+  """Specific reason for the execution of the last transaction"""
+  reason: String
+  round: Float
+  startedAt: DateTimeISO
+  state: String
+  terminatedAt: DateTimeISO
+  terminator: User
+  transaction: String
+  updatedAt: DateTimeISO
+  updater: User
+  version: Float
+}
+
+"""History Entity of ActivityThread"""
+type ActivityThreadHistory {
+  activityInstance: ActivityInstance
+  assignedAt: DateTimeISO
+  assignee: User
+  createdAt: DateTimeISO
+  creator: User
+  domain: Domain
+  dueAt: DateTimeISO
+  id: ID!
+  output: Object
+
+  """Specific reason for the execution of the last transaction"""
+  reason: String
   round: Float
   startedAt: DateTimeISO
   state: String
@@ -991,6 +1020,7 @@ type CommonCodeDetail {
   description: String
   domain: Domain
   id: ID!
+  labels: Object
   name: String!
   rank: Float
   updatedAt: DateTimeISO
@@ -1007,6 +1037,7 @@ input CommonCodeDetailPatch {
   cuFlag: String
   description: String
   id: ID
+  labels: Object
   name: String
   rank: Float
 }
@@ -1066,6 +1097,7 @@ type Connection {
   creator: User
   description: String
   domain: Domain
+  edge: Appliance
   endpoint: String
   id: ID!
   name: String!
@@ -1085,6 +1117,7 @@ input ConnectionPatch {
   active: Boolean
   cuFlag: String
   description: String
+  edge: ObjectRef
   endpoint: String
   id: ID
   name: String
@@ -1095,6 +1128,7 @@ input ConnectionPatch {
 type ConnectionState {
   description: String
   domain: Domain
+  edge: Appliance
   id: String
   name: String
   state: String
@@ -1181,10 +1215,12 @@ type ContactPoint {
   domain: Domain!
   email: String
   fax: String
+  fax2: String
   id: ID!
   managerName: String
   name: String!
   phone: String
+  phone2: String
   postCode: String
   registrationNo: String
   state: String
@@ -1211,10 +1247,12 @@ input ContactPointPatch {
   description: String
   email: String
   fax: String
+  fax2: String
   id: String
   managerName: String
   name: String
   phone: String
+  phone2: String
   postCode: String
   registrationNo: String
   state: String
@@ -1265,6 +1303,11 @@ type DataItem {
   """Indicates if the data item is active"""
   active: Boolean
 
+  """
+  Aggregation functions to be used in data summarizing logic for a given period.
+  """
+  agg: String
+
   """A description of the data item"""
   description: String
 
@@ -1289,7 +1332,7 @@ type DataItem {
   spec: Object
 
   """
-  The grouping logic for data summarization in the given field during periodic task deadlines.
+  The grouping logic for data finalize in the given field during periodic task deadlines.
   """
   stat: String
 
@@ -1309,6 +1352,11 @@ input DataItemPatch {
   """Indicates if the data item is active"""
   active: Boolean
 
+  """
+  Aggregation functions to be used in data summarizing logic for a given period.
+  """
+  agg: String
+
   """A description of the data item"""
   description: String
 
@@ -1356,6 +1404,7 @@ enum DataItemType {
   datetime
   file
   number
+  radio
   select
   text
 }
@@ -1420,6 +1469,7 @@ type DataOoc {
   creator: User
   data: Object
   dataItems: [DataItem!]
+  dataSample: DataSample
   dataSet: DataSet
   dataSetVersion: Float
   description: String
@@ -1432,11 +1482,13 @@ type DataOoc {
   key03: String
   key04: String
   key05: String
-  name: String!
+  name: String
   ooc: Boolean
   oos: Boolean
   partitionKeys: Object
   rawData: String
+  resolveActivityInstance: ActivityInstance
+  reviewActivityInstance: ActivityInstance
   reviewedAt: DateTimeISO
   reviewer: User
   source: String
@@ -1474,6 +1526,7 @@ type DataSample {
   creator: User
   data: Object
   dataItems: [DataItem!]
+  dataOoc: DataOoc
   dataSet: DataSet!
   dataSetVersion: Float
   description: String
@@ -1485,11 +1538,12 @@ type DataSample {
   key03: String
   key04: String
   key05: String
-  name: String!
+  name: String
   ooc: Boolean
   oos: Boolean
   partitionKeys: Object
   rawData: String
+  reviewActivityInstance: ActivityInstance
   source: String
   type: String
   updatedAt: DateTimeISO
@@ -1517,6 +1571,11 @@ type DataSensor {
   createdAt: DateTimeISO
   creator: User
   dataSet: DataSet
+
+  """
+  The decoder scenario that automatically executes based on the trigger of raw data collection
+  """
+  decoder: Scenario
   description: String
   deviceId: String
   domain: Domain
@@ -1542,6 +1601,7 @@ input DataSensorPatch {
   brand: String
   cuFlag: String!
   dataSet: ObjectRef
+  decoder: ObjectRef
   description: String
   deviceId: String
   id: ID
@@ -1876,7 +1936,6 @@ type Department {
   name: String
   parent: Department
   picture: String
-  state: String
   updatedAt: DateTimeISO
   updater: User
   version: Float
@@ -1897,13 +1956,6 @@ input DepartmentPatch {
   name: String
   parent: ObjectRef
   picture: Upload
-  state: DepartmentStatus
-}
-
-"""state enumeration of a department"""
-enum DepartmentStatus {
-  STATUS_A
-  STATUS_B
 }
 
 type Domain {
@@ -3385,14 +3437,20 @@ type Mutation {
 
   """To end a ActivityThread"""
   endActivityThread(id: String!, output: Object, reason: String): ActivityThread!
+
+  """To finalize data collection for the given period"""
+  finalizeDataCollection(dataSetId: String!, date: String!, period: String!): Boolean!
+
+  """To finalize new Data Summaries"""
+  finalizeLatestDataCollection(dataSetId: String!): Boolean!
   generateApplianceSecret(id: String!): Appliance!
   generateApplicationSecret(id: String!): Application!
 
-  """To generate new Data Summaries"""
-  generateDataSummaries(dataSetId: String!, date: String!, period: String!): Boolean!
+  """Deprecated. Use finalizeDataCollection"""
+  generateDataSummaries(dataSetId: String!, date: String!, period: String!): Boolean! @deprecated(reason: "This resolver has been replaced by finalizeDataCollection")
 
-  """To generate new Data Summaries"""
-  generateLatestDataSummaries(dataSetId: String!): Boolean!
+  """Deprecated. Use finalizeLatestDataCollection"""
+  generateLatestDataSummaries(dataSetId: String!): Boolean! @deprecated(reason: "This resolver has been replaced by finalizeLatestDataCollection")
 
   """To generate data sample one"""
   generateMockupData(params: DataSampleMockupInfo!): Boolean!
@@ -4073,6 +4131,7 @@ input NewCommonCode {
 input NewCommonCodeDetail {
   commonCode: ObjectRef!
   description: String
+  labels: Object
   name: String!
   rank: Float!
 }
@@ -4090,6 +4149,7 @@ input NewCompany {
 
 input NewConnection {
   description: String
+  edge: ObjectRef
   endpoint: String
   name: String!
   params: String
@@ -4120,9 +4180,11 @@ input NewContactPoint {
   description: String
   email: String
   fax: String
+  fax2: String
   managerName: String
   name: String!
   phone: String
+  phone2: String
   postCode: String
   registrationNo: String
   state: String
@@ -4181,6 +4243,7 @@ input NewDataSensor {
   appliance: ObjectRef
   brand: String
   dataSet: ObjectRef
+  decoder: ObjectRef
   description: String
   deviceId: String
   model: String
@@ -4232,7 +4295,6 @@ input NewDepartment {
   name: String!
   parent: ObjectRef
   picture: Upload
-  state: DepartmentStatus
 }
 
 input NewEmployee {
@@ -5526,7 +5588,7 @@ input ProductDetailBizplaceSettingPatch {
   cuFlag: String
   id: String
   maxQty: Int
-  minQty: Int
+  minQty: Float
   name: String
   productDetail: ObjectRef
   requirePacking: Boolean
@@ -5568,7 +5630,7 @@ input ProductDetailPatch {
   isTrackedAsInventory: Boolean
   lengthUnit: String
   maxQty: Int
-  minQty: Int
+  minQty: Float
   movement: String
   mrpPrice: Float
   name: String
@@ -6002,8 +6064,8 @@ type Query {
   """To fetch a Department"""
   department(id: String!): Department
 
-  """To fetch a Root Department"""
-  departmentRoot: Department
+  """To fetch a Root Departments"""
+  departmentRoots(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): DepartmentList
 
   """To fetch multiple Departments"""
   departments(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): DepartmentList!
@@ -6023,6 +6085,9 @@ type Query {
   """To fetch my own ActivityInstances"""
   draftList(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): ActivityInstanceList!
 
+  """To fetch multiple appliance"""
+  edges(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): ApplianceList!
+
   """To fetch a Employee"""
   employee(id: String!): Employee
 
@@ -6153,9 +6218,6 @@ type Query {
   """To fetch my notifications"""
   myNotifications(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): NotificationList!
 
-  """To fetch current users privileges for current domain"""
-  myPrivileges: [Privilege!]!
-
   """To fetch roles of current user"""
   myRoles: [Role!]!
 
@@ -6653,7 +6715,7 @@ type Step {
   params: String
 
   """
-  a boolean attribute indicating the inclusion status of an element in the result
+  A boolean attribute indicating the inclusion status of an element in the result
   """
   result: Boolean
   scenario: Scenario