[Feature-332][UI] Add table comment fields to the table list in the d…

…ata catalog interface (#333)
datavane · Jan 6, 2024 · 53352fd · 53352fd
1 parent fcfdc65
commit 53352fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...in/java/io/datavines/server/repository/service/impl/CatalogEntityInstanceServiceImpl.java b/...in/java/io/datavines/server/repository/service/impl/CatalogEntityInstanceServiceImpl.java
@@ -169,7 +169,9 @@ private IPage<CatalogEntityInstance> getCatalogEntityInstancePage(String upstrea
             queryWrapper.lambda()
                     .in(CatalogEntityInstance::getUuid, uuidList)
                     .eq(CatalogEntityInstance::getStatus, CommonConstants.CATALOG_ENTITY_INSTANCE_STATUS_ACTIVE)
-                    .like(StringUtils.isNotEmpty(name), CatalogEntityInstance::getDisplayName, name)
+                    .and(qw ->  qw.like(StringUtils.isNotEmpty(name), CatalogEntityInstance::getDisplayName, name)
+                                    .or()
+                                    .like(StringUtils.isNotEmpty(name), CatalogEntityInstance::getDescription, name))
                     .orderBy(true, true, CatalogEntityInstance::getId);
             return page(page, queryWrapper);
         }
@@ -261,6 +263,7 @@ public IPage<CatalogTableDetailVO> getCatalogTableWithDetailPage(String upstream
                 CatalogTableDetailVO table = new CatalogTableDetailVO();
                 table.setName(item.getDisplayName());
                 table.setUuid(item.getUuid());
+                table.setComment(item.getDescription());
                 table.setUpdateTime(item.getUpdateTime());
                 List<CatalogEntityInstance> columnList = getCatalogEntityInstances(item.getUuid());
                 table.setColumns((long)(CollectionUtils.isEmpty(columnList)? 0 : columnList.size()));

diff --git a/datavines-ui/Editor/components/Database/option.tsx b/datavines-ui/Editor/components/Database/option.tsx
@@ -34,6 +34,11 @@ export const dataBaseCol:Col[][] = [[{
     key: 'name',
     render: (_: any, { name }: any) => <span className="text-underline">{name}</span>,
 },
+{
+    title: <FormattedMessage id="job_comment" />,
+    dataIndex: 'comment',
+    key: 'comment',
+},
 {
     title: <FormattedMessage id="job_last_refresh_time" />,
     dataIndex: 'updateTime',