fix: ManyToMany column naming

- Add suffix `List` instead of `MMList`
- Proper child table name
- Cypress test case corrections

re #2429

Signed-off-by: Pranav C <pranavxc@gmail.com>

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: 'FilmList',
           rollupFunction: 'count'
         }
       ];
@@ -413,7 +413,7 @@ describe('Noco v2 Tests', () => {
         type: UITypes.Lookup,
         alias: 'filmNames',
         lookupColumn: 'Title',
-        relationColumn: 'FilmMMList'
+        relationColumn: 'FilmList'
       };
       request(app)
         .post(`/nc/${projectId}/generate`)
@@ -1335,7 +1335,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'filmIds',
           lookupColumn: 'FilmId',
-          relationColumn: 'FilmMMList'
+          relationColumn: 'FilmList'
         },
         {
           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: 'FilmList'
         },
         {
           table: 'actor',

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

@@ -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

@@ -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,

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="FilmList"] div', { timeout: 12000 })
                 .first()
                 .click({ force: true });
-            cy.get('td[data-col="FilmMMList"] div .mdi-arrow-expand')
+            cy.get('td[data-col="FilmList"] div .mdi-arrow-expand')
                 .first()
                 .click({ force: true });
 

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,CustomerList,StaffList,CityRead,StaffList`,
                         `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,CustomerList,StaffList,CityRead,StaffList`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
                         `1661 Abha Drive,Tamil Nadu,14400,270456873752,[object Object],1,,Pudukkottai,`,
                     ];
@@ -270,7 +270,7 @@ export const genTest = (apiType, dbType) => {
                 cy.get('[data-col="CustomerList"]').should("exist");
                 cy.get('[data-col="StaffList"]').should("exist");
                 cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="StaffList"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -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("StaffList", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 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,CustomerList,StaffList,CityRead,StaffList`,
                         `1888 Kabul Drive,,20936,,1,,Ife,,`,
                         `1661 Abha Drive,,14400,,1,,Pudukkottai,,`,
                     ];
@@ -265,7 +265,7 @@ export const genTest = (apiType, dbType) => {
                 cy.get('[data-col="CustomerList"]').should("exist");
                 cy.get('[data-col="StaffList"]').should("exist");
                 cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="StaffList"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -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("StaffList", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();