Merge pull request #2482 from nocodb/fix/2429-LTAR-column_naming

fix: LTAR column naming

packages/nocodb/src/__tests__/restv2.test.ts

@@ -209,7 +209,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Rollup,
           alias: 'filmCount',
           rollupColumn: 'FilmId',
-          relationColumn: 'FilmMMList',
+          relationColumn: 'Film List',
           rollupFunction: 'count'
         }
       ];
@@ -413,7 +413,7 @@ describe('Noco v2 Tests', () => {
         type: UITypes.Lookup,
         alias: 'filmNames',
         lookupColumn: 'Title',
-        relationColumn: 'FilmMMList'
+        relationColumn: 'Film List'
       };
       request(app)
         .post(`/nc/${projectId}/generate`)
@@ -1335,7 +1335,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'filmIds',
           lookupColumn: 'FilmId',
-          relationColumn: 'FilmMMList'
+          relationColumn: 'Film List'
         },
         {
           table: 'actor',
@@ -1398,7 +1398,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Rollup,
           alias: 'actorsCount',
           rollupColumn: 'ActorId',
-          relationColumn: 'ActorMMList',
+          relationColumn: 'ActorList',
           rollupFunction: 'count'
         },
         {
@@ -1406,7 +1406,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'actorsCountList',
           lookupColumn: 'actorsCount',
-          relationColumn: 'FilmMMList'
+          relationColumn: 'Film List'
         },
         {
           table: 'actor',

packages/nocodb/src/lib/meta/api/columnApis.ts

@@ -57,7 +57,7 @@ async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await child.getColumns(),
-      type === 'bt' ? alias : `${parent.title}Read`
+      type === 'bt' ? alias : `${parent.title}`
     );
     await Column.insert<LinkToAnotherRecordColumn>({
       title,
@@ -427,7 +427,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await child.getColumns(),
-              `${child.title}MMList`
+              `${parent.title} List`
             ),
             uidt: UITypes.LinkToAnotherRecord,
             type: 'mm',
@@ -447,7 +447,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await parent.getColumns(),
-              req.body.title ?? `${parent.title}MMList`
+              req.body.title ?? `${child.title} List`
             ),
 
             uidt: UITypes.LinkToAnotherRecord,

packages/nocodb/src/lib/meta/api/metaDiffApis.ts

@@ -671,7 +671,7 @@ export async function metaDiffSync(req, res) {
               if (change.relationType === RelationTypes.BELONGS_TO) {
                 const title = getUniqueColumnAliasName(
                   childModel.columns,
-                  `${parentModel.title || parentModel.table_name}Read`
+                  `${parentModel.title || parentModel.table_name}`
                 );
                 await Column.insert<LinkToAnotherRecordColumn>({
                   uidt: UITypes.LinkToAnotherRecord,
@@ -785,7 +785,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelA.columns,
-            `${modelB.title}MMList`
+            `${modelB.title} List`
           ),
           fk_model_id: modelA.id,
           fk_related_model_id: modelB.id,
@@ -803,7 +803,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelB.columns,
-            `${modelA.title}MMList`
+            `${modelA.title} List`
           ),
           fk_model_id: modelB.id,
           fk_related_model_id: modelA.id,

packages/nocodb/src/lib/meta/api/projectApis.ts

@@ -230,7 +230,7 @@ async function populateMeta(base: Base, project: Project): Promise<any> {
             uidt: UITypes.LinkToAnotherRecord,
             type: 'bt',
             bt,
-            title: `${bt.rtitle}Read`
+            title: `${bt.rtitle}`
           };
         })
       ];

scripts/cypress/integration/common/1a_table_operations.js

@@ -80,9 +80,9 @@ export const genTest = (apiType, dbType) => {
             // 4a. Address table, has many field
             cy.openTableTab("Address", 25);
 
-            mainPage.getCell("CityRead", 1).scrollIntoView();
+            mainPage.getCell("City", 1).scrollIntoView();
             mainPage
-                .getCell("CityRead", 1)
+                .getCell("City", 1)
                 .find(".name")
                 .contains("Lethbridge")
                 .should("exist");

scripts/cypress/integration/common/2b_table_with_m2m_column.js

@@ -23,10 +23,10 @@ export const genTest = (apiType, dbType) => {
 
         it("Expand m2m column", () => {
             // expand first row
-            cy.get('td[data-col="FilmMMList"] div', { timeout: 12000 })
+            cy.get('td[data-col="Film List"] div', { timeout: 12000 })
                 .first()
                 .click({ force: true });
-            cy.get('td[data-col="FilmMMList"] div .mdi-arrow-expand')
+            cy.get('td[data-col="Film List"] div .mdi-arrow-expand')
                 .first()
                 .click({ force: true });
 

scripts/cypress/integration/common/4e_form_view_share.js

@@ -131,7 +131,7 @@ export const genTest = (apiType, dbType) => {
                         // all fields, barring removed field should exist
                         cy.get('[title="City"]').should("exist");
                         cy.get('[title="LastUpdate"]').should("exist");
-                        cy.get('[title="CountryRead"]').should("exist");
+                        cy.get('[title="Country"]').should("exist");
                         cy.get('[title="Address List"]').should("not.exist");
 
                         // order of LastUpdate & City field is retained

scripts/cypress/integration/common/4f_grid_view_share.js

@@ -170,7 +170,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1013 Tabuk Boulevard,West Bengali,96203,158399646978,[object Object],2,,Kanchrapara,`,
                         `1892 Nabereznyje Telny Lane,Tutuila,28396,478229987054,[object Object],2,,Tafuna,`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
@@ -231,7 +231,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
                         `1661 Abha Drive,Tamil Nadu,14400,270456873752,[object Object],1,,Pudukkottai,`,
                     ];
@@ -269,8 +269,8 @@ export const genTest = (apiType, dbType) => {
                 // verify column headers
                 cy.get('[data-col="Customer List"]').should("exist");
                 cy.get('[data-col="Staff List"]').should("exist");
-                cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="City"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -308,17 +308,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > belongs to`, () => {
                 // belongs to field validation
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .find(".v-chip")
                     .contains("Kanchrapara")
                     .should("exist");
@@ -327,17 +327,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();

scripts/cypress/integration/common/4f_pg_grid_view_share.js

@@ -228,7 +228,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1888 Kabul Drive,,20936,,1,,Ife,,`,
                         `1661 Abha Drive,,14400,,1,,Pudukkottai,,`,
                     ];
@@ -264,8 +264,8 @@ export const genTest = (apiType, dbType) => {
                 // verify column headers
                 cy.get('[data-col="Customer List"]').should("exist");
                 cy.get('[data-col="Staff List"]').should("exist");
-                cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="City"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -303,17 +303,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > belongs to`, () => {
                 // belongs to field validation
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .find(".v-chip")
                     .contains("al-Ayn")
                     .should("exist");
@@ -322,17 +322,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();

scripts/cypress/integration/common/5a_user_role.js

@@ -209,7 +209,7 @@ export const genTest = (apiType, dbType) => {
                     const verifyCsv = (retrievedRecords) => {
                         // expected output, statically configured
                         let storedRecords = [
-                            `City,AddressList,CountryRead`,
+                            `City,Address List,Country`,
                             `A Corua (La Corua),939 Probolinggo Loop,Spain`,
                             `Abha,733 Mandaluyong Place,Saudi Arabia`,
                             `Abu Dhabi,535 Ahmadnagar Manor,United Arab Emirates`,