@things-factory/tutorial-base 5.0.11 → 6.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/tutorial-base",
-  "version": "5.0.11",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,8 +24,8 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/shell": "^5.0.11"
+    "@things-factory/auth-base": "^6.0.0-alpha.3",
+    "@things-factory/shell": "^6.0.0-alpha.3"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/graphql/resolvers/tutorial/delete-tutorials.ts

@@ -1,12 +1,12 @@
-import { Domain } from '@things-factory/shell'
-import { EntityManager, In } from 'typeorm'
+import { In } from 'typeorm'
+
 import { Tutorial } from '../../../entities'
 
 export const deleteTutorials = {
-  async deleteTutorials(_: any, { ids }, context: any) {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+  async deleteTutorials(_: any, { ids }, context: ResolverContext) {
+    const { tx, domain } = context.state
     await tx.getRepository(Tutorial).delete({
-      domain,
+      domain: { id: domain.id },
       id: In(ids)
     })
     return true

package/server/graphql/resolvers/tutorial/tutorial.ts

@@ -1,13 +1,14 @@
-import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { Tutorial } from '../../../entities'
 
 export const tutorialResolver = {
-  async tutorial(_: any, { name }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async tutorial(_: any, { name }, context: ResolverContext) {
+    const { domain } = context.state
 
     return await getRepository(Tutorial).findOne({
-      where: { domain, name, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: { id: domain.id }, name },
+      relations: ['domain', 'creator', 'updater']
     })
   }
 }

package/server/graphql/resolvers/tutorial/tutorials.ts

@@ -1,10 +1,12 @@
+import { SelectQueryBuilder } from 'typeorm'
+
 import { Role } from '@things-factory/auth-base'
-import { convertListParams, ListParam } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
+
 import { Tutorial, TutorialRole } from '../../../entities'
 
 export const tutorialsResolver = {
-  async tutorials(_: any, params: ListParam, context: any) {
+  async tutorials(_: any, params: ListParam, context: ResolverContext) {
     const convertedParams = convertListParams(params)
     const [items, total] = await getRepository(Tutorial).findAndCount({
       ...convertedParams,
@@ -13,7 +15,7 @@ export const tutorialsResolver = {
     return { items, total }
   },
 
-  async tutorialsWithRoles(_: any, { roleNames }, context: any) {
+  async tutorialsWithRoles(_: any, { roleNames }, context: ResolverContext) {
     let filter: string[] = roleNames.split(',')
     const qb: SelectQueryBuilder<Tutorial> = getRepository(Tutorial)
       .createQueryBuilder('tutorial')

package/server/graphql/resolvers/tutorial/update-multiple-tutorial.ts

@@ -1,11 +1,8 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
 import { Tutorial } from '../../../entities'
 
 export const updateMultipleTutorial = {
-  async updateMultipleTutorial(_: any, { patches }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async updateMultipleTutorial(_: any, { patches }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
 
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -30,7 +27,7 @@ export const updateMultipleTutorial = {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const tutorial = await tutorialRepo.findOne(newRecord.id)
+        const tutorial = await tutorialRepo.findOneBy({ id: newRecord.id })
 
         const result = await tutorialRepo.save({
           ...tutorial,

package/server/graphql/resolvers/tutorial-role/list-by-roles.ts

@@ -1,10 +1,12 @@
+import { SelectQueryBuilder } from 'typeorm'
+
 import { Role } from '@things-factory/auth-base'
-import { ListParam } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { getRepository, ListParam } from '@things-factory/shell'
+
 import { TutorialRole } from '../../../entities'
 
 export const listByRolesResolver = {
-  async listByRoles(_: any, params: ListParam, context: any) {
+  async listByRoles(_: any, params: ListParam, context: ResolverContext) {
     const qb: SelectQueryBuilder<TutorialRole> = getRepository(TutorialRole)
       .createQueryBuilder('tr')
       .select('tr.role_id', 'id')

package/server/graphql/resolvers/tutorial-role/tutorial-role-assignments.ts

@@ -1,9 +1,10 @@
 import { Role } from '@things-factory/auth-base'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { TutorialRole } from '../../../entities'
 
 export const tutorialRoleAssignmentsResolver = {
-  async tutorialRoleAssignments(_: any, { tutorialId }, context: any) {
+  async tutorialRoleAssignments(_: any, { tutorialId }, context: ResolverContext) {
     const tutorialRole = await getRepository(TutorialRole).find({
       where: {
         tutorial: tutorialId

package/server/graphql/resolvers/tutorial-role/tutorial-role.ts

@@ -1,13 +1,14 @@
-import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { TutorialRole } from '../../../entities'
 
 export const tutorialRoleResolver = {
-  async tutorialRole(_: any, { name }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async tutorialRole(_: any, { name }, context: ResolverContext) {
+    const { domain } = context.state
 
     return await getRepository(TutorialRole).findOne({
-      where: { domain, name, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: { id: domain.id }, name },
+      relations: ['domain', 'creator', 'updater']
     })
   }
 }

package/server/graphql/resolvers/tutorial-role/tutorial-roles.ts

@@ -1,9 +1,9 @@
-import { convertListParams, ListParam } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
+
 import { TutorialRole } from '../../../entities'
 
 export const tutorialRolesResolver = {
-  async tutorialRoles(_: any, params: ListParam, context: any) {
+  async tutorialRoles(_: any, params: ListParam, context: ResolverContext) {
     const convertedParams = convertListParams(params)
     const [items, total] = await getRepository(TutorialRole).findAndCount({
       ...convertedParams,

package/server/graphql/resolvers/tutorial-role/update-role-tutorial.ts

@@ -1,15 +1,13 @@
-import { EntityManager } from 'typeorm'
-
 import { Role } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+
 import { Tutorial, TutorialRole } from '../../../entities'
 
 const crypto = require('crypto')
 
 export const updateRoleTutorial = {
-  async updateRoleTutorial(_: any, { tutorialId, tutorialRoles }, context: any) {
+  async updateRoleTutorial(_: any, { tutorialId, tutorialRoles }, context: ResolverContext) {
     try {
-      const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+      const { tx, domain } = context.state
 
       const tutorial: Tutorial = await tx.getRepository(Tutorial).findOne({
         where: { id: tutorialId }
@@ -17,7 +15,7 @@ export const updateRoleTutorial = {
       if (!tutorial) throw new Error('Tutorial not exist')
 
       // 1. Delete every tutorial roles related with current tutorial.
-      await tx.getRepository(TutorialRole).delete({ tutorial })
+      await tx.getRepository(TutorialRole).delete({ id: tutorial.id })
 
       // 2. Append new role into tutorial roles.
       tutorialRoles.forEach(async (tutorialRole: TutorialRole) => {
@@ -25,12 +23,14 @@ export const updateRoleTutorial = {
           name: crypto.randomUUID(),
           domain,
           tutorial: tutorialId,
-          role: await tx.getRepository(Role).findOne(tutorialRole.role.id)
+          role: await tx.getRepository(Role).findOneBy({ id: tutorialRole.role.id })
         })
       })
 
       const tutorials = await tx.getRepository(Tutorial).find()
-      const rolesTutorial = await tx.getRepository(TutorialRole).find({ where: { tutorial }, relations: ['tutorial'] })
+      const rolesTutorial = await tx
+        .getRepository(TutorialRole)
+        .find({ where: { id: tutorial.id }, relations: ['tutorial'] })
       return tutorials.map((tutorial: Tutorial) => {
         return {
           name: tutorial.name,

package/server/index.ts

@@ -1,6 +1,3 @@
 export * from './entities'
 export * from './migrations'
 export * from './graphql'
-export * from './middlewares'
-
-import './routes'

package/things-factory.config.js

@@ -1,5 +1 @@
-import bootstrap from './client/bootstrap'
-
-export default {
-  bootstrap
-}
+export default {}

package/client/actions/main.js

@@ -1 +0,0 @@
-export const UPDATE_TUTORIAL = 'UPDATE_TUTORIAL'

package/client/bootstrap.js

@@ -1,8 +0,0 @@
-import { store } from '@things-factory/shell'
-import tutorial from './reducers/main'
-
-export default function bootstrap() {
-  store.addReducers({
-    tutorial
-  })
-}

package/client/index.js

@@ -1 +0,0 @@
-export * from './actions/main'

package/client/reducers/main.js

@@ -1,17 +0,0 @@
-import { UPDATE_TUTORIAL } from '../actions/main'
-
-const INITIAL_STATE = {
-  tutorial: 'ABC'
-}
-
-const tutorial = (state = INITIAL_STATE, action) => {
-  switch (action.type) {
-    case UPDATE_TUTORIAL:
-      return { ...state }
-
-    default:
-      return state
-  }
-}
-
-export default tutorial

package/dist-server/controllers/index.js

@@ -1 +0,0 @@
-//# sourceMappingURL=index.js.map

package/dist-server/controllers/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":"","sourcesContent":[""]}

package/dist-server/middlewares/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initMiddlewares = void 0;
-function initMiddlewares(app) {
-    /* can add middlewares into app */
-}
-exports.initMiddlewares = initMiddlewares;
-//# sourceMappingURL=index.js.map

package/dist-server/middlewares/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,GAAG;IACjC,kCAAkC;AACpC,CAAC;AAFD,0CAEC","sourcesContent":["export function initMiddlewares(app) {\n  /* can add middlewares into app */\n}\n"]}

package/server/middlewares/index.ts

@@ -1,3 +0,0 @@
-export function initMiddlewares(app) {
-  /* can add middlewares into app */
-}