@things-factory/operato-dataset 8.0.40 → 9.0.0-9.0.0-beta.59.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-dataset",
-  "version": "8.0.40",
+  "version": "9.0.0-9.0.0-beta.59.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,67 +40,68 @@
     "docker:push": "docker image push hatiolab/operato-dataset:latest && docker image push hatiolab/operato-dataset:$npm_package_version"
   },
   "dependencies": {
-    "@operato/board": "^8.0.0",
-    "@operato/data-grist": "^8.0.0",
-    "@operato/layout": "^8.0.0",
-    "@operato/scene-chartjs": "^8.0.0",
-    "@operato/scene-clock": "^8.0.0",
-    "@operato/scene-data-transform": "^8.0.0",
-    "@operato/scene-form": "^8.0.0",
-    "@operato/scene-gantt": "^8.0.0",
-    "@operato/scene-gauge": "^8.0.0",
-    "@operato/scene-grist": "^8.0.0",
-    "@operato/scene-half-roundrect": "^8.0.0",
-    "@operato/scene-image-slider": "^8.0.0",
-    "@operato/scene-integration": "^8.0.0",
-    "@operato/scene-label": "^8.0.0",
-    "@operato/scene-news-ticker": "^8.0.0",
-    "@operato/scene-progressbar": "^8.0.0",
-    "@operato/scene-random": "^8.0.0",
-    "@operato/scene-switch": "^8.0.0",
-    "@operato/scene-table": "^8.0.0",
-    "@operato/scene-timer": "^8.0.0",
-    "@operato/shell": "^8.0.0",
-    "@things-factory/api": "^8.0.38",
-    "@things-factory/apptool-base": "^8.0.38",
-    "@things-factory/apptool-ui": "^8.0.38",
-    "@things-factory/auth-base": "^8.0.38",
-    "@things-factory/auth-ui": "^8.0.38",
-    "@things-factory/board-service": "^8.0.40",
-    "@things-factory/board-ui": "^8.0.38",
-    "@things-factory/ccp": "^8.0.40",
-    "@things-factory/context-ui": "^8.0.38",
-    "@things-factory/dashboard": "^8.0.40",
-    "@things-factory/dataset": "^8.0.40",
-    "@things-factory/edge-client": "^8.0.40",
-    "@things-factory/evaluation": "^8.0.38",
-    "@things-factory/export-ui": "^8.0.38",
-    "@things-factory/help": "^8.0.38",
-    "@things-factory/i18n-base": "^8.0.38",
-    "@things-factory/integration-base": "^8.0.40",
-    "@things-factory/integration-influxdb": "^8.0.40",
-    "@things-factory/integration-msgraph": "^8.0.40",
-    "@things-factory/integration-ui": "^8.0.40",
-    "@things-factory/lite-menu": "^8.0.40",
-    "@things-factory/lock-client": "^8.0.38",
-    "@things-factory/more-base": "^8.0.38",
-    "@things-factory/more-ui": "^8.0.38",
-    "@things-factory/notification": "^8.0.38",
-    "@things-factory/oauth2-client": "^8.0.38",
-    "@things-factory/organization": "^8.0.38",
-    "@things-factory/qc": "^8.0.40",
-    "@things-factory/resource-ui": "^8.0.38",
-    "@things-factory/scheduler": "^8.0.38",
-    "@things-factory/setting-base": "^8.0.38",
-    "@things-factory/setting-ui": "^8.0.38",
-    "@things-factory/shell": "^8.0.38",
-    "@things-factory/spc": "^8.0.40",
-    "@things-factory/system": "^8.0.38",
-    "@things-factory/work-shift": "^8.0.38",
-    "@things-factory/worklist": "^8.0.40"
+    "@operato/board": "^9.0.0-beta",
+    "@operato/data-grist": "^9.0.0-beta",
+    "@operato/layout": "^9.0.0-beta",
+    "@operato/scene-chartjs": "^9.0.0-beta",
+    "@operato/scene-clock": "^9.0.0-beta",
+    "@operato/scene-data-transform": "^9.0.0-beta",
+    "@operato/scene-form": "^9.0.0-beta",
+    "@operato/scene-gantt": "^9.0.0-beta",
+    "@operato/scene-gauge": "^9.0.0-beta",
+    "@operato/scene-grist": "^9.0.0-beta",
+    "@operato/scene-half-roundrect": "^9.0.0-beta",
+    "@operato/scene-image-slider": "^9.0.0-beta",
+    "@operato/scene-integration": "^9.0.0-beta",
+    "@operato/scene-label": "^9.0.0-beta",
+    "@operato/scene-material-design": "^9.0.0-beta",
+    "@operato/scene-news-ticker": "^9.0.0-beta",
+    "@operato/scene-progressbar": "^9.0.0-beta",
+    "@operato/scene-random": "^9.0.0-beta",
+    "@operato/scene-switch": "^9.0.0-beta",
+    "@operato/scene-table": "^9.0.0-beta",
+    "@operato/scene-timer": "^9.0.0-beta",
+    "@operato/shell": "^9.0.0-beta",
+    "@things-factory/api": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/apptool-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/apptool-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/auth-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/auth-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/board-service": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/board-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/ccp": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/context-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/dashboard": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/dataset": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/edge-client": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/evaluation": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/export-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/help": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/i18n-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/integration-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/integration-influxdb": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/integration-msgraph": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/integration-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/lite-menu": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/lock-client": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/more-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/more-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/notification": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/oauth2-client": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/organization": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/qc": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/resource-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/scheduler": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/setting-base": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/setting-ui": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/shell": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/spc": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/system": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/work-shift": "^9.0.0-9.0.0-beta.59.0",
+    "@things-factory/worklist": "^9.0.0-9.0.0-beta.59.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^8.0.37"
+    "@things-factory/builder": "^9.0.0-9.0.0-beta.59.0"
   },
-  "gitHead": "6f97ca5dc8aab9acaeebbd3caace0c76bab2676d"
+  "gitHead": "cf6ee84b991f469a4e71198b0e6314b45e9e10b8"
 }

package/schema.graphql

@@ -1924,6 +1924,8 @@ type Employee {
   address: String
   alias: String
   approvalLines: [ApprovalLine!]!
+  bankAccount: String
+  bankName: String
   contact: Contact
   controlNo: String!
   createdAt: DateTimeISO
@@ -1932,8 +1934,10 @@ type Employee {
   department: Department
   domain: Domain!
   email: EmailAddress
+  emergencyContact: String
+  emergencyContactPhone: String
   extension: String
-  hiredOn: String
+  hiredOn: DateTimeISO
   id: ID!
   jobPosition: String
   jobResponsibility: String
@@ -1943,7 +1947,7 @@ type Employee {
   phone: String
   photo: String
   profile: Profile
-  retiredAt: String
+  retiredOn: DateTimeISO
   supervises: [Employee!]!
   supervisor: Employee
   type: String
@@ -1961,18 +1965,22 @@ type EmployeeList {
 input EmployeePatch {
   active: Boolean
   alias: String
+  bankAccount: String
+  bankName: String
   contact: ObjectRefForContact
   controlNo: String
   cuFlag: String
   department: ObjectRefForDepartment
-  hiredOn: String
+  emergencyContact: String
+  emergencyContactPhone: String
+  hiredOn: DateTimeISO
   id: ID
   jobPosition: String
   jobResponsibility: String
   name: String
   note: String
   photo: Upload
-  retiredAt: String
+  retiredOn: DateTimeISO
   supervisor: ObjectRefForEmployee
   type: EmployeeType
   user: ObjectRefForUser
@@ -4064,17 +4072,21 @@ input NewDepartment {
 input NewEmployee {
   active: Boolean
   alias: String
+  bankAccount: String
+  bankName: String
   contact: ObjectRefForContact
   controlNo: String!
   department: ObjectRefForDepartment
+  emergencyContact: String
+  emergencyContactPhone: String
   extension: String
-  hiredOn: String
+  hiredOn: DateTimeISO
   jobPosition: String
   jobResponsibility: String
   name: String!
   note: String
   photo: Upload
-  retiredAt: String
+  retiredOn: DateTimeISO
   supervisor: ObjectRefForEmployee
   type: EmployeeType
   user: ObjectRefForUser
@@ -4707,7 +4719,7 @@ input ObjectRefForEmployee {
   """Field description"""
   description: String
   email: EmailAddress
-  hiredOn: String
+  hiredOn: DateTimeISO
 
   """Field id"""
   id: ID!

package/views/auth-page.html

@@ -52,7 +52,6 @@
 
     <!-- Performance tip: hint to the browser to start the handshake for the fonts site -->
     <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin />
-    <link href="/node_modules/@material-design-icons/font/index.css" rel="stylesheet" />
     <link href="/node_modules/material-symbols/index.css" rel="stylesheet" />
     <link href="/node_modules/@fontsource/roboto/index.css" rel="stylesheet" />
     <link rel="stylesheet" href="/theme.css" />

package/views/public/home.html

@@ -51,7 +51,6 @@
 
     <!-- Performance tip: hint to the browser to start the handshake for the fonts site -->
     <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin />
-    <link href="/node_modules/@material-design-icons/font/index.css" rel="stylesheet" />
     <link href="/node_modules/material-symbols/index.css" rel="stylesheet" />
     <link href="/node_modules/@fontsource/roboto/index.css" rel="stylesheet" />
     <link rel="stylesheet" href="/theme.css" />

package/installer/config.production.js

@@ -1,52 +0,0 @@
-module.exports = {
-  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dAC95', // should be changed
-  email: {
-    host: 'smtp.office365.com', // your sender-email smtp host
-    port: 587, // smtp server port
-    secure: false, // true for 465, false for other ports
-    auth: {
-      user: 'your sender-email',
-      pass: 'your sender-email password' // generated ethereal password
-    },
-    secureConnection: false,
-    tls: {
-      ciphers: 'SSLv3'
-    }
-  },
-  logger: {
-    file: {
-      filename: 'logs/application-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      zippedArchive: false,
-      maxSize: '20m',
-      maxFiles: '2d',
-      level: 'info'
-    },
-    console: {
-      level: 'silly'
-    }
-  },
-  ormconfig: {
-    name: 'default',
-    type: 'postgres',
-    host: 'postgres',
-    port: 5432,
-    database: 'postgres',
-    username: 'postgres',
-    password: 'abcd1234',
-    synchronize: true,
-    logging: true
-  },
-  scheduler: {
-    /* Name to be used for setting client's "application" properties when registering a schedule */
-    application: 'operato-dataset',
-    /* Base endpoint to be used for setting "callback" properties when registering a schedule */
-    callbackBase: 'http://app:3000',
-    /* 
-        Scheduler service endpoint
-        caution) endpoint for "localhost" has some problem. 
-        https://github.com/node-fetch/node-fetch/issues/1624
-      */
-    endpoint: 'http://scheduler:9902'
-  }
-}

package/installer/docker-compose.yml

@@ -1,55 +0,0 @@
-version: '3'
-services:
-  nginx:
-    image: hatiolab/operato-nginx:latest
-    ports:
-      - ${HostPort}:80
-    depends_on:
-      - app
-  app:
-    build: .
-    container_name: operato-dataset
-    image: hatiolab/operato-dataset:latest
-    privileged: true
-    volumes:
-      - ./logs:/app/logs
-      - ./config.production.js:/app/config.production.js
-    ports:
-      - 4000:3000
-    depends_on:
-      - postgres
-      - mosquitto
-      - scheduler
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '100m'
-        max-file: '3'
-  postgres:
-    image: postgres:13.2
-    container_name: db-operato-dataset
-    environment:
-      POSTGRES_PASSWORD: abcd1234
-      POSTGRES_USER: postgres
-      PGDATA: /var/lib/postgresql/data/pgdata
-    volumes:
-      - ./postgres_data:/var/lib/postgresql/data/pgdata
-    ports:
-      - '55432:5432'
-  mosquitto:
-    image: eclipse-mosquitto:latest
-    ports:
-      - 1883:1883
-      - 9001:9001
-  scheduler:
-    image: hatiolab/schevt-mgr:latest
-    container_name: scheduler
-    volumes:
-      - ./config.yaml:/app/config.yaml
-    ports:
-      - '9902:9902'
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '100m'
-        max-file: '3'

package/installer/install.sh

@@ -1,54 +0,0 @@
-if [ -f "config.production.js" ] ; then
-  echo "config.production.js exist"
-else
-  echo "config.production.js create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/config.production.js
-fi
-
-if [ -f "start.sh" ] ; then
-  echo "start.sh exist"
-else
-  echo "start.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/start.sh
-fi
-
-if [ -f "stop.sh" ] ; then
-  echo "stop.sh exist"
-else
-  echo "stop.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/stop.sh
-fi
-
-if [ -f "upgrade.sh" ] ; then
-  echo "upgrade.sh exist"
-else
-  echo "upgrade.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/upgrade.sh
-fi
-
-if [ -f "migrate.sh" ] ; then
-  echo "migrate.sh exist"
-else
-  echo "migrate.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/migrate.sh
-fi
-
-if [ -f "docker-compose.yml" ] ; then
-  echo "docker-compose.yml exist"
-else
-  echo "docker-compose.yml create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/docker-compose.yml
-fi
-
-chmod u+x start.sh
-chmod u+x stop.sh
-chmod u+x upgrade.sh
-chmod u+x migrate.sh
-
-echo "HostPort=3000" > .env
-
-docker pull hatiolab/operato-dataset:latest
-
-docker pull hatiolab/operato-nginx:latest
-
-docker-compose create

package/installer/migrate.sh

@@ -1 +0,0 @@
-docker exec -it operato-dataset npx things-factory-migration --mode=production

package/installer/start.sh

@@ -1,18 +0,0 @@
-HOST_PORT=3000
-
-if [ $# -eq 0 ] ; then
-  echo "Warning: default port 3000"
-else
-  HOST_PORT=$1
-fi
-
-
-echo "HOST_PORT : ${HOST_PORT}"
-
-echo "HostPort="$HOST_PORT > .env
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    xhost +"local:docker@"
-fi
-
-docker-compose up -d

package/installer/stop.sh

@@ -1 +0,0 @@
-docker-compose stop

package/installer/upgrade.sh

@@ -1 +0,0 @@
-curl -fsSL https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-dataset/installer/install.sh | bash -s