@things-factory/operato-ecs 7.0.1 → 7.0.3

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@things-factory/operato-ecs",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "main": "dist-server/index.js",
-  "browser": "client/index.js",
+  "browser": "dist-client/index.js",
   "things-factory": true,
   "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "Application for equipment control system",
@@ -18,24 +18,28 @@
   },
   "scripts": {
     "serve": "things-factory operato-ecs",
-    "serve:dev": "npm run build:server && things-factory-dev operato-ecs",
-    "build": "npm run build:server",
+    "serve:dev": "npm run build:server && concurrently -k -r \"npm run build:client:watch\" \"things-factory-dev operato-ecs\"",
+    "copy:files": "copyfiles -e \"./client/**/*.{ts,js,json}\" -u 1 \"./client/**/*\" dist-client",
+    "build": "npm run build:server && npm run build:client",
+    "build:client": "npm run clean:client && npm run copy:files && tsc --p ./client/tsconfig.json",
+    "build:client:watch": "npm run copy:files && tsc --p ./client/tsconfig.json --watch --preserveWatchOutput",
     "build:server": "npm run clean:server && tsc --p ./server/tsconfig.json",
     "build:app": "npm run clean:app && webpack --config ../builder/webpack.config.js",
     "clean:server": "rm -rf dist-server",
+    "clean:client": "rm -rf dist-client",
     "clean:app": "rm -rf dist-app",
-    "clean": "npm run clean:server",
-    "migration": "things-factory-migration",
-    "migration:privileges": "things-factory-migration-privileges",
+    "clean": "npm run clean:server && npm run clean:client",
+    "migration": "npm run build:server && things-factory-migration",
+    "migration:privileges": "npm run build:server && things-factory-migration-privileges",
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations",
     "migration:generate": "node ../../node_modules/typeorm/cli.js migration:generate",
     "migration:run": "node ../../node_modules/typeorm/cli.js migration:run",
     "migration:revert": "node ../../node_modules/typeorm/cli.js migration:revert",
     "stop:dev": "kill $(lsof -t -i:3000,3001)",
     "stop": "things-factory-stop operato-ecs",
-    "docker": "npm run build:app && things-factory-dockerize hatiolab/operato-ecs:latest hatiolab/operato-ecs:$npm_package_version linux/amd64",
-    "docker:push": "docker image push hatiolab/operato-ecs:latest && docker image push hatiolab/operato-ecs:$npm_package_version",
-    "docker:run": "docker run --platform linux/amd64 -p 4000:3000 hatiolab/operato-ecs:latest"
+    "docker": "npm run build:app && things-factory-dockerize hatiolab/operato-ecs:latest  hatiolab/operato-ecs:$npm_package_version linux/amd64",
+    "docker:run": "docker run --platform linux/amd64 -p 4000:3000 hatiolab/operato-ecs:latest",
+    "docker:push": "docker image push hatiolab/operato-ecs:latest && docker image push hatiolab/operato-ecs:$npm_package_version"
   },
   "dependencies": {
     "@operato/data-grist": "^7.0.0",
@@ -59,34 +63,34 @@
     "@operato/scene-switch": "^7.0.0",
     "@operato/scene-table": "^7.0.0",
     "@operato/scene-timer": "^7.0.0",
-    "@things-factory/api": "^7.0.0",
-    "@things-factory/apptool-ui": "^7.0.0",
-    "@things-factory/auth-ui": "^7.0.0",
-    "@things-factory/board-service": "^7.0.1",
-    "@things-factory/board-ui": "^7.0.0",
-    "@things-factory/context-ui": "^7.0.0",
-    "@things-factory/dashboard": "^7.0.1",
-    "@things-factory/export-ui": "^7.0.0",
-    "@things-factory/help": "^7.0.0",
-    "@things-factory/i18n-base": "^7.0.0",
-    "@things-factory/integration-influxdb": "^7.0.1",
-    "@things-factory/integration-melsec": "^7.0.1",
-    "@things-factory/integration-modbus": "^7.0.1",
-    "@things-factory/integration-opc": "^7.0.1",
-    "@things-factory/integration-ui": "^7.0.1",
-    "@things-factory/lite-menu": "^7.0.1",
-    "@things-factory/more-ui": "^7.0.0",
-    "@things-factory/notification": "^7.0.1",
-    "@things-factory/oauth2-client": "^7.0.0",
-    "@things-factory/print-ui": "^7.0.0",
-    "@things-factory/resource-ui": "^7.0.0",
-    "@things-factory/setting-base": "^7.0.0",
-    "@things-factory/setting-ui": "^7.0.0",
-    "@things-factory/shell": "^7.0.0",
-    "@things-factory/system": "^7.0.0"
+    "@things-factory/api": "^7.0.2",
+    "@things-factory/apptool-ui": "^7.0.2",
+    "@things-factory/auth-ui": "^7.0.2",
+    "@things-factory/board-service": "^7.0.2",
+    "@things-factory/board-ui": "^7.0.2",
+    "@things-factory/context-ui": "^7.0.2",
+    "@things-factory/dashboard": "^7.0.2",
+    "@things-factory/export-ui": "^7.0.2",
+    "@things-factory/help": "^7.0.2",
+    "@things-factory/i18n-base": "^7.0.2",
+    "@things-factory/integration-influxdb": "^7.0.2",
+    "@things-factory/integration-melsec": "^7.0.2",
+    "@things-factory/integration-modbus": "^7.0.2",
+    "@things-factory/integration-opc": "^7.0.2",
+    "@things-factory/integration-ui": "^7.0.2",
+    "@things-factory/lite-menu": "^7.0.2",
+    "@things-factory/more-ui": "^7.0.2",
+    "@things-factory/notification": "^7.0.2",
+    "@things-factory/oauth2-client": "^7.0.2",
+    "@things-factory/print-ui": "^7.0.2",
+    "@things-factory/resource-ui": "^7.0.2",
+    "@things-factory/setting-base": "^7.0.2",
+    "@things-factory/setting-ui": "^7.0.2",
+    "@things-factory/shell": "^7.0.2",
+    "@things-factory/system": "^7.0.2"
   },
   "devDependencies": {
     "@things-factory/builder": "^7.0.0"
   },
-  "gitHead": "02f50498ba92589813db2d13907894d2b9220d8c"
+  "gitHead": "b641bc1712d12f4881a96b58f97888d9b36651b8"
 }

package/schema.graphql

@@ -1711,7 +1711,7 @@ type Mutation {
   """To delete multiple ApprovalLines"""
   deleteApprovalLines(ids: [String!]!): Boolean!
   deleteAttachment(id: String!): Boolean!
-  deleteAttachmentsByRef(refBys: [String!]!): Boolean!
+  deleteAttachmentsByRef(refBys: [String!]!, refType: String): Boolean!
 
   """To delete AttributeSet"""
   deleteAttributeSet(id: String!): Boolean!

package/things-factory.config.js

@@ -1,17 +1,12 @@
-import bootstrap from './client/bootstrap'
-import route from './client/route'
+import bootstrap from './dist-client/bootstrap'
+import route from './dist-client/route'
 
 export default {
   bootstrap,
   routes: [
-    {
-      tagname: 'api-sandbox',
-      page: 'api-sandbox'
-    },
-    {
-      tagname: 'printable-board-viewer-page',
-      page: 'printable-board-viewer'
-    }
+    { tagname: 'api-sandbox', page: 'api-sandbox' },
+    { tagname: 'printable-board-viewer-page', page: 'printable-board-viewer' },
+    { tagname: 'resource-gantt', page: 'resource-gantt' }
   ],
   route
 }

package/translations/en.json

@@ -1 +1,4 @@
-{}
+{
+  "button.back": "back",
+  "title.resource-gantt": "resource gantt chart"
+}

package/translations/ja.json

@@ -1 +1,4 @@
-{}
+{
+  "button.back": "戻る",
+  "title.resource-gantt": "リソース ガント チャート"
+}

package/translations/ko.json

@@ -1 +1,4 @@
-{}
+{
+  "button.back": "뒤로",
+  "title.resource-gantt": "간트 차트"
+}

package/translations/ms.json

@@ -1 +1,4 @@
-{}
+{
+  "button.back": "kembali",
+  "title.resource-gantt": "carta gantt sumber"
+}

package/translations/zh.json

@@ -1 +1,4 @@
-{}
+{
+  "button.back": "返回",
+  "title.resource-gantt": "资源甘特图"
+}

package/client/bootstrap.js

@@ -1,286 +0,0 @@
-import '@things-factory/notification'
-import '@things-factory/board-ui'
-import '@operato/i18n/ox-i18n.js'
-import '@things-factory/auth-ui/dist-client' /* for domain-switch */
-import '@things-factory/setting-ui/dist-client' /* secure-iplist-setting-let, theme-mode-setting-let */
-
-import { html } from 'lit-html'
-
-import { navigate, store } from '@operato/shell'
-import { appendViewpart, toggleOverlay, TOOL_POSITION, VIEWPART_POSITION } from '@operato/layout'
-import { registerDefaultGroups } from '@operato/board/register-default-groups.js'
-import { isMobileDevice } from '@operato/utils'
-
-import { hasPrivilege } from '@things-factory/auth-base/dist-client'
-import { setAuthManagementMenus } from '@things-factory/auth-ui/dist-client'
-import { APPEND_APP_TOOL } from '@things-factory/apptool-base/client'
-import { setupAppToolPart } from '@things-factory/apptool-ui/dist-client'
-import { setupMenuPart, updateMenuTemplate } from '@things-factory/lite-menu/dist-client'
-import { setupContextUIPart } from '@things-factory/context-ui/dist-client'
-import { ADD_MORENDA } from '@things-factory/more-base/client'
-import { ADD_SETTING } from '@things-factory/setting-base/dist-client'
-
-console.log(
-  `%c
-  ▄▄  ▄▄▄  ▄▄▄ ▄▄▄   ▄▄  ▄▄▄  ▄▄     ▄▄▄▄▄  ▄▄▄  ▄▄▄  
- ▓  ▓ ▓  ▓ ▓   ▓  ▓ ▓  ▓  ▓  ▓  ▓    ▓     ▓    ▓   ▀ 
- ▓  ▓ ▓▀▀  ▓▀▀ ▓▀▀▄ ▓▀▀▓  ▓  ▓  ▓ ▀▀ ▓▀▀▀  ▓    ▀▀▄▄  
- ▓  ▓ ▓    ▓   ▓  ▓ ▓  ▓  ▓  ▓  ▓    ▓     ▓    ▄   ▓ 
-  ▀▀  ▀    ▀▀▀ ▀  ▀ ▀  ▀  ▀   ▀▀     ▀▀▀▀▀  ▀▀▀  ▀▀▀  
-`,
-  'background: #222; color: #bada55'
-)
-
-export default async function bootstrap() {
-  /* 
-    set board-modeller group and default templates - should be called befor BoardModeller open 
-  */
-  registerDefaultGroups()
-
-  await setupAppToolPart({
-    toolbar: true,
-    busybar: true,
-    mdibar: false
-  })
-
-  await setupContextUIPart({
-    titlebar: 'header',
-    contextToolbar: 'page-footer'
-  })
-
-  await setupMenuPart({
-    hovering: isMobileDevice(),
-    position: VIEWPART_POSITION.NAVBAR,
-    portraitSlotTemplate: html` <domain-switch attrname="description" slot="head"></domain-switch> `
-  })
-  updateMenuTemplate([])
-
-  /* add addon-menu management page morenda */
-  if (await hasPrivilege({ privilege: 'mutation', category: 'menu' })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>view_list</md-icon> `,
-        name: html` <ox-i18n msgid="text.addon-menu management"></ox-i18n> `,
-        action: () => {
-          navigate('addon-menu-setting')
-        }
-      }
-    })
-  }
-
-  /* add setting morenda */
-  store.dispatch({
-    type: ADD_MORENDA,
-    morenda: {
-      icon: html` <md-icon>settings</md-icon> `,
-      name: html` <ox-i18n msgid="label.setting"></ox-i18n> `,
-      action: () => {
-        navigate('setting')
-      }
-    }
-  })
-
-  /* set auth management menus into more-panel */
-  setAuthManagementMenus()
-
-  if (await hasPrivilege({ privilege: 'mutation', category: 'user' })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>vpn_key</md-icon> `,
-        name: html` <ox-i18n msgid="text.oauth2-clients"></ox-i18n> `,
-        action: () => {
-          navigate('oauth2-clients')
-        }
-      }
-    })
-  }
-
-  if (await hasPrivilege({ privilege: 'mutation', category: 'board' })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>font_download</md-icon> `,
-        name: html` <ox-i18n msgid="menu.fonts"></ox-i18n> `,
-        action: () => {
-          navigate('font-list')
-        }
-      }
-    })
-
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>attachment</md-icon> `,
-        name: html` <ox-i18n msgid="menu.attachments"></ox-i18n> `,
-        action: () => {
-          navigate('attachment-list')
-        }
-      }
-    })
-
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>dvr</md-icon> `,
-        name: html` <ox-i18n msgid="menu.board-list"></ox-i18n> `,
-        action: () => {
-          navigate('board-list')
-        }
-      }
-    })
-
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>airplay</md-icon> `,
-        name: html` <ox-i18n msgid="menu.play-groups"></ox-i18n> `,
-        action: () => {
-          navigate('play-list')
-        }
-      }
-    })
-  }
-
-  if (await hasPrivilege({ privilege: 'mutation', category: 'scenario' })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>device_hub</md-icon> `,
-        name: html` <ox-i18n msgid="text.connection"></ox-i18n> `,
-        action: () => {
-          navigate('connection')
-        }
-      }
-    })
-
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>format_list_numbered</md-icon> `,
-        name: html` <ox-i18n msgid="text.scenario"></ox-i18n> `,
-        action: () => {
-          navigate('scenario')
-        }
-      }
-    })
-
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>hub</md-icon> `,
-        name: html` <ox-i18n msgid="text.integration analysis"></ox-i18n>&nbsp;(beta)`,
-        action: () => {
-          navigate('integration-analysis')
-        }
-      }
-    })
-  }
-
-  if (await hasPrivilege({ privilege: 'mutation', category: 'state-register' })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <md-icon>app_registration</md-icon> `,
-        name: html` <ox-i18n msgid="title.state-register"></ox-i18n> `,
-        action: () => {
-          navigate('state-register-page')
-        }
-      }
-    })
-  }
-
-  store.dispatch({
-    type: ADD_MORENDA,
-    morenda: {
-      icon: html` <md-icon>extension</md-icon> `,
-      name: html` <ox-i18n msgid="text.api-sandbox"></ox-i18n> `,
-      action: () => {
-        navigate('api-swagger')
-      }
-    }
-  })
-
-  // store.dispatch({
-  //   type: ADD_MORENDA,
-  //   morenda: {
-  //     icon: html` <md-icon>help</md-icon> `,
-  //     name: html` <ox-i18n msgid="text.help"></ox-i18n> `,
-  //     action: () => {
-  //       navigate('help')
-  //     }
-  //   }
-  // })
-
-  store.dispatch({
-    type: ADD_SETTING,
-    setting: {
-      seq: 10,
-      template: html` <theme-mode-setting-let></theme-mode-setting-let> `
-    }
-  })
-
-  store.dispatch({
-    type: ADD_SETTING,
-    setting: {
-      seq: 21,
-      template: html` <lite-menu-setting-let></lite-menu-setting-let> `
-    }
-  })
-
-  /* setting app-tools */
-  store.dispatch({
-    type: APPEND_APP_TOOL,
-    tool: {
-      name: 'notification-badge',
-      template: html`
-        <notification-badge
-          @click=${e => {
-            toggleOverlay('notification', {
-              backdrop: true
-            })
-          }}
-        >
-        </notification-badge>
-      `,
-      position: TOOL_POSITION.REAR
-    }
-  })
-
-  appendViewpart({
-    name: 'notification',
-    viewpart: {
-      show: false,
-      hovering: 'edge',
-      template: html` <notification-list style="min-width: 300px;"></notification-list> `
-    },
-    position: VIEWPART_POSITION.ASIDEBAR
-  })
-
-  store.dispatch({
-    type: ADD_SETTING,
-    setting: {
-      seq: 20,
-      template: html` <notification-setting-let></notification-setting-let> `
-    }
-  })
-
-  store.dispatch({
-    type: ADD_SETTING,
-    setting: {
-      seq: 21,
-      template: html` <board-view-setting-let></board-view-setting-let> `
-    }
-  })
-
-  if (await hasPrivilege({ privilege: 'mutation', category: 'security' })) {
-    store.dispatch({
-      type: ADD_SETTING,
-      setting: {
-        seq: 31,
-        template: html` <secure-iplist-setting-let></secure-iplist-setting-let> `
-      }
-    })
-  }
-}

package/client/pages/api/api-sandbox.js

@@ -1,45 +0,0 @@
-import { APIPageTemplate } from '@things-factory/api'
-
-const APIS = [
-  {
-    name: 'scenario',
-    path: 'scenario/:id',
-    method: 'get',
-    parameters: [],
-    description: 'get scenario information'
-  },
-  {
-    name: 'scenarios',
-    path: 'scenario',
-    method: 'get',
-    parameters: [
-      {
-        name: 'page'
-      },
-      {
-        name: 'limit'
-      }
-    ],
-    description: 'get scenario information'
-  }
-]
-
-class APISandbox extends APIPageTemplate {
-  constructor() {
-    super()
-  }
-
-  get APIS() {
-    return APIS
-  }
-
-  get context() {
-    return {
-      title: 'API Sandbox',
-      apiCategory: 'Integration',
-      description: 'Scenario control, connection control, ...'
-    }
-  }
-}
-
-window.customElements.define('api-sandbox', APISandbox)

package/client/route.js

@@ -1,10 +0,0 @@
-export default function route(page) {
-  switch (page) {
-    case '':
-      return '/dashboard'
-
-    case 'api-sandbox':
-      import('./pages/api/api-sandbox')
-      return page
-  }
-}