Skip to content

Commit

Permalink
fix: match duplicated field titles (#8544)
Browse files Browse the repository at this point in the history 
* fix: add copy suffix only if title exists

Signed-off-by: mertmit <mertmit99@gmail.com>

* fix: renaming duplicated column childs

Signed-off-by: mertmit <mertmit99@gmail.com>

---------

Signed-off-by: mertmit <mertmit99@gmail.com>
  • Loading branch information
@mertmit
mertmit committed May 23, 2024
1 parent 56b5264 commit 317f815
Show file tree
Hide file tree
Showing 2 changed files with 180 additions and 44 deletions.
3 changes: 3 additions & 0 deletions packages/nocodb/src/helpers/exportImportHelpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ export function findWithIdentifier(map: Map<string, any>, id: string) {
}

export function generateUniqueName(name: string, names: string[]) {
// if name is unique, return it
if (!names.includes(name)) return name;
// if name is not unique, add a number suffix
let newName = name;
let i = 1;
while (names.includes(newName)) {
Expand Down
221 changes: 177 additions & 44 deletions packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,6 @@ export class ImportService {
colOptions.fk_mm_model_id && a.id !== col.id,
);

if (colOptions.fk_related_model_id === modelData.id) {
childColumn.title = `${childColumn.title} copy`;
}

for (const nColumn of childModel.columns) {
if (
nColumn?.colOptions?.fk_mm_model_id ===
Expand All @@ -325,6 +321,16 @@ export class ImportService {
idMap.set(childColumn.id, nColumn.id);

if (nColumn.title !== childColumn.title) {
const titleExists = childModel.columns.find(
(a) => a.title === childColumn.title,
);
if (titleExists) {
childColumn.title = generateUniqueName(
`${childColumn.title} copy`,
childModel.columns.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
Expand Down Expand Up @@ -403,10 +409,6 @@ export class ImportService {
a.id !== col.id,
);

if (colOptions.fk_related_model_id === modelData.id) {
childColumn.title = `${childColumn.title} copy`;
}

for (const nColumn of childModel.columns) {
if (
nColumn.id !== getIdOrExternalId(col.id) &&
Expand All @@ -417,7 +419,20 @@ export class ImportService {
) {
idMap.set(childColumn.id, nColumn.id);

// Rename child column (link column)
if (nColumn.title !== childColumn.title) {
const titleExists = childModel.columns.find(
(a) => a.title === childColumn.title,
);
if (titleExists) {
childColumn.title = generateUniqueName(
`${childColumn.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
Expand All @@ -428,7 +443,44 @@ export class ImportService {
user: param.user,
});
}
break;
}

// Rename fk child column
if (
nColumn.id ===
getIdOrExternalId(colOptions.fk_child_column_id)
) {
const relatedCol = param.data
.find((a) => a.model.id === colOptions.fk_related_model_id)
?.model.columns.find(
(a) => a.id === colOptions.fk_child_column_id,
);

if (relatedCol) {
if (nColumn.title !== relatedCol?.title) {
const titleExists = childModel.columns.find(
(a) => a.title === relatedCol.title,
);
if (titleExists) {
relatedCol.title = generateUniqueName(
`${relatedCol.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
...nColumn,
column_name: relatedCol.column_name,
title: relatedCol.title,
},
user: param.user,
});
}
}
}
}
}
Expand Down Expand Up @@ -509,10 +561,6 @@ export class ImportService {
a.id !== getEntityIdentifier(col.id)),
);

if (colOptions.fk_related_model_id === modelData.id) {
childColumn.title = `${childColumn.title} copy`;
}

for (const nColumn of childModel.columns) {
if (
nColumn?.colOptions?.fk_mm_model_id ===
Expand All @@ -528,14 +576,17 @@ export class ImportService {
);
}

childColumn.title = `${childColumn.title} copy`;

childColumn.title = generateUniqueName(
childColumn.title,
childModel.columns.map((a) => a.title),
);

if (nColumn.title !== childColumn.title) {
const titleExists = childModel.columns.find(
(a) => a.title === childColumn.title,
);
if (titleExists) {
childColumn.title = generateUniqueName(
`${childColumn.title} copy`,
childModel.columns.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
Expand Down Expand Up @@ -636,10 +687,6 @@ export class ImportService {
a.id !== getEntityIdentifier(col.id)),
);

if (colOptions.fk_related_model_id === modelData.id) {
childColumn.title = `${childColumn.title} copy`;
}

for (const nColumn of childModel.columns) {
if (
nColumn.id !== getIdOrExternalId(col.id) &&
Expand All @@ -657,14 +704,20 @@ export class ImportService {
);
}

childColumn.title = `${childColumn.title} copy`;

childColumn.title = generateUniqueName(
childColumn.title,
childModel.columns.map((a) => a.title),
);

// Rename child column (link column)
if (nColumn.title !== childColumn.title) {
const titleExists = childModel.columns.find(
(a) => a.title === childColumn.title,
);
if (titleExists) {
childColumn.title = generateUniqueName(
`${childColumn.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
Expand All @@ -675,7 +728,46 @@ export class ImportService {
user: param.user,
});
}
break;

// Rename fk child column
if (
nColumn.id ===
getIdOrExternalId(colOptions.fk_child_column_id)
) {
const relatedCol = param.data
.find(
(a) => a.model.id === colOptions.fk_related_model_id,
)
?.model.columns.find(
(a) => a.id === colOptions.fk_child_column_id,
);

if (relatedCol) {
if (nColumn.title !== relatedCol?.title) {
const titleExists = childModel.columns.find(
(a) => a.title === relatedCol.title,
);
if (titleExists) {
relatedCol.title = generateUniqueName(
`${relatedCol.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
...nColumn,
column_name: relatedCol.column_name,
title: relatedCol.title,
},
user: param.user,
});
}
}
}
}
}
}
Expand Down Expand Up @@ -765,10 +857,6 @@ export class ImportService {
a.id !== getEntityIdentifier(col.id)),
);

if (colOptions.fk_related_model_id === modelData.id) {
childColumn.title = `${childColumn.title} copy`;
}

for (const nColumn of childModel.columns) {
if (
nColumn.id !== getIdOrExternalId(col.id) &&
Expand All @@ -786,14 +874,20 @@ export class ImportService {
);
}

childColumn.title = `${childColumn.title} copy`;

childColumn.title = generateUniqueName(
childColumn.title,
childModel.columns.map((a) => a.title),
);

// Rename child column (link column)
if (nColumn.title !== childColumn.title) {
const titleExists = childModel.columns.find(
(a) => a.title === childColumn.title,
);
if (titleExists) {
childColumn.title = generateUniqueName(
`${childColumn.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
Expand All @@ -804,7 +898,46 @@ export class ImportService {
user: param.user,
});
}
break;
}

// Rename fk child column
if (
nColumn.id ===
getIdOrExternalId(colOptions.fk_child_column_id)
) {
const relatedCol = param.data
.find(
(a) => a.model.id === colOptions.fk_related_model_id,
)
?.model.columns.find(
(a) => a.id === colOptions.fk_child_column_id,
);

if (relatedCol) {
if (nColumn.title !== relatedCol?.title) {
const titleExists = childModel.columns.find(
(a) => a.title === relatedCol.title,
);
if (titleExists) {
relatedCol.title = generateUniqueName(
`${relatedCol.title} copy`,
childModel.columns
.filter((a) => a.id !== nColumn.id)
.map((a) => a.title),
);
}

await this.columnsService.columnUpdate({
columnId: nColumn.id,
column: {
...nColumn,
column_name: relatedCol.column_name,
title: relatedCol.title,
},
user: param.user,
});
}
}
}
}
}
Expand Down

0 comments on commit 317f815

Please sign in to comment.