@things-factory/operato-fleet 8.0.0-beta.1 → 8.0.0-beta.2

package/client/pages/client/client.js

@@ -0,0 +1,130 @@
+import { html, css } from 'lit'
+import { connect } from 'pwa-helpers/connect-mixin.js'
+import '@material/mwc-button'
+import '@material/mwc-textfield'
+import { store, PageView } from '@operato/shell'
+import '@operato/data-grist'
+import { i18next, localize } from '@operato/i18n'
+import { isMobileDevice } from '@operato/utils'
+import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
+import { FMSPageStyles } from '../fleet-page-style'
+
+import { fetchClients } from '../../commons/fetch-client'
+
+class FMSClient extends connect(store)(localize(i18next)(PageView)) {
+  static get properties() {
+    return {}
+  }
+
+  static get styles() {
+    return [ScrollbarStyles, FMSPageStyles]
+  }
+
+  get context() {
+    return {
+      title: i18next.t('title.client'),
+      exportable: {
+        accept: ['json'],
+        name: 'client',
+        data: () => {
+          return []
+        }
+      },
+      actions: [
+        {
+          title: i18next.t('button.register'),
+          action: this.register.bind(this),
+          ...CommonButtonStyles.register
+        }
+      ]
+    }
+  }
+
+  render() {
+    return html`
+      <form search>
+        <mwc-textfield label="device" icon="router"></mwc-textfield>
+        <mwc-textfield label="client" icon="domain"></mwc-textfield>
+        <mwc-textfield label="delivery" icon="local_shipping"></mwc-textfield>
+        <mwc-textfield label="from date" icon="event" type="date"></mwc-textfield>
+        <mwc-textfield label="to date" icon="event" type="date"></mwc-textfield>
+        <mwc-button label="search" icon="search" raised></mwc-button>
+      </form>
+
+      <ox-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.config}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+      >
+      </ox-grist>
+    `
+  }
+
+  connectedCallback() {
+    super.connectedCallback()
+
+    this.config = {
+      list: { fields: ['client', 'delivery', 'device', 'status', 'battery'] },
+      pagination: { infinite: false },
+      rows: { selectable: false, appendable: false },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        {
+          type: 'string',
+          name: 'client',
+          header: i18next.t('field.client'),
+          record: { editable: false, align: 'left' },
+          imex: { header: i18next.t('field.client'), key: 'client', width: 50, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'delivery',
+          header: i18next.t('field.delivery'),
+          record: { editable: false, align: 'left' },
+          imex: { header: i18next.t('field.delivery'), key: 'delivery', width: 50, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'device',
+          header: i18next.t('field.device'),
+          record: { editable: false, align: 'left' },
+          imex: { header: i18next.t('field.device'), key: 'device', width: 50, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'datetime',
+          name: 'registration',
+          header: i18next.t('field.registration'),
+          record: { editable: false, align: 'left' },
+          imex: { header: i18next.t('field.registration'), key: 'registration', width: 50, type: 'string' },
+          sortable: true,
+          width: 180
+        }
+      ]
+    }
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+    this.renderRoot.querySelector('ox-grist').fetch({ limit: 50 })
+  }
+
+  pageUpdated(changes, lifecycle) {
+    if (this.active) {
+    } else {
+    }
+  }
+
+  async fetchHandler({ page, limit, sorters = [] }) {
+    return await fetchClients({ page, limit, sorters })
+  }
+
+  register() {}
+}
+
+window.customElements.define('fleet-client', FMSClient)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-fleet",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -72,34 +72,34 @@
     "@operato/scene-timer": "^8.0.0-beta",
     "@operato/scene-visualizer": "^8.0.0-beta",
     "@operato/scene-wheel-sorter": "^8.0.0-beta",
-    "@things-factory/apptool-ui": "^8.0.0-beta.1",
-    "@things-factory/attachment-base": "^8.0.0-beta.1",
-    "@things-factory/auth-ui": "^8.0.0-beta.1",
-    "@things-factory/biz-base": "^8.0.0-beta.1",
-    "@things-factory/board-service": "^8.0.0-beta.1",
-    "@things-factory/board-ui": "^8.0.0-beta.1",
-    "@things-factory/code-ui": "^8.0.0-beta.1",
-    "@things-factory/context-ui": "^8.0.0-beta.1",
-    "@things-factory/dashboard": "^8.0.0-beta.1",
-    "@things-factory/evaluation": "^8.0.0-beta.1",
-    "@things-factory/export-ui": "^8.0.0-beta.1",
-    "@things-factory/export-ui-csv": "^8.0.0-beta.1",
-    "@things-factory/export-ui-excel": "^8.0.0-beta.1",
-    "@things-factory/help": "^8.0.0-beta.1",
-    "@things-factory/i18n-base": "^8.0.0-beta.1",
-    "@things-factory/integration-fulfillment": "^8.0.0-beta.1",
-    "@things-factory/integration-marketplace": "^8.0.0-beta.1",
-    "@things-factory/more-ui": "^8.0.0-beta.1",
-    "@things-factory/notification": "^8.0.0-beta.1",
-    "@things-factory/oauth2-client": "^8.0.0-beta.1",
-    "@things-factory/pdf": "^8.0.0-beta.1",
-    "@things-factory/resource-ui": "^8.0.0-beta.1",
-    "@things-factory/setting-ui": "^8.0.0-beta.1",
-    "@things-factory/system": "^8.0.0-beta.1",
+    "@things-factory/apptool-ui": "^8.0.0-beta.2",
+    "@things-factory/attachment-base": "^8.0.0-beta.2",
+    "@things-factory/auth-ui": "^8.0.0-beta.2",
+    "@things-factory/biz-base": "^8.0.0-beta.2",
+    "@things-factory/board-service": "^8.0.0-beta.2",
+    "@things-factory/board-ui": "^8.0.0-beta.2",
+    "@things-factory/code-ui": "^8.0.0-beta.2",
+    "@things-factory/context-ui": "^8.0.0-beta.2",
+    "@things-factory/dashboard": "^8.0.0-beta.2",
+    "@things-factory/evaluation": "^8.0.0-beta.2",
+    "@things-factory/export-ui": "^8.0.0-beta.2",
+    "@things-factory/export-ui-csv": "^8.0.0-beta.2",
+    "@things-factory/export-ui-excel": "^8.0.0-beta.2",
+    "@things-factory/help": "^8.0.0-beta.2",
+    "@things-factory/i18n-base": "^8.0.0-beta.2",
+    "@things-factory/integration-fulfillment": "^8.0.0-beta.2",
+    "@things-factory/integration-marketplace": "^8.0.0-beta.2",
+    "@things-factory/more-ui": "^8.0.0-beta.2",
+    "@things-factory/notification": "^8.0.0-beta.2",
+    "@things-factory/oauth2-client": "^8.0.0-beta.2",
+    "@things-factory/pdf": "^8.0.0-beta.2",
+    "@things-factory/resource-ui": "^8.0.0-beta.2",
+    "@things-factory/setting-ui": "^8.0.0-beta.2",
+    "@things-factory/system": "^8.0.0-beta.2",
     "chance": "^1.1.11"
   },
   "devDependencies": {
-    "@things-factory/builder": "^8.0.0-beta.1"
+    "@things-factory/builder": "^8.0.0-beta.2"
   },
-  "gitHead": "36c494e587640c1490318ef7b95adab02606e0c2"
+  "gitHead": "f03431a09435511b2595515658f9cb8f78ba4ebb"
 }

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-ecs',
-    /* 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-fleet
-    image: hatiolab/operato-fleet: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-fleet
-    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:1.6.12
-    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-fleet/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-fleet/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-fleet/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-fleet/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-fleet/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-fleet/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-fleet:latest
-
-docker pull hatiolab/operato-nginx:latest
-
-docker-compose create

package/installer/migrate.sh

@@ -1 +0,0 @@
-docker exec -it operato-fleet npm run 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-fleet/installer/install.sh | bash -s