@things-factory/shell 6.0.0-alpha.8 → 6.0.0-zeta.1

package/dist-server/utils/get-query-builder-from-list-params.js

@@ -73,7 +73,7 @@ exports.getQueryBuilderFromListParams = getQueryBuilderFromListParams;
 function addCondition(metadata, selectQueryBuilder, whereExpressionBuilder, filter, filtersMap = {}, andCondition) {
     const { name, operator, value } = filter;
     const values = value instanceof Array ? value : [value];
-    const entityAlias = selectQueryBuilder.alias;
+    var entityAlias = selectQueryBuilder.alias;
     var { relationColumn, columnName } = filtersMap[name] || {};
     /*
       1. relationColumn과 columnName이 지정된 경우
@@ -84,13 +84,32 @@ function addCondition(metadata, selectQueryBuilder, whereExpressionBuilder, filt
       - 이 경우는 columnName 만 적용한다.
     */
     if (relationColumn) {
-        var relationColumnMeta = metadata.columns.find(column => column.propertyName === relationColumn);
-        if (!relationColumnMeta) {
-            console.warn(`relationColumn "${relationColumn}" in filtersMap for "${name}" is not a relation column`);
-            return;
+        const columns = relationColumn.split('.');
+        var entityMetadata;
+        var relation;
+        for (const rcolumn of columns) {
+            if (relation) {
+                const { propertyName } = relationColumnMeta;
+                const property = `${entityAlias}.${propertyName}`;
+                entityAlias = `${entityMetadata.tableName}-${entityMetadata.tableName}`;
+                if (andCondition) {
+                    selectQueryBuilder.innerJoin(property, entityAlias);
+                }
+                else {
+                    selectQueryBuilder.leftJoin(property, entityAlias);
+                }
+            }
+            else {
+                entityMetadata = metadata;
+            }
+            var relationColumnMeta = entityMetadata.columns.find(column => column.propertyName === rcolumn);
+            if (!relationColumnMeta) {
+                console.warn(`relationColumn "${relationColumn}" in filtersMap for "${name}" is not a relation column`);
+                return;
+            }
+            relation = relationColumnMeta.relationMetadata;
+            entityMetadata = relation.inverseEntityMetadata;
         }
-        var relation = relationColumnMeta.relationMetadata;
-        var entityMetadata = relation.inverseEntityMetadata;
         var columnMeta = entityMetadata.columns.find(column => column.propertyName === (columnName || 'name'));
         if (!columnMeta) {
             console.warn(`columnName "${columnName}" in filtersMap for "${name}" is not a column`);

package/dist-server/utils/get-query-builder-from-list-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-query-builder-from-list-params.js","sourceRoot":"","sources":["../../server/utils/get-query-builder-from-list-params.ts"],"names":[],"mappings":"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","sourcesContent":["import { Brackets, EntityMetadata, Repository, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm'\n\nimport { Filter, ListParam } from '../service/common-types/list-param'\nimport { Domain } from '../service/domain/domain'\n\n/**\n *\n * @param options\n * @returns\n */\nexport function getQueryBuilderFromListParams<Type>(options: {\n  repository: Repository<Type>\n  params: ListParam\n  domain?: Domain\n  alias?: string\n  searchables?: string[]\n  filtersMap?: { [name: string]: { columnName: string; relationColumn?: string } }\n}): SelectQueryBuilder<Type> {\n  var { repository, params, domain, alias, searchables, filtersMap = {} } = options\n\n  const selectQueryBuilder = repository.createQueryBuilder(alias)\n  const entityAlias = selectQueryBuilder.alias\n\n  const columnFilters =\n    params.filters?.filter(filter => {\n      if (filter.operator === 'search') {\n        return false\n      }\n      if (filter.operator.toLowerCase().includes('like') && (!searchables || !searchables.includes(filter.name))) {\n        console.warn(\n          '\"searchables\" setting is required for like searches with a heavy database query load',\n          filter.name\n        )\n        return false\n      }\n      return true\n    }) || []\n  const searchFilters =\n    searchables instanceof Array\n      ? params.filters?.filter(filter => {\n          if (filter.operator !== 'search') {\n            return false\n          }\n          if (!searchables.includes(filter.name)) {\n            console.warn(\n              '\"searchables\" setting is required for like searches with a heavy database query load',\n              filter.name\n            )\n            return false\n          }\n          return true\n        }) || []\n      : []\n  const pagination = params.pagination\n  const sortings = params.sortings\n\n  const metadata = repository.metadata\n\n  if (columnFilters && columnFilters.length > 0) {\n    columnFilters.forEach(filter => {\n      addCondition(metadata, selectQueryBuilder, selectQueryBuilder, filter, filtersMap, true)\n    })\n  }\n\n  if (searchFilters.length > 0) {\n    selectQueryBuilder.andWhere(\n      new Brackets(qb => {\n        searchFilters.forEach(filter => {\n          addCondition(metadata, selectQueryBuilder, qb, filter, filtersMap, false)\n        })\n      })\n    )\n  }\n\n  if (domain) {\n    selectQueryBuilder.andWhere(`${entityAlias}.domain = :domain`, { domain: domain.id })\n  }\n\n  if (pagination && pagination.page > 0 && pagination.limit > 0) {\n    selectQueryBuilder.skip(pagination.limit * (pagination.page - 1))\n    selectQueryBuilder.take(pagination.limit)\n  }\n\n  if (sortings && sortings.length > 0) {\n    sortings.forEach((sorting, index) => {\n      const sortField = sorting.name.split('.').length > 1 ? sorting.name : `${entityAlias}.${sorting.name}`\n      if (index === 0) {\n        selectQueryBuilder.orderBy(sortField, sorting.desc ? 'DESC' : 'ASC')\n      } else {\n        selectQueryBuilder.addOrderBy(sortField, sorting.desc ? 'DESC' : 'ASC')\n      }\n    })\n  }\n\n  return selectQueryBuilder\n}\n\nfunction addCondition<T>(\n  metadata: EntityMetadata,\n  selectQueryBuilder: SelectQueryBuilder<T>,\n  whereExpressionBuilder: WhereExpressionBuilder,\n  filter: Filter,\n  filtersMap: { [name: string]: { columnName: string; relationColumn?: string } } = {},\n  andCondition: boolean\n): void {\n  const { name, operator, value } = filter\n  const values = value instanceof Array ? value : [value]\n  const entityAlias = selectQueryBuilder.alias\n\n  var { relationColumn, columnName } = filtersMap[name] || {}\n  /*\n    1. relationColumn과 columnName이 지정된 경우 \n    - relation inverse 테이블에서, columnName을 찾는다.\n    2. relationColumn만 지정된 경우는 없어야 한다.\n    - 이 경우 columnName 은 'name' 이라고 판단한다.\n    3. columnName이 지정된 경우.\n    - 이 경우는 columnName 만 적용한다.\n  */\n  if (relationColumn) {\n    var relationColumnMeta = metadata.columns.find(column => column.propertyName === relationColumn)\n    if (!relationColumnMeta) {\n      console.warn(`relationColumn \"${relationColumn}\" in filtersMap for \"${name}\" is not a relation column`)\n      return\n    }\n\n    var relation = relationColumnMeta.relationMetadata\n    var entityMetadata = relation.inverseEntityMetadata\n    var columnMeta = entityMetadata.columns.find(column => column.propertyName === (columnName || 'name'))\n    if (!columnMeta) {\n      console.warn(`columnName \"${columnName}\" in filtersMap for \"${name}\" is not a column`)\n      return\n    }\n  } else {\n    var columnMeta = metadata.columns.find(column => column.propertyName === (columnName || name))\n    if (!columnMeta) {\n      /* relationId 에 대한 필터링은 해당 컬럼값 자체의 비교로 한다. */\n      var relationIdMeta = metadata.relationIds.find(relationId => relationId.propertyName === (columnName || name))\n      if (relationIdMeta) {\n        columnMeta = relationIdMeta.relation.joinColumns[0]\n      } else {\n        columnName\n          ? console.warn(`columnName \"${columnName}\" in filtersMap for \"${name}\" is not a column`)\n          : console.warn(`name \"${name}\" is not a column`)\n      }\n    } else {\n      var relation = columnMeta.relationMetadata\n    }\n\n    if (relation) {\n      /* filterMap에 의해서 relationColumn 이 지정되지 않았더라도, name 또는 columnName의 column이 relation인 경우에는\n        - 조건절 구성을 위한 타겟필드명은 'name' 으로만 한정된다.\n      */\n      var relationColumnMeta = columnMeta\n      var entityMetadata = relation.inverseEntityMetadata\n      columnMeta = entityMetadata.columns.find(column => column.propertyName === 'name')\n      if (!columnMeta) {\n        console.warn(`relation column \"${columnName || name}\" does not have \"name\" column`)\n        return\n      }\n    }\n  }\n\n  const dbNameForColumn = columnMeta.databaseName\n  const alias = relationColumnMeta ? `${name}-filter` : entityAlias\n\n  /* relation columne인 경우 name을 alias로 사용한다. */\n  const field = `${alias}.${dbNameForColumn}`\n\n  var clause = ''\n  var parameters = {}\n\n  switch (operator) {\n    case 'eq':\n      clause = `${field} = :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'like':\n      clause = `${field} LIKE :${name}`\n      parameters = { [name]: `%${value}%` }\n      break\n\n    case 'search':\n    case 'i_like':\n      clause = `LOWER(${field}) LIKE :${name}`\n      parameters = { [name]: `%${String(value).toLowerCase()}%` }\n      break\n\n    case 'nlike':\n      clause = `${field} NOT LIKE :${name}`\n      parameters = { [name]: `%${value}%` }\n      break\n\n    case 'i_nlike':\n      clause = `LOWER(${field}) NOT LIKE :${name}`\n      parameters = { [name]: `%${String(value).toLowerCase()}%` }\n      break\n\n    case 'lt':\n      clause = `${field} < :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'gt':\n      clause = `${field} > :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'lte':\n      clause = `${field} <= :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'gte':\n      clause = `${field} >= :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'noteq':\n      clause = `${field} != :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'in':\n      clause = `${field} IN (:...${name})`\n      parameters = { [name]: values }\n      break\n\n    case 'notin':\n      clause = `${field} NOT IN (:...${name})`\n      parameters = { [name]: values }\n      break\n\n    case 'notin_with_null':\n      clause = `${field} IS NULL OR ${field} NOT IN (:...${name}))`\n      parameters = { [name]: values }\n      break\n\n    case 'is_null':\n      clause = `${field} IS NULL`\n      break\n\n    case 'is_not_null':\n      clause = `${field} IS NOT NULL`\n      break\n\n    case 'is_false':\n      clause = `${field} IS FALSE`\n      break\n\n    case 'is_true':\n      clause = `${field} IS TRUE`\n      break\n\n    case 'is_not_false':\n      clause = `${field} IS NOT FALSE`\n      break\n\n    case 'is_not_true':\n      clause = `${field} IS NOT TRUE`\n      break\n\n    case 'is_present':\n      clause = `${field} IS PRESENT`\n      break\n\n    case 'is_blank':\n      clause = `${field} IS BLANK`\n      break\n\n    case 'is_empty_num_id':\n      clause = `${field} IS EMPTY NUMERIC ID`\n      break\n\n    case 'between':\n      clause = `${field} BETWEEN  :${name}_1 AND :${name}_2`\n      parameters = { [`${name}_1`]: values[0], [`${name}_2`]: values[1] }\n      break\n  }\n\n  if (relationColumnMeta) {\n    const { propertyName } = relationColumnMeta\n    const property = `${entityAlias}.${propertyName}`\n    if (andCondition) {\n      selectQueryBuilder.innerJoin(property, alias, clause, parameters)\n    } else {\n      selectQueryBuilder.leftJoin(property, alias)\n      whereExpressionBuilder.orWhere(clause, parameters)\n    }\n  } else {\n    andCondition\n      ? whereExpressionBuilder.andWhere(clause, parameters)\n      : whereExpressionBuilder.orWhere(clause, parameters)\n  }\n}\n"]}
+{"version":3,"file":"get-query-builder-from-list-params.js","sourceRoot":"","sources":["../../server/utils/get-query-builder-from-list-params.ts"],"names":[],"mappings":"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","sourcesContent":["import { Brackets, EntityMetadata, Repository, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm'\nimport { RelationMetadata } from 'typeorm/metadata/RelationMetadata'\n\nimport { Filter, ListParam } from '../service/common-types/list-param'\nimport { Domain } from '../service/domain/domain'\n\n/**\n *\n * @param options\n * @returns\n */\nexport function getQueryBuilderFromListParams<Type>(options: {\n  repository: Repository<Type>\n  params: ListParam\n  domain?: Domain\n  alias?: string\n  searchables?: string[]\n  filtersMap?: { [name: string]: { columnName: string; relationColumn?: string } }\n}): SelectQueryBuilder<Type> {\n  var { repository, params, domain, alias, searchables, filtersMap = {} } = options\n\n  const selectQueryBuilder = repository.createQueryBuilder(alias)\n  const entityAlias = selectQueryBuilder.alias\n\n  const columnFilters =\n    params.filters?.filter(filter => {\n      if (filter.operator === 'search') {\n        return false\n      }\n      if (filter.operator.toLowerCase().includes('like') && (!searchables || !searchables.includes(filter.name))) {\n        console.warn(\n          '\"searchables\" setting is required for like searches with a heavy database query load',\n          filter.name\n        )\n        return false\n      }\n      return true\n    }) || []\n  const searchFilters =\n    searchables instanceof Array\n      ? params.filters?.filter(filter => {\n          if (filter.operator !== 'search') {\n            return false\n          }\n          if (!searchables.includes(filter.name)) {\n            console.warn(\n              '\"searchables\" setting is required for like searches with a heavy database query load',\n              filter.name\n            )\n            return false\n          }\n          return true\n        }) || []\n      : []\n  const pagination = params.pagination\n  const sortings = params.sortings\n\n  const metadata = repository.metadata\n\n  if (columnFilters && columnFilters.length > 0) {\n    columnFilters.forEach(filter => {\n      addCondition(metadata, selectQueryBuilder, selectQueryBuilder, filter, filtersMap, true)\n    })\n  }\n\n  if (searchFilters.length > 0) {\n    selectQueryBuilder.andWhere(\n      new Brackets(qb => {\n        searchFilters.forEach(filter => {\n          addCondition(metadata, selectQueryBuilder, qb, filter, filtersMap, false)\n        })\n      })\n    )\n  }\n\n  if (domain) {\n    selectQueryBuilder.andWhere(`${entityAlias}.domain = :domain`, { domain: domain.id })\n  }\n\n  if (pagination && pagination.page > 0 && pagination.limit > 0) {\n    selectQueryBuilder.skip(pagination.limit * (pagination.page - 1))\n    selectQueryBuilder.take(pagination.limit)\n  }\n\n  if (sortings && sortings.length > 0) {\n    sortings.forEach((sorting, index) => {\n      const sortField = sorting.name.split('.').length > 1 ? sorting.name : `${entityAlias}.${sorting.name}`\n      if (index === 0) {\n        selectQueryBuilder.orderBy(sortField, sorting.desc ? 'DESC' : 'ASC')\n      } else {\n        selectQueryBuilder.addOrderBy(sortField, sorting.desc ? 'DESC' : 'ASC')\n      }\n    })\n  }\n\n  return selectQueryBuilder\n}\n\nfunction addCondition<T>(\n  metadata: EntityMetadata,\n  selectQueryBuilder: SelectQueryBuilder<T>,\n  whereExpressionBuilder: WhereExpressionBuilder,\n  filter: Filter,\n  filtersMap: { [name: string]: { columnName: string; relationColumn?: string } } = {},\n  andCondition: boolean\n): void {\n  const { name, operator, value } = filter\n  const values = value instanceof Array ? value : [value]\n  var entityAlias = selectQueryBuilder.alias\n\n  var { relationColumn, columnName } = filtersMap[name] || {}\n  /*\n    1. relationColumn과 columnName이 지정된 경우 \n    - relation inverse 테이블에서, columnName을 찾는다.\n    2. relationColumn만 지정된 경우는 없어야 한다.\n    - 이 경우 columnName 은 'name' 이라고 판단한다.\n    3. columnName이 지정된 경우.\n    - 이 경우는 columnName 만 적용한다.\n  */\n  if (relationColumn) {\n    const columns = relationColumn.split('.')\n    var entityMetadata: EntityMetadata\n    var relation: RelationMetadata\n\n    for (const rcolumn of columns) {\n      if (relation) {\n        const { propertyName } = relationColumnMeta\n        const property = `${entityAlias}.${propertyName}`\n\n        entityAlias = `${entityMetadata.tableName}-${entityMetadata.tableName}` as string\n\n        if (andCondition) {\n          selectQueryBuilder.innerJoin(property, entityAlias)\n        } else {\n          selectQueryBuilder.leftJoin(property, entityAlias)\n        }\n      } else {\n        entityMetadata = metadata\n      }\n\n      var relationColumnMeta = entityMetadata.columns.find(column => column.propertyName === rcolumn)\n      if (!relationColumnMeta) {\n        console.warn(`relationColumn \"${relationColumn}\" in filtersMap for \"${name}\" is not a relation column`)\n        return\n      }\n\n      relation = relationColumnMeta.relationMetadata\n      entityMetadata = relation.inverseEntityMetadata\n    }\n\n    var columnMeta = entityMetadata.columns.find(column => column.propertyName === (columnName || 'name'))\n    if (!columnMeta) {\n      console.warn(`columnName \"${columnName}\" in filtersMap for \"${name}\" is not a column`)\n      return\n    }\n  } else {\n    var columnMeta = metadata.columns.find(column => column.propertyName === (columnName || name))\n    if (!columnMeta) {\n      /* relationId 에 대한 필터링은 해당 컬럼값 자체의 비교로 한다. */\n      var relationIdMeta = metadata.relationIds.find(relationId => relationId.propertyName === (columnName || name))\n      if (relationIdMeta) {\n        columnMeta = relationIdMeta.relation.joinColumns[0]\n      } else {\n        columnName\n          ? console.warn(`columnName \"${columnName}\" in filtersMap for \"${name}\" is not a column`)\n          : console.warn(`name \"${name}\" is not a column`)\n      }\n    } else {\n      var relation = columnMeta.relationMetadata\n    }\n\n    if (relation) {\n      /* filterMap에 의해서 relationColumn 이 지정되지 않았더라도, name 또는 columnName의 column이 relation인 경우에는\n        - 조건절 구성을 위한 타겟필드명은 'name' 으로만 한정된다.\n      */\n      var relationColumnMeta = columnMeta\n      var entityMetadata = relation.inverseEntityMetadata\n      columnMeta = entityMetadata.columns.find(column => column.propertyName === 'name')\n      if (!columnMeta) {\n        console.warn(`relation column \"${columnName || name}\" does not have \"name\" column`)\n        return\n      }\n    }\n  }\n\n  const dbNameForColumn = columnMeta.databaseName\n  const alias = relationColumnMeta ? `${name}-filter` : entityAlias\n\n  /* relation columne인 경우 name을 alias로 사용한다. */\n  const field = `${alias}.${dbNameForColumn}`\n\n  var clause = ''\n  var parameters = {}\n\n  switch (operator) {\n    case 'eq':\n      clause = `${field} = :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'like':\n      clause = `${field} LIKE :${name}`\n      parameters = { [name]: `%${value}%` }\n      break\n\n    case 'search':\n    case 'i_like':\n      clause = `LOWER(${field}) LIKE :${name}`\n      parameters = { [name]: `%${String(value).toLowerCase()}%` }\n      break\n\n    case 'nlike':\n      clause = `${field} NOT LIKE :${name}`\n      parameters = { [name]: `%${value}%` }\n      break\n\n    case 'i_nlike':\n      clause = `LOWER(${field}) NOT LIKE :${name}`\n      parameters = { [name]: `%${String(value).toLowerCase()}%` }\n      break\n\n    case 'lt':\n      clause = `${field} < :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'gt':\n      clause = `${field} > :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'lte':\n      clause = `${field} <= :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'gte':\n      clause = `${field} >= :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'noteq':\n      clause = `${field} != :${name}`\n      parameters = { [name]: value }\n      break\n\n    case 'in':\n      clause = `${field} IN (:...${name})`\n      parameters = { [name]: values }\n      break\n\n    case 'notin':\n      clause = `${field} NOT IN (:...${name})`\n      parameters = { [name]: values }\n      break\n\n    case 'notin_with_null':\n      clause = `${field} IS NULL OR ${field} NOT IN (:...${name}))`\n      parameters = { [name]: values }\n      break\n\n    case 'is_null':\n      clause = `${field} IS NULL`\n      break\n\n    case 'is_not_null':\n      clause = `${field} IS NOT NULL`\n      break\n\n    case 'is_false':\n      clause = `${field} IS FALSE`\n      break\n\n    case 'is_true':\n      clause = `${field} IS TRUE`\n      break\n\n    case 'is_not_false':\n      clause = `${field} IS NOT FALSE`\n      break\n\n    case 'is_not_true':\n      clause = `${field} IS NOT TRUE`\n      break\n\n    case 'is_present':\n      clause = `${field} IS PRESENT`\n      break\n\n    case 'is_blank':\n      clause = `${field} IS BLANK`\n      break\n\n    case 'is_empty_num_id':\n      clause = `${field} IS EMPTY NUMERIC ID`\n      break\n\n    case 'between':\n      clause = `${field} BETWEEN  :${name}_1 AND :${name}_2`\n      parameters = { [`${name}_1`]: values[0], [`${name}_2`]: values[1] }\n      break\n  }\n\n  if (relationColumnMeta) {\n    const { propertyName } = relationColumnMeta\n    const property = `${entityAlias}.${propertyName}`\n    if (andCondition) {\n      selectQueryBuilder.innerJoin(property, alias, clause, parameters)\n    } else {\n      selectQueryBuilder.leftJoin(property, alias)\n      whereExpressionBuilder.orWhere(clause, parameters)\n    }\n  } else {\n    andCondition\n      ? whereExpressionBuilder.andWhere(clause, parameters)\n      : whereExpressionBuilder.orWhere(clause, parameters)\n  }\n}\n"]}

package/helps/about/things-factory.en.md

@@ -59,7 +59,7 @@ These modules compose together to help you create performant modern JS apps that
   - The components provide independent (atomic) functionality.
     - The component excludes dependencies on the application in order to maintain implementation independence.
       - Style maintains its independence by using css variables.
-      - Multilinguals maintain independence by using i18n-msg components. (Only have dependencies on i18n-msg.)
+      - Multilinguals maintain independence by using ox-i18n components. (Only have dependencies on ox-i18n.)
       - The component does not have a premise for the layout (display, position) of the host (container) to which it will be used.
   - page, layouts are connected to redux.
   - Components do not connect to redux, but they work with pages through properties.

package/helps/about/things-factory.ko.md

@@ -62,7 +62,7 @@ Typescript를 포함하여, 서버사이들의 Koa, 웹컴포넌트 UI를 위한
   - The components provide independent (atomic) functionality.
     - The component excludes dependencies on the application in order to maintain implementation independence.
       - Style maintains its independence by using css variables.
-      - Multilinguals maintain independence by using i18n-msg components. (Only have dependencies on i18n-msg.)
+      - Multilinguals maintain independence by using ox-i18n components. (Only have dependencies on ox-i18n.)
       - The component does not have a premise for the layout (display, position) of the host (container) to which it will be used.
   - page, layouts are connected to redux.
   - Components do not connect to redux, but they work with pages through properties.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.0.0-alpha.8",
+  "version": "6.0.0-zeta.1",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -12,7 +12,6 @@
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "author": "Hearty Oh <heartyoh@hatiolab.com>",
-  "license": "MIT",
   "things-factory": true,
   "publishConfig": {
     "access": "public",
@@ -39,12 +38,12 @@
     "@hatiolab/koa-webpack": "^6.0.0",
     "@hatiolab/things-scene": "^3.0.23",
     "@koa/cors": "^3.3.0",
-    "@material/mwc-button": "^0.26.1",
-    "@material/mwc-fab": "^0.26.1",
-    "@material/mwc-icon": "^0.26.1",
-    "@material/mwc-icon-button": "^0.26.1",
-    "@material/mwc-slider": "^0.26.1",
-    "@material/mwc-textfield": "^0.26.1",
+    "@material/mwc-button": "^0.27.0",
+    "@material/mwc-fab": "^0.27.0",
+    "@material/mwc-icon": "^0.27.0",
+    "@material/mwc-icon-button": "^0.27.0",
+    "@material/mwc-slider": "^0.27.0",
+    "@material/mwc-textfield": "^0.27.0",
     "@open-wc/scoped-elements": "^2.1.3",
     "@operato/board": "^1.0.1",
     "@operato/graphql": "^1.0.0",
@@ -52,10 +51,10 @@
     "@operato/layout": "^1.0.1",
     "@operato/shell": "^1.0.1",
     "@operato/utils": "^1.0.1",
-    "@things-factory/ejs-remote": "^6.0.0-alpha.8",
-    "@things-factory/env": "^6.0.0-alpha.8",
-    "@things-factory/styles": "^6.0.0-alpha.8",
-    "@things-factory/utils": "^6.0.0-alpha.8",
+    "@things-factory/ejs-remote": "^6.0.0-zeta.1",
+    "@things-factory/env": "^6.0.0-zeta.1",
+    "@things-factory/styles": "^6.0.0-zeta.1",
+    "@things-factory/utils": "^6.0.0-zeta.1",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
     "apollo-server-core": "^3.10.0",
@@ -66,7 +65,7 @@
     "broadcastchannel-polyfill": "^1.0.1",
     "chalk": "^4.1.0",
     "class-validator": "^0.13.2",
-    "core-js": "^3.23.3",
+    "core-js": "^3.26.0",
     "csvtojson": "^2.0.10",
     "debug": "^4.1.1",
     "firebase": "^8.0.1",
@@ -97,7 +96,7 @@
     "koa-send": "^5.0.0",
     "koa-static": "^5.0.0",
     "koa2-connect-history-api-fallback": "^0.1.2",
-    "lit": "^2.2.7",
+    "lit": "^2.4.0",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
@@ -132,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "6d45cce6b8aef6b4de253dfbcb0ba8c3abb682cf"
+  "gitHead": "1115c43f6cd7d271c7cbbf5f6fb87658507c4296"
 }

package/server/utils/get-query-builder-from-list-params.ts

@@ -1,4 +1,5 @@
 import { Brackets, EntityMetadata, Repository, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm'
+import { RelationMetadata } from 'typeorm/metadata/RelationMetadata'
 
 import { Filter, ListParam } from '../service/common-types/list-param'
 import { Domain } from '../service/domain/domain'
@@ -105,7 +106,7 @@ function addCondition<T>(
 ): void {
   const { name, operator, value } = filter
   const values = value instanceof Array ? value : [value]
-  const entityAlias = selectQueryBuilder.alias
+  var entityAlias = selectQueryBuilder.alias
 
   var { relationColumn, columnName } = filtersMap[name] || {}
   /*
@@ -117,14 +118,36 @@ function addCondition<T>(
     - 이 경우는 columnName 만 적용한다.
   */
   if (relationColumn) {
-    var relationColumnMeta = metadata.columns.find(column => column.propertyName === relationColumn)
-    if (!relationColumnMeta) {
-      console.warn(`relationColumn "${relationColumn}" in filtersMap for "${name}" is not a relation column`)
-      return
+    const columns = relationColumn.split('.')
+    var entityMetadata: EntityMetadata
+    var relation: RelationMetadata
+
+    for (const rcolumn of columns) {
+      if (relation) {
+        const { propertyName } = relationColumnMeta
+        const property = `${entityAlias}.${propertyName}`
+
+        entityAlias = `${entityMetadata.tableName}-${entityMetadata.tableName}` as string
+
+        if (andCondition) {
+          selectQueryBuilder.innerJoin(property, entityAlias)
+        } else {
+          selectQueryBuilder.leftJoin(property, entityAlias)
+        }
+      } else {
+        entityMetadata = metadata
+      }
+
+      var relationColumnMeta = entityMetadata.columns.find(column => column.propertyName === rcolumn)
+      if (!relationColumnMeta) {
+        console.warn(`relationColumn "${relationColumn}" in filtersMap for "${name}" is not a relation column`)
+        return
+      }
+
+      relation = relationColumnMeta.relationMetadata
+      entityMetadata = relation.inverseEntityMetadata
     }
 
-    var relation = relationColumnMeta.relationMetadata
-    var entityMetadata = relation.inverseEntityMetadata
     var columnMeta = entityMetadata.columns.find(column => column.propertyName === (columnName || 'name'))
     if (!columnMeta) {
       console.warn(`columnName "${columnName}" in filtersMap for "${name}" is not a column`)

package/views/public/home.html

@@ -63,6 +63,8 @@
         font-family: Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
         line-height: 1.5;
         -webkit-font-smoothing: antialiased;
+
+        accent-color: var(--primary-color);
       }
     </style>
 

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab, inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.