refactor: extract table creation logic for improved readability

Author: younocode

apps/nestjs-backend/src/features/base-node/base-node.service.ts

@@ -21,12 +21,12 @@ import type {
   IDuplicateTableRo,
   ICreateDashboardRo,
   ICreateFolderNodeRo,
-  ICreateTableWithDefault,
   IDuplicateDashboardRo,
   IUpdateBaseNodeRo,
   IBaseNodePresenceFlushPayload,
   IBaseNodeResourceMeta,
   IBaseNodeResourceMetaWithId,
+  ICreateTableRo,
 } from '@teable/openapi';
 import { BaseNodeResourceType } from '@teable/openapi';
 import { Knex } from 'knex';
@@ -68,6 +68,7 @@ import type { IClsStore } from '../../types/cls';
 import { updateOrder } from '../../utils/update-order';
 import { DashboardService } from '../dashboard/dashboard.service';
 import { TableOpenApiService } from '../table/open-api/table-open-api.service';
+import { prepareCreateTableRo } from '../table/open-api/table.pipe.helper';
 import { TableDuplicateService } from '../table/table-duplicate.service';
 import { BaseNodeFolderService } from './folder/base-node-folder.service';
 
@@ -461,10 +462,9 @@ export class BaseNodeService {
         return { id: folder.id, name: folder.name };
       }
       case BaseNodeResourceType.Table: {
-        const table = await this.tableOpenApiService.createTable(
-          baseId,
-          ro as ICreateTableWithDefault
-        );
+        const preparedRo = prepareCreateTableRo(ro as ICreateTableRo);
+        const table = await this.tableOpenApiService.createTable(baseId, preparedRo);
+
         return {
           id: table.id,
           name: table.name,

apps/nestjs-backend/src/features/table/open-api/table.pipe.helper.ts

@@ -0,0 +1,29 @@
+import type { IFieldVo } from '@teable/core';
+import { HttpErrorCode, PRIMARY_SUPPORTED_TYPES } from '@teable/core';
+import type { ICreateTableRo, ICreateTableWithDefault } from '@teable/openapi';
+import { CustomHttpException } from '../../../custom.exception';
+import { DEFAULT_FIELDS, DEFAULT_VIEWS, DEFAULT_RECORD_DATA } from '../constant';
+
+export const prepareCreateTableRo = (tableRo: ICreateTableRo): ICreateTableWithDefault => {
+  const fieldRos = tableRo.fields && tableRo.fields.length ? tableRo.fields : DEFAULT_FIELDS;
+  // make sure first field to be the primary field;
+  (fieldRos[0] as IFieldVo).isPrimary = true;
+  if (!PRIMARY_SUPPORTED_TYPES.has(fieldRos[0].type)) {
+    throw new CustomHttpException(
+      `Field type ${fieldRos[0].type} is not supported as primary field`,
+      HttpErrorCode.VALIDATION_ERROR,
+      {
+        localization: {
+          i18nKey: 'httpErrors.field.primaryFieldNotSupported',
+        },
+      }
+    );
+  }
+
+  return {
+    ...tableRo,
+    fields: fieldRos,
+    views: tableRo.views && tableRo.views.length ? tableRo.views : DEFAULT_VIEWS,
+    records: tableRo.records ? tableRo.records : DEFAULT_RECORD_DATA,
+  };
+};

apps/nestjs-backend/src/features/table/open-api/table.pipe.ts

@@ -1,37 +1,11 @@
 import type { ArgumentMetadata, PipeTransform } from '@nestjs/common';
 import { Injectable } from '@nestjs/common';
-import { HttpErrorCode, PRIMARY_SUPPORTED_TYPES, type IFieldVo } from '@teable/core';
 import type { ICreateTableRo } from '@teable/openapi';
-import { CustomHttpException } from '../../../custom.exception';
-import { DEFAULT_FIELDS, DEFAULT_RECORD_DATA, DEFAULT_VIEWS } from '../constant';
+import { prepareCreateTableRo } from './table.pipe.helper';
 
 @Injectable()
 export class TablePipe implements PipeTransform {
   async transform(value: ICreateTableRo, _metadata: ArgumentMetadata) {
-    return this.prepareDefaultRo(value);
-  }
-
-  async prepareDefaultRo(tableRo: ICreateTableRo): Promise<ICreateTableRo> {
-    const fieldRos = tableRo.fields && tableRo.fields.length ? tableRo.fields : DEFAULT_FIELDS;
-    // make sure first field to be the primary field;
-    (fieldRos[0] as IFieldVo).isPrimary = true;
-    if (!PRIMARY_SUPPORTED_TYPES.has(fieldRos[0].type)) {
-      throw new CustomHttpException(
-        `Field type ${fieldRos[0].type} is not supported as primary field`,
-        HttpErrorCode.VALIDATION_ERROR,
-        {
-          localization: {
-            i18nKey: 'httpErrors.field.primaryFieldNotSupported',
-          },
-        }
-      );
-    }
-
-    return {
-      ...tableRo,
-      fields: fieldRos,
-      views: tableRo.views && tableRo.views.length ? tableRo.views : DEFAULT_VIEWS,
-      records: tableRo.records ? tableRo.records : DEFAULT_RECORD_DATA,
-    };
+    return prepareCreateTableRo(value);
   }
 }

apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseNodeTree.tsx

@@ -434,8 +434,8 @@ export const BaseNodeTree = () => {
   }, [treeItems]);
 
   useEffect(() => {
-    if (Object.keys(treeItemsRef.current).length === 0) return;
-    const nodes = Object.values(treeItemsRef.current);
+    if (Object.keys(treeItems).length === 0) return;
+    const nodes = Object.values(treeItems);
     const { resourceType, resourceId } = parseNodeUrl({ baseId, url: urlPath, urlParams }) ?? {};
     const node = nodes.find(
       (node) => node.resourceType === resourceType && node.resourceId === resourceId
@@ -452,7 +452,7 @@ export const BaseNodeTree = () => {
         parentResourceId: baseId,
       });
     }
-  }, [urlPath, urlParams, baseId, updateUserLastVisit]);
+  }, [treeItems, urlPath, urlParams, baseId, updateUserLastVisit]);
 
   useEffect(() => {
     if (!Object.keys(treeItems).length) return;

packages/openapi/src/base-node/create.ts

@@ -12,7 +12,7 @@ export const CREATE_BASE_NODE = '/base/{baseId}/node';
 const createBaseNodeSchema = z.object({
   resourceType: z.nativeEnum(BaseNodeResourceType),
   parentId: z.string().nullable().optional(),
-  name: z.string().trim(),
+  name: z.string().trim().min(1),
 });
 
 export type ICreateBaseNode = z.infer<typeof createBaseNodeSchema>;