@things-factory/operato-board 5.0.8 → 6.0.0-alpha.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/operato-board",
-  "version": "5.0.8",
+  "version": "6.0.0-alpha.0",
   "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.7",
-    "@things-factory/auth-ui": "^5.0.7",
-    "@things-factory/board-service": "^5.0.7",
-    "@things-factory/board-ui": "^5.0.7",
-    "@things-factory/context-ui": "^5.0.7",
-    "@things-factory/export-ui": "^5.0.7",
-    "@things-factory/fav-base": "^5.0.7",
-    "@things-factory/font-base": "^5.0.7",
-    "@things-factory/form-ui": "^5.0.1",
-    "@things-factory/help": "^5.0.7",
-    "@things-factory/i18n-base": "^5.0.7",
-    "@things-factory/import-ui": "^5.0.7",
-    "@things-factory/integration-notification": "^5.0.7",
-    "@things-factory/integration-ui": "^5.0.7",
-    "@things-factory/layout-ui": "^5.0.1",
-    "@things-factory/more-ui": "^5.0.7",
-    "@things-factory/notification": "^5.0.7",
-    "@things-factory/oauth2-client": "^5.0.7",
-    "@things-factory/offline-ui": "^5.0.7",
+    "@things-factory/apptool-ui": "^6.0.0-alpha.0",
+    "@things-factory/auth-ui": "^6.0.0-alpha.0",
+    "@things-factory/board-service": "^6.0.0-alpha.0",
+    "@things-factory/board-ui": "^6.0.0-alpha.0",
+    "@things-factory/context-ui": "^6.0.0-alpha.0",
+    "@things-factory/export-ui": "^6.0.0-alpha.0",
+    "@things-factory/fav-base": "^6.0.0-alpha.0",
+    "@things-factory/font-base": "^6.0.0-alpha.0",
+    "@things-factory/form-ui": "^6.0.0-alpha.0",
+    "@things-factory/help": "^6.0.0-alpha.0",
+    "@things-factory/i18n-base": "^6.0.0-alpha.0",
+    "@things-factory/import-ui": "^6.0.0-alpha.0",
+    "@things-factory/integration-notification": "^6.0.0-alpha.0",
+    "@things-factory/integration-ui": "^6.0.0-alpha.0",
+    "@things-factory/layout-ui": "^6.0.0-alpha.0",
+    "@things-factory/more-ui": "^6.0.0-alpha.0",
+    "@things-factory/notification": "^6.0.0-alpha.0",
+    "@things-factory/oauth2-client": "^6.0.0-alpha.0",
+    "@things-factory/offline-ui": "^6.0.0-alpha.0",
     "@things-factory/operato-license-checker": "^3.1.0",
-    "@things-factory/pdf": "^5.0.1",
-    "@things-factory/print-service": "^5.0.7",
-    "@things-factory/print-ui": "^5.0.7",
-    "@things-factory/resource-ui": "^5.0.7",
-    "@things-factory/scene-google-map": "^5.0.0",
-    "@things-factory/scene-visualizer": "^5.0.0",
-    "@things-factory/setting-ui": "^5.0.7",
-    "@things-factory/system-ui": "^5.0.7"
+    "@things-factory/pdf": "^6.0.0-alpha.0",
+    "@things-factory/print-service": "^6.0.0-alpha.0",
+    "@things-factory/print-ui": "^6.0.0-alpha.0",
+    "@things-factory/resource-ui": "^6.0.0-alpha.0",
+    "@things-factory/scene-google-map": "^6.0.0-alpha.0",
+    "@things-factory/scene-visualizer": "^6.0.0-alpha.0",
+    "@things-factory/setting-ui": "^6.0.0-alpha.0",
+    "@things-factory/system-ui": "^6.0.0-alpha.0"
   },
   "devDependencies": {
-    "@things-factory/board-test": "^5.0.7",
-    "@things-factory/builder": "^5.0.8"
+    "@things-factory/board-test": "^6.0.0-alpha.0",
+    "@things-factory/builder": "^6.0.0-alpha.0"
   },
-  "gitHead": "de14539186ad35c0bd1379b8ae4dccda7b13256e"
+  "gitHead": "e5b9823ab3ebc5d6ae5bcb4b5aa60c1306e4dd7e"
 }

package/server/migrations/1610516350460-SeedRole.ts

@@ -1,8 +1,10 @@
-import { MigrationInterface, QueryRunner, getRepository } from 'typeorm'
-import { Domain } from '@things-factory/shell'
-import { Role, Privilege,User } from '@things-factory/auth-base'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+import { Privilege, Role, User } from '@things-factory/auth-base'
+import { Domain, getRepository } from '@things-factory/shell'
+
 const PRIVILEGES_SEED = {
-  'modeller': [
+  modeller: [
     {
       name: 'mutation',
       category: 'setting'
@@ -104,7 +106,7 @@ const PRIVILEGES_SEED = {
       category: 'step'
     }
   ],
-  'system': [
+  system: [
     {
       name: 'mutation',
       category: 'system'
@@ -114,7 +116,7 @@ const PRIVILEGES_SEED = {
       category: 'system'
     }
   ],
-  'viewer':[
+  viewer: [
     {
       name: 'query',
       category: 'board'
@@ -144,51 +146,51 @@ const SEED = [
 export class SeedRole1610516350460 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {
     const repository = getRepository(Role)
-    const userRepository= getRepository(User)
+    const userRepository = getRepository(User)
 
-    let users:  User = await userRepository.find({ where: { userType:'admin' }, relations: ['domains'] })
-    let domain: Domain = await getRepository(Domain).findOne({
+    let users: User[] = await userRepository.find({ where: { userType: 'admin' }, relations: ['domains'] })
+    let domain: Domain = await getRepository(Domain).findOneBy({
       name: 'SYSTEM'
     })
-    
+
     var privilegeSeeds = []
     Promise.all(
       SEED.map(async role => {
-        var privileges= await this.getPrivileges(privilegeSeeds,role.name);
+        var privileges = await this.getPrivileges(privilegeSeeds, role.name)
         await repository.save({
           ...role,
-          'privileges':privileges,
+          privileges: privileges,
           users,
           domain
         })
       })
     )
-    await this.saveSystemRole(repository,users,domain);
+    await this.saveSystemRole(repository, users, domain)
   }
 
-  public async saveSystemRole(repository,users,domain){
-    const privilegeRepository= getRepository(Privilege)
-    var role =   {
+  public async saveSystemRole(repository, users, domain) {
+    const privilegeRepository = getRepository(Privilege)
+    var role = {
       name: 'system',
       description: 'System Admin'
     }
-    var privileges = await privilegeRepository.find();
+    var privileges = await privilegeRepository.find()
     await repository.save({
       ...role,
-      'privileges':privileges,
+      privileges: privileges,
       users,
       domain
     })
   }
 
-  public async getPrivileges(privilegeSeeds,roleName){
-    const privilegeRepository= getRepository(Privilege)
+  public async getPrivileges(privilegeSeeds, roleName) {
+    const privilegeRepository = getRepository(Privilege)
     privilegeSeeds = PRIVILEGES_SEED[roleName]
     var privileges = []
     await Promise.all(
       privilegeSeeds.map(async privilege => {
-        var value = await privilegeRepository.findOne({ where: { name: privilege.name, category: privilege.category }})
-        if(value){
+        var value = await privilegeRepository.findOne({ where: { name: privilege.name, category: privilege.category } })
+        if (value) {
           privileges.push(value)
         }
       })
@@ -199,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'
     })
 
@@ -208,7 +210,7 @@ export class SeedRole1610516350460 implements MigrationInterface {
         await repository.delete({ name: role.name, domain })
       })
     )
-    
+
     await repository.delete({ name: 'system', domain })
   }
 }

package/server/routes.ts

@@ -1,3 +1 @@
-const debug = require('debug')('things-factory:operato-board:routes')
-
 process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {})

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'
@@ -10,21 +10,19 @@ import { BoardSecret } from './board-secret'
 
 const crypto = require('crypto')
 
-const debug = require('debug')('things-factory:operato-board:board-resolver')
-
 @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,9 +1,8 @@
-import { Resolver, Mutation, Arg, Directive } from 'type-graphql'
-import { Repository, getRepository } from 'typeorm'
-import { Domain, DomainPatch } from '@things-factory/shell'
-import { slugger } from '@things-factory/utils'
+import { Arg, Directive, Mutation, Resolver } from 'type-graphql'
+import { Repository } from 'typeorm'
 
-const debug = require('debug')('things-factory:operato-board:domain-resolver')
+import { Domain, DomainPatch, getRepository } from '@things-factory/shell'
+import { slugger } from '@things-factory/utils'
 
 @Resolver(Domain)
 export class DomainResolver {
@@ -15,13 +14,11 @@ export class DomainResolver {
     const _createRecords = patches.filter((patch: any) => !patch.id)
     const _updateRecords = patches.filter((patch: any) => patch.id)
 
-    debug('update-domains')
-
     if (_createRecords.length > 0) {
       _createRecords.forEach(async createRecord => {
         const subdomain: string = slugger(createRecord.name)
 
-        await domainRepo.save({ ...createRecord, subdomain })
+        await domainRepo.save({ ...createRecord, subdomain } as any)
       })
     }
 
@@ -36,7 +33,7 @@ export class DomainResolver {
         await domainRepo.save({
           ...domain,
           ...updateRecord
-        })
+        } as any)
       })
     }
 

package/server/subscribers/domain-subscriber.ts

@@ -34,7 +34,7 @@ export class DomainSubscriber implements EntitySubscriberInterface<Domain> {
         var domain: Domain = event.entity
         var domainSecret: DomainSecret = new DomainSecret()
         domainSecret.id = uuidv4()
-        domainSecret.domain = domain.domain
+        domainSecret.domain = domain
         var hash = doSomething({ secId: domainSecret.id, id: domain.id })
         domainSecret.secret = hash