@things-factory/operato-board 5.0.14 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/operato-board",
-  "version": "5.0.14",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "App for dashboarding",
   "publishConfig": {
     "access": "public",
@@ -78,38 +78,38 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/apptool-ui": "^5.0.14",
-    "@things-factory/auth-ui": "^5.0.14",
-    "@things-factory/board-service": "^5.0.14",
-    "@things-factory/board-ui": "^5.0.14",
-    "@things-factory/context-ui": "^5.0.14",
-    "@things-factory/export-ui": "^5.0.14",
-    "@things-factory/fav-base": "^5.0.14",
-    "@things-factory/font-base": "^5.0.14",
-    "@things-factory/form-ui": "^5.0.1",
-    "@things-factory/help": "^5.0.14",
-    "@things-factory/i18n-base": "^5.0.14",
-    "@things-factory/import-ui": "^5.0.14",
-    "@things-factory/integration-notification": "^5.0.14",
-    "@things-factory/integration-ui": "^5.0.14",
-    "@things-factory/layout-ui": "^5.0.1",
-    "@things-factory/more-ui": "^5.0.14",
-    "@things-factory/notification": "^5.0.14",
-    "@things-factory/oauth2-client": "^5.0.14",
-    "@things-factory/offline-ui": "^5.0.14",
+    "@things-factory/apptool-ui": "^6.0.0-alpha.3",
+    "@things-factory/auth-ui": "^6.0.0-alpha.3",
+    "@things-factory/board-service": "^6.0.0-alpha.3",
+    "@things-factory/board-ui": "^6.0.0-alpha.3",
+    "@things-factory/context-ui": "^6.0.0-alpha.3",
+    "@things-factory/export-ui": "^6.0.0-alpha.3",
+    "@things-factory/fav-base": "^6.0.0-alpha.3",
+    "@things-factory/font-base": "^6.0.0-alpha.3",
+    "@things-factory/form-ui": "^6.0.0-alpha.3",
+    "@things-factory/help": "^6.0.0-alpha.3",
+    "@things-factory/i18n-base": "^6.0.0-alpha.3",
+    "@things-factory/import-ui": "^6.0.0-alpha.3",
+    "@things-factory/integration-notification": "^6.0.0-alpha.3",
+    "@things-factory/integration-ui": "^6.0.0-alpha.3",
+    "@things-factory/layout-ui": "^6.0.0-alpha.3",
+    "@things-factory/more-ui": "^6.0.0-alpha.3",
+    "@things-factory/notification": "^6.0.0-alpha.3",
+    "@things-factory/oauth2-client": "^6.0.0-alpha.3",
+    "@things-factory/offline-ui": "^6.0.0-alpha.3",
     "@things-factory/operato-license-checker": "^3.1.0",
-    "@things-factory/pdf": "^5.0.11",
-    "@things-factory/print-service": "^5.0.14",
-    "@things-factory/print-ui": "^5.0.14",
-    "@things-factory/resource-ui": "^5.0.14",
-    "@things-factory/scene-google-map": "^5.0.14",
-    "@things-factory/scene-visualizer": "^5.0.14",
-    "@things-factory/setting-ui": "^5.0.14",
-    "@things-factory/system-ui": "^5.0.14"
+    "@things-factory/pdf": "^6.0.0-alpha.3",
+    "@things-factory/print-service": "^6.0.0-alpha.3",
+    "@things-factory/print-ui": "^6.0.0-alpha.3",
+    "@things-factory/resource-ui": "^6.0.0-alpha.3",
+    "@things-factory/scene-google-map": "^6.0.0-alpha.3",
+    "@things-factory/scene-visualizer": "^6.0.0-alpha.3",
+    "@things-factory/setting-ui": "^6.0.0-alpha.3",
+    "@things-factory/system-ui": "^6.0.0-alpha.3"
   },
   "devDependencies": {
-    "@things-factory/board-test": "^5.0.14",
-    "@things-factory/builder": "^5.0.8"
+    "@things-factory/board-test": "^6.0.0-alpha.3",
+    "@things-factory/builder": "^6.0.0-alpha.3"
   },
-  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/migrations/1610516350460-SeedRole.ts

@@ -1,7 +1,7 @@
-import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 import { Privilege, Role, User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 const PRIVILEGES_SEED = {
   modeller: [
@@ -149,7 +149,7 @@ export class SeedRole1610516350460 implements MigrationInterface {
     const userRepository = getRepository(User)
 
     let users: User[] = await userRepository.find({ where: { userType: 'admin' }, relations: ['domains'] })
-    let domain: Domain = await getRepository(Domain).findOne({
+    let domain: Domain = await getRepository(Domain).findOneBy({
       name: 'SYSTEM'
     })
 
@@ -201,7 +201,7 @@ export class SeedRole1610516350460 implements MigrationInterface {
   public async down(queryRunner: QueryRunner): Promise<any> {
     const repository = getRepository(Role)
     const privilegeRepository = getRepository(Privilege)
-    const domain: Domain = await getRepository(Domain).findOne({
+    const domain: Domain = await getRepository(Domain).findOneBy({
       name: 'SYSTEM'
     })
 

package/server/service/board-favorite/board-favorite-query.ts

@@ -1,10 +1,11 @@
-import { Resolver, Query, Args, Ctx } from 'type-graphql'
-import { getRepository } from 'typeorm'
-import { ListParam, buildQuery } from '@things-factory/shell'
+import { Args, Ctx, Query, Resolver } from 'type-graphql'
+
 import { Board } from '@things-factory/board-service'
+import { config } from '@things-factory/env'
 import { Favorite } from '@things-factory/fav-base'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
+
 import { BoardFavorite, BoardFavoriteList } from './board-favorite-type'
-import { config } from '@things-factory/env'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -12,7 +13,7 @@ const DATABASE_TYPE = ORMCONFIG.type
 @Resolver(BoardFavorite)
 export class BoardFavoriteQuery {
   @Query(returns => BoardFavoriteList, { description: 'To fetch multiple BoardFavorites' })
-  async favoriteBoards(@Args() params: ListParam, @Ctx() context: any): Promise<BoardFavoriteList> {
+  async favoriteBoards(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<BoardFavoriteList> {
     const { user } = context.state
 
     const queryBuilder = getRepository(Board).createQueryBuilder()

package/server/service/board-secret/board-resolver.ts

@@ -1,8 +1,8 @@
 import { Arg, Ctx, Query, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { Board } from '@things-factory/board-service'
 import { checkTarget, doSomething, getPermission } from '@things-factory/operato-license-checker'
+import { getRepository } from '@things-factory/shell'
 
 import { LicenseError } from '../../errors/license-error'
 import { DomainSecret } from '../domain-secret/domain-secret'
@@ -13,16 +13,16 @@ const crypto = require('crypto')
 @Resolver(Board)
 export class BoardResolver {
   @Query(returns => [String], { description: 'Board Usage Permissions' })
-  boardPermissions(@Ctx() context: any): string[] {
+  boardPermissions(@Ctx() context: ResolverContext): string[] {
     return (getPermission('Permissions For Board Usage') || 'Modeller, Viewer').split(',').map(p => p.trim())
   }
 
   @Query(returns => Board, { description: 'To fetch a board' })
-  async board(@Arg('id') id: string, @Ctx() context: any): Promise<Board> {
+  async board(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Board> {
     const { domain } = context.state
 
     var board = await getRepository(Board).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
     if (domain) {
       // 1. check domainSecret is over limit quantity or not

package/server/service/domain-secret/domain-resolver.ts

@@ -1,7 +1,7 @@
 import { Arg, Directive, Mutation, Resolver } from 'type-graphql'
-import { getRepository, Repository } from 'typeorm'
+import { Repository } from 'typeorm'
 
-import { Domain, DomainPatch } from '@things-factory/shell'
+import { Domain, DomainPatch, getRepository } from '@things-factory/shell'
 import { slugger } from '@things-factory/utils'
 
 @Resolver(Domain)

package/config.development.js

@@ -1,26 +0,0 @@
-module.exports = {
-  accessTokenCookieKey: 'access_token.board',
-  licenseKey:
-    '5eyJMaWNlbnNlIFR5cGUiOiJFdmFsdWF0aW9uIiwiUHVyY2hhc2UgRGF0ZSI6IjIwMjIuMDcuMjIiLCJFeHBpcmF0aW9uIERhdGUiOiIyMDIyLjEwLjIyIiwiSG9zdCBBZGRyZXNzIjoiVU5MSU1JVEVEIiwiTWF4IFRhcmdldCBDb3VudCI6MCwiTWF4IERvbWFpbiBDb3VudCI6MCwiUGVybWlzc2lvbnMgRm9yIEJvYXJkIFVzYWdlIjoiVmlld2VyLCBNb2RlbGxlciIsIktleSI6IkF4Z3FIQTQzSGdzQVFCb0xLeU1kRlFrYURUc1pDQ29qQzAwbUVnSXBJakVURWpaVkl3Z1ZPeE1aSGhBV0VnUUhBUVFUQmlJaUtSQVNEaGtJSHdrckRpSktJeFFWRmdVVUp3RW1TU0FlR0JnREdUSUhERTBtTVFFcEx4UXJKQjFJQ0JvTk94a0lLeEFpSkNNWUZqd2pGaWdCSmxrakNCVTdGUm83RVFzaktoOElHUllZR2hFaFdpTUpEVHNTREQ4Y0hEVTdGd3dYRWh3ckFBaEpHQW9jQmg4YklnRU1UUWdMQWhVbUhSSTJHVlVJSGhrSUd4NERBQnMzSmkwWkZ4WVZFaElwVUFvSUlCWUdMaDRNQ3lNakt4VVZEd2dmSWhsWkNnb0tUQVV2Q0EwTlRoOEdFRDh2R0Nza0pWWVRDUmc5SHhzZUVSWTNDQXNaUEFjSUhnUURUQWd2REVzY0hqSWJEUklhQ3dBWkVBc1JBQ1VaIn0=67424',
-  storage: {
-    type: 's3',
-    accessKeyId: 'AKIAQAYF6R4N7RSOCEMD',
-    secretAccessKey: 'n14c8n42prH68oizEIrLbf50I5Edx3RZtU73jkrN',
-    bucketName: 'aidoop-r',
-    region: 'ap-northeast-2'
-  },
-  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: 'noreply@hatiolab.com',
-      pass: 'h@ti0LAB1008' // generated ethereal password
-    },
-    secureConnection: false,
-    tls: {
-      ciphers: 'SSLv3'
-    }
-  },
-  googleFontAPIKey: 'AIzaSyAdNzZGpGL_kh4jWwFwaXP4o0bObFIfCZQ'
-}

package/config.production.js

@@ -1,5 +0,0 @@
-var licenseKey = require('./config/license').Key
-module.exports = {
-  protocol: 'http',
-  licenseKey: licenseKey
-}