@things-factory/code-base 7.0.0-alpha.8 → 7.0.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@things-factory/code-base",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
-  "browser": "client/index.js",
+  "browser": "dist-client/index.js",
   "things-factory": true,
   "author": "",
   "description": "Server-side module for handling common code management.",
@@ -17,14 +17,19 @@
     "directory": "packages/code-base"
   },
   "scripts": {
-    "build": "tsc --p tsconfig.json",
-    "build:server": "npm run clean:server && tsc",
-    "clean:server": "rm -rf dist-server",
-    "clean": "npm run clean:server",
+    "build": "npm run build:server && npm run build:client",
+    "copy:files": "copyfiles -e \"./client/**/*.{ts,js,json}\" -u 1 \"./client/**/*\" dist-client",
+    "build:client": "npm run copy:files && npx tsc --p ./client/tsconfig.json",
+    "build:server": "npx tsc --p ./server/tsconfig.json",
+    "clean:client": "npx rimraf dist-client",
+    "clean:server": "npx rimraf dist-server",
+    "clean": "npm run clean:server && npm run clean:client",
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.0.0-alpha.8"
+    "@operato/graphql": "^7.0.0",
+    "@things-factory/auth-base": "^7.0.0",
+    "@things-factory/shell": "^7.0.0"
   },
-  "gitHead": "b4981ea2721e7eaf4dbd618b6c77316ebc000ee5"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

package/server/index.ts

@@ -1,2 +1 @@
-export * from './migrations'
 export * from './service'

package/server/service/common-code/common-code-query.ts

@@ -19,7 +19,10 @@ export class CommonCodeQuery {
   }
 
   @Query(returns => CommonCodeList, { description: 'To fetch multiple CommonCodes' })
-  async commonCodes(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<CommonCodeList> {
+  async commonCodes(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<CommonCodeList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -34,6 +37,7 @@ export class CommonCodeQuery {
     return { items, total }
   }
 
+  /* TODO move to operato-wms module */
   @Query(returns => CommonCode, { description: "To fetch specific domain's CommonCodes by given name" })
   async partnerCommonCode(
     @Arg('name') name: string,

package/server/service/common-code/common-code.ts

@@ -18,7 +18,7 @@ import { CommonCodeDetail } from '../common-code-detail/common-code-detail'
 
 @Entity()
 @Index('ix_common_code_0', (commonCode: CommonCode) => [commonCode.domain, commonCode.name], { unique: true })
-@Index('ix_common_code_1', (commonCode: CommonCode) => [commonCode.domain])
+@Index('ix_common_code_1', (commonCode: CommonCode) => [commonCode.domain]) /* TOBE-REMOVED */
 @ObjectType({ description: 'Entity for CommonCode' })
 export class CommonCode {
   @PrimaryGeneratedColumn('uuid')
@@ -26,7 +26,7 @@ export class CommonCode {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((commonCode: CommonCode) => commonCode.domain)
@@ -56,7 +56,7 @@ export class CommonCode {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((commonCode: CommonCode) => commonCode.creator)
@@ -65,7 +65,7 @@ export class CommonCode {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((commonCode: CommonCode) => commonCode.updater)

package/server/service/common-code-detail/common-code-detail-query.ts

@@ -19,7 +19,10 @@ export class CommonCodeDetailQuery {
   }
 
   @Query(returns => CommonCodeDetailList, { description: 'To fetch multiple CommonCodeDetails' })
-  async commonCodeDetails(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<CommonCodeDetailList> {
+  async commonCodeDetails(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<CommonCodeDetailList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -35,11 +38,19 @@ export class CommonCodeDetailQuery {
     return { items, total }
   }
 
-  @FieldResolver(type => CommonCode)
+  @FieldResolver(type => String)
   async commonCode(commonCodeDetail): Promise<CommonCode> {
     return await getRepository(CommonCode).findOneBy({ id: commonCodeDetail.commonCodeId })
   }
 
+  @FieldResolver(type => Domain)
+  async description(@Root() commonCodeDetail: CommonCodeDetail, @Ctx() context: ResolverContext): Promise<String> {
+    const { lng } = context.state
+    const { labels, description } = commonCodeDetail
+
+    return (lng && labels && labels[lng]) || description
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() commonCodeDetail: CommonCodeDetail): Promise<Domain> {
     return await getRepository(Domain).findOneBy({ id: commonCodeDetail.domainId })

package/server/service/common-code-detail/common-code-detail-type.ts

@@ -1,6 +1,6 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
-import { ObjectRef } from '@things-factory/shell'
+import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
 import { CommonCodeDetail } from './common-code-detail'
 
@@ -12,6 +12,9 @@ export class NewCommonCodeDetail {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ScalarObject, { nullable: true })
+  labels?: any // { [lng: string]: string }
+
   @Field(type => ObjectRef!)
   commonCode: ObjectRef
 
@@ -30,6 +33,9 @@ export class CommonCodeDetailPatch {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ScalarObject, { nullable: true })
+  labels?: any // { [lng: string]: string }
+
   @Field(type => ObjectRef!)
   commonCode: ObjectRef
 

package/server/service/common-code-detail/common-code-detail.ts

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import { Field, ID, InputType, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { CommonCode } from '../common-code/common-code'
 
@@ -33,7 +33,7 @@ export class CommonCodeDetail {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((commonCodeDetail: CommonCodeDetail) => commonCodeDetail.domain)
@@ -50,12 +50,14 @@ export class CommonCodeDetail {
   @Field()
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  labels?: any // { [lng: string]: string }
+
   @Column()
   @Field({ nullable: true })
   rank: number
@@ -68,19 +70,15 @@ export class CommonCodeDetail {
   @Field({ nullable: true })
   updatedAt?: Date
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  @Field({ nullable: true })
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((commonCodeDetail: CommonCodeDetail) => commonCodeDetail.creator)
   creatorId?: string
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  @Field({ nullable: true })
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((commonCodeDetail: CommonCodeDetail) => commonCodeDetail.updater)

package/dist-server/migrations/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrations = void 0;
-const glob = require('glob');
-const path = require('path');
-exports.migrations = [];
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function (file) {
-    if (file.indexOf('index.js') !== -1)
-        return;
-    exports.migrations = exports.migrations.concat(Object.values(require(path.resolve(file))) || []);
-});
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/migrations/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,QAAA,UAAU,GAAG,EAAE,CAAA;AAE1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,IAAI;IACzE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAAE,OAAM;IAC3C,kBAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA","sourcesContent":["const glob = require('glob')\nconst path = require('path')\n\nexport var migrations = []\n\nglob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {\n  if (file.indexOf('index.js') !== -1) return\n  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])\n})\n"]}

package/server/migrations/index.ts

@@ -1,9 +0,0 @@
-const glob = require('glob')
-const path = require('path')
-
-export var migrations = []
-
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {
-  if (file.indexOf('index.js') !== -1) return
-  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])
-})