From 6b77f5c2df4c926082d033d45ed72c692903c628 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 16 Oct 2024 10:30:46 +0000
Subject: [PATCH] refactor: suggested review changes

---
 packages/nc-gui/components/cell/Rating.vue    |  2 --
 .../nocodb/src/services/columns.service.ts    |  5 +++++
 .../nocodb/src/services/tables.service.ts     | 19 +++++++++++++++++++
 .../tests/unit/rest/tests/table.test.ts       |  1 -
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index 26cb5b5ad5..4dcbadb064 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { extractRatingIcon } from '../../utils/columnUtils'
-
 interface Props {
   modelValue?: number | null | undefined
 }
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index e79f74df63..cfb50174a4 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1627,6 +1627,11 @@ export class ColumnsService {
       reuse?: ReusableParams;
     },
   ) {
+    // if column_name is defined and title is not defined, set title to column_name
+    if (param.column.column_name && !param.column.title) {
+      param.column.title = param.column.column_name;
+    }
+
     validatePayload('swagger.json#/components/schemas/ColumnReq', param.column);
 
     const reuse = param.reuse || {};
diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts
index af54c9366c..31a2f5d19f 100644
--- a/packages/nocodb/src/services/tables.service.ts
+++ b/packages/nocodb/src/services/tables.service.ts
@@ -466,6 +466,20 @@ export class TablesService {
       req?: any;
     },
   ) {
+    // before validating add title for columns if only column name is present
+    if (param.table.columns) {
+      param.table.columns.forEach((c) => {
+        if (!c.title && c.column_name) {
+          c.title = c.column_name;
+        }
+      });
+    }
+
+    // before validating add title for table if only table name is present
+    if (!param.table.title && param.table.table_name) {
+      param.table.title = param.table.table_name
+    }
+
     validatePayload('swagger.json#/components/schemas/TableReq', param.table);
 
     const tableCreatePayLoad: Omit<TableReqType, 'columns'> & {
@@ -651,6 +665,11 @@ export class TablesService {
       ) {
         const mxColumnLength = Column.getMaxColumnNameLength(sqlClientType);
 
+        // set column name using title if not present
+        if (!column.column_name && column.title) {
+          column.column_name = column.title;
+        }
+
         // - 5 is a buffer for suffix
         column.column_name = sanitizeColumnName(
           column.column_name.slice(0, mxColumnLength - 5),
diff --git a/packages/nocodb/tests/unit/rest/tests/table.test.ts b/packages/nocodb/tests/unit/rest/tests/table.test.ts
index a31d346009..b47b467253 100644
--- a/packages/nocodb/tests/unit/rest/tests/table.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/table.test.ts
@@ -53,7 +53,6 @@ function tableStaticTests() {
       .post(`/api/v1/db/meta/projects/${base.id}/tables`)
       .set('xc-auth', context.token)
       .send({
-        table_name: 'new_table_name',
         title: undefined,
         columns: defaultColumns(context),
       })