@things-factory/resource-base 7.0.0-alpha.9 → 7.0.0

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@things-factory/resource-base",
-  "version": "7.0.0-alpha.9",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
-  "browser": "client/index.js",
   "things-factory": true,
   "author": "",
   "description": "Module to manage searching resource in application.",
@@ -24,7 +23,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.0.0-alpha.9"
+    "@things-factory/auth-base": "^7.0.0"
   },
-  "gitHead": "99fc5aead211b3c82e3ebbf76e8d5d1db01b1ddc"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

package/server/index.ts

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

package/server/service/entity/entity-mutation.ts

@@ -1,7 +1,5 @@
-import { DEL_STRATEGY } from '../../constants/del-strategy-type'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
-import { EntityColumn } from '../entity-column/entity-column'
 
 import { Entity } from './entity'
 import { EntityPatch, NewEntity } from './entity-type'
@@ -29,11 +27,7 @@ export class EntityMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Entity, { description: "To modify Entity' information" })
-  async updateEntity(
-    @Arg('id', type => String) id: string,
-    @Arg('patch', type => EntityPatch) patch: EntityPatch,
-    @Ctx() context: ResolverContext
-  ): Promise<Entity> {
+  async updateEntity(@Arg('id', type => String) id: string, @Arg('patch', type => EntityPatch) patch: EntityPatch, @Ctx() context: ResolverContext): Promise<Entity> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(Entity)
@@ -59,10 +53,7 @@ export class EntityMutation {
 
   @Directive('@transaction')
   @Mutation(returns => [Entity], { description: "To modify multiple Entitys' information" })
-  async updateMultipleEntity(
-    @Arg('patches', type => [EntityPatch]) patches: EntityPatch[],
-    @Ctx() context: ResolverContext
-  ): Promise<Entity[]> {
+  async updateMultipleEntity(@Arg('patches', type => [EntityPatch]) patches: EntityPatch[], @Ctx() context: ResolverContext): Promise<Entity[]> {
     const { domain, user, tx } = context.state
 
     let results = []
@@ -75,9 +66,7 @@ export class EntityMutation {
         const newRecord = _createRecords[i]
 
         if (newRecord.master) {
-          newRecord.master = (await tx
-            .getRepository(Entity)
-            .findOne({ where: { domain: { id: domain.id }, id: newRecord.master } })) as any
+          newRecord.master = (await tx.getRepository(Entity).findOne({ where: { domain: { id: domain.id }, id: newRecord.master } })) as any
         }
 
         if (newRecord.children && newRecord.children.length) {
@@ -101,9 +90,7 @@ export class EntityMutation {
         const entity = await entityRepo.findOneBy({ id: updateRecord.id })
 
         if (updateRecord.master) {
-          updateRecord.master = (await tx
-            .getRepository(Entity)
-            .findOne({ where: { domain: { id: domain.id }, id: updateRecord.master } })) as any
+          updateRecord.master = (await tx.getRepository(Entity).findOne({ where: { domain: { id: domain.id }, id: updateRecord.master } })) as any
         }
 
         if (updateRecord.children && updateRecord.children.length) {

package/server/service/entity/entity-query.ts

@@ -19,7 +19,7 @@ export class EntityQuery {
   }
 
   @Query(returns => EntityList, { description: 'To fetch multiple Entities' })
-  async entities(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<EntityList> {
+  async entities(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<EntityList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/entity/entity.ts

@@ -28,7 +28,7 @@ export class Entity {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((entity: Entity) => entity.domain)
@@ -151,7 +151,7 @@ export class Entity {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((entity: Entity) => entity.creator)
@@ -160,7 +160,7 @@ export class Entity {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((entity: Entity) => entity.updater)

package/server/service/entity-column/entity-column-query.ts

@@ -19,7 +19,10 @@ export class EntityColumnQuery {
   }
 
   @Query(returns => EntityColumnList, { description: 'To fetch multiple EntityColumns' })
-  async entityColumns(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<EntityColumnList> {
+  async entityColumns(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<EntityColumnList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/entity-column/entity-column.ts

@@ -27,7 +27,7 @@ export class EntityColumn {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((entityColumn: EntityColumn) => entityColumn.domain)
@@ -249,7 +249,7 @@ export class EntityColumn {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((entityColumn: EntityColumn) => entityColumn.creator)
@@ -258,7 +258,7 @@ export class EntityColumn {
   @ManyToOne(type => User, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((entityColumn: EntityColumn) => entityColumn.updater)

package/things-factory.config.js

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

package/client/bootstrap.js

@@ -1,4 +0,0 @@
-import { store } from '@things-factory/shell'
-
-export default function bootstrap() {
-}

package/client/index.js

@@ -1,2 +0,0 @@
-export * from './mixin/resource-parser'
-export * from './menu-meta'

package/client/menu-meta.js

@@ -1,77 +0,0 @@
-import gql from 'graphql-tag'
-import { client } from '@things-factory/shell'
-import { gqlBuilder } from '@things-factory/utils'
-
-export async function getColumns(tableName) {
-  const response = await client.query({
-    query: gql`
-        query {
-            menu (${gqlBuilder.buildArgs({
-              name: tableName
-            })}) {
-                id
-                name
-                description
-                category
-                menuType
-                rank
-                routing
-                routingType
-                resourceType
-                resourceUrl
-                resourceName
-                idField
-                titleField
-                gridSaveUrl
-                pagination
-                detailFormId
-                detailLayout
-                template
-                hiddenFlag
-                itemsProp
-                totalProp
-                fixedColumns
-                iconPath
-                columns {
-                    id
-                    name
-                    description
-                    rank
-                    term
-                    colType
-                    colSize
-                    nullable
-                    refType
-                    refName
-                    refUrl
-                    refParams
-                    refRelated
-                    searchRank
-                    sortRank
-                    reverseSort
-                    virtualField
-                    extField
-                    searchName
-                    searchEditor
-                    searchOper
-                    searchInitVal
-                    gridRank
-                    gridEditor
-                    gridFormat
-                    gridValidator
-                    gridWidth
-                    gridAlign
-                    uniqRank
-                    formEditor
-                    formValidator
-                    formFormat
-                    defVal
-                    rangeVal
-                    ignoreOnSave
-                }
-            }
-        }
-    `
-  })
-  return response.data
-}

package/client/mixin/resource-parser.js

@@ -1,178 +0,0 @@
-export const resourceParser = baseElement =>
-  class extends baseElement {
-
-  _parseButtons(buttonList) {
-    if (buttonList) {
-      buttonList.forEach(function(button) {
-        button.id = button.text + '-btn'
-      })
-    }
-
-    return buttonList
-  }
-
-  _parseSearchFormFields(metaDataList) {
-    const searchMetaList = metaDataList.filter(metaData => {
-      return metaData.search_rank && metaData.search_rank > 0
-    })
-
-    this._sortMetaData(searchMetaList, 'search_rank')
-
-    return searchMetaList.map(metaData => {
-      const field = {
-        name: metaData.name,
-        label: metaData.term,
-        type: metaData.search_editor,
-        op: metaData.search_oper || 'eq'
-      }
-
-      metaData.search_editor = metaData.search_editor || 'text'
-      metaData.search_editor = this._parseSearchFormField(field, metaData)
-      field.default = metaData.search_init_val || null
-
-      return field
-    })
-  }
-
-  _sortMetaData(list, sortField) {
-    list.sort((a, b) => {
-      return a[sortField] > b[sortField] ? 1 : b[sortField] > a[sortField] ? -1 : 0
-    })
-  }
-
-  _parseSearchFormField(field, metaData) {
-    const editor = metaData.search_editor
-
-    if ('code-combo' == editor) {
-      field.codeName = metaData.ref_name
-    } else if (
-      editor.indexOf('resource-selector') >= 0 ||
-      editor.indexOf('resource-format-selector') >= 0 ||
-      editor.indexOf('resource-field') >= 0 ||
-      editor.indexOf('resource-combo') >= 0 ||
-      editor.indexOf('resource-code') >= 0
-    ) {
-      field.userData = {
-        resourceType: metaData.ref_type,
-        resourceName: metaData.ref_name,
-        initialParams: metaData.ref_params,
-        bindFields: metaData.ref_related,
-        submitName: field.name
-      }
-
-      if (editor.indexOf('.') > 0) {
-        var editorSplitArr = editor.split('.')
-        field.type = editorSplitArr[0]
-        field.userData.delegateColumn = editorSplitArr[1]
-      } else {
-        field.type = editor
-      }
-
-      if (field.type == 'resource-combo') {
-        field.userData.delegateColumn = metaData.search_name ? metaData.search_name : 'id'
-      }
-
-      if (field.type == 'resource-format-selector') {
-        field.userData.delegateColumn = metaData.search_name ? metaData.search_name : 'name'
-      }
-    } else if (editor == 'reference-query') {
-      var refName = field.name.indexOf('_id') > 0 ? field.name.substr(0, field.name.indexOf('_id')) : field.name
-      field.userData = {
-        type: metaData.col_type,
-        refName: refName,
-        fieldName: metaData.search_name,
-        searchName: refName + '.' + metaData.search_name
-      }
-    } else if (editor == 'number') {
-      field.userData = { type: metaData.col_type }
-      this._parseSearchValueRange(field, metaData.range_val, 'number')
-    } else if ('date-from-to-picker' == editor || 'ranged-date-picker' == editor) {
-      field.userData = { defaultRange: metaData.def_val, format: metaData.search_name }
-      this._parseSearchValueRange(field, metaData.search_init_val, 'date')
-    } else if ('date-picker' == editor) {
-      if (metaData.search_name || metaData.search_init_val) {
-        field.userData = {}
-        if (metaData.search_name) field.userData.format = metaData.search_name
-        if (metaData.search_init_val) field.userData.defValue = this._calcDate(metaData.search_init_val)
-      }
-    } else if ('time-picker' == editor || 'datetime-picker' == editor || 'ranged-datetime-picker' == editor) {
-      if (metaData.search_name) {
-        field.userData = { format: metaData.search_name }
-      }
-
-      if ('ranged-datetime-picker' == editor && metaData.search_init_val) {
-        this._parseDatetimeInitValue(field, metaData.search_init_val)
-      }
-    }
-  }
-
-  _parseGridModel(metaDataList) {
-    var gridModelMetaList = metaDataList.filter(function(metaData) {
-      if (metaData.name == 'id' && !metaData.grid_rank) metaData.grid_rank = -10
-      return metaData.grid_rank && metaData.grid_rank != 0
-    })
-
-    var selectColumns = ''
-
-    var gridModel = gridModelMetaList.map(function(metaData) {
-      var field = { fieldName: metaData.name }
-
-      if (
-        metaData.col_type == 'integer' ||
-        metaData.col_type == 'int' ||
-        metaData.col_type == 'long' ||
-        metaData.col_type == 'double' ||
-        metaData.col_type == 'float'
-      ) {
-        field.dataType = 'number'
-      } else if (metaData.col_type == 'date' || metaData.col_type == 'time') {
-        field.dataType = 'datetime'
-        field.datetimeFormat = metaData.grid_format ? metaData.grid_format : 'yyyy-MM-dd'
-      }
-
-      var editor = metaData.grid_editor
-
-      if (editor == 'rank') {
-        field.rank = true
-        field.increment = metaData.grid_format ? Number(metaData.grid_format) : 1
-      }
-
-      if (editor && editor.indexOf('resource-column') >= 0) {
-        field.fieldName = field.fieldName.substr(0, field.fieldName.indexOf('_id'))
-        field.dataType = 'object'
-      }
-
-      if (editor && editor.indexOf('resource-selector') >= 0) {
-        field.fieldName = field.fieldName.substr(0, field.fieldName.indexOf('_id'))
-        field.dataType = 'object'
-      }
-
-      if (editor && editor.indexOf('resource-format-selector') >= 0) {
-        if (field.fieldName.indexOf('_id') >= 0) {
-          field.fieldName = field.fieldName.substr(0, field.fieldName.indexOf('_id'))
-        }
-      }
-
-      if (editor && editor.indexOf('file-selector') >= 0) {
-        field.fieldName = field.fieldName.substr(0, field.fieldName.indexOf('_id'))
-        field.dataType = 'object'
-      }
-
-      if (field.dataType != 'object' && metaData.def_val) {
-        field.defaultValue = field.dataType == 'number' ? Number(metaData.def_val) : metaData.def_val
-      }
-
-      if (!metaData.virtual_field || metaData.virtual_field == false) {
-        selectColumns += field.fieldName + ','
-      }
-
-      return field
-    })
-
-    if (selectColumns.length > 2) {
-      this.selectFields = selectColumns.substr(0, selectColumns.length - 1)
-    }
-
-    return gridModel
-  }
-}

package/dist-server/constants/del-strategy-type.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEL_STRATEGY = void 0;
-exports.DEL_STRATEGY = {
-    DELETE: 'delete',
-    DESTROY: 'destroy',
-    NULLIFY: 'nullify',
-    RESTRICT_WITH_ERROR: 'restrict with error'
-};
-//# sourceMappingURL=del-strategy-type.js.map

package/dist-server/constants/del-strategy-type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"del-strategy-type.js","sourceRoot":"","sources":["../../server/constants/del-strategy-type.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,mBAAmB,EAAE,qBAAqB;CAC3C,CAAA","sourcesContent":["export const DEL_STRATEGY = {\n  DELETE: 'delete',\n  DESTROY: 'destroy',\n  NULLIFY: 'nullify',\n  RESTRICT_WITH_ERROR: 'restrict with error'\n}\n"]}

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/constants/del-strategy-type.ts

@@ -1,6 +0,0 @@
-export const DEL_STRATEGY = {
-  DELETE: 'delete',
-  DESTROY: 'destroy',
-  NULLIFY: 'nullify',
-  RESTRICT_WITH_ERROR: 'restrict with error'
-}

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))) || [])
-})