Skip to content

fix export and pot it adjustment #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brauliodiez merged 7 commits into from
Nov 16, 2025
Merged

fix export and pot it adjustment #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4604c2f
Let table original position when still overlaps after making all attemps
JuanBerrocal Oct 23, 2025
3892a50
Fix code to pass test: should properly adjusts tables to avoid overla…
JuanBerrocal Oct 28, 2025
8a6a623
fix (#573 note): correct LINE_HEIGHT constant to fix last line text c…
gustedeveloper Nov 13, 2025
b73abe5
test finished
JuanBerrocal Nov 16, 2025
4d58ea8
Merge branch 'Lemoncode:vnext' into fixbug/#555-export-tables-overlap…
JuanBerrocal Nov 16, 2025
4434197
Merge pull request #574 from Lemoncode/feature/#573-fix-note-last-lin…
brauliodiez Nov 16, 2025
5e5875b
Merge pull request #563 from JuanBerrocal/fixbug/#555-export-tables-o…
brauliodiez Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pods/canvas/components/note/note.const.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const PENCIL_ICON_WIDTH = 25;
const PENCIL_ICON_HEIGHT = 25;
const PENCIL_MARGIN_RIGHT = 10;
const GAP = 10;
const LINE_HEIGHT = 20;
const LINE_HEIGHT = 21;

export const NOTE_COMPONENT_CONST = {
TITLE_CONTAINER_HEIGHT,
Expand Down
138 changes: 138 additions & 0 deletions src/pods/toolbar/components/export-button/export-button.business.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,6 +1946,7 @@ describe('export-button.business', () => {

// Act
const result = placeAllTablesWithoutOverlap(tables);


// Assert
result.forEach((table, index) => {
Expand All @@ -1962,6 +1963,122 @@ describe('export-button.business', () => {
}
});
});

it('Wide tables shouldnt be on the left border overlapping other tables after relocating. ', () => {
// Arrange
const tables: TableVm[] = [
{
id: '1',
fields: [
{ id: '1', PK: true, name: 'campo1', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '2', PK: true, name: 'campo2', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '3', PK: true, name: 'campo3', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '4', PK: true, name: 'campo4', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '5', PK: true, name: 'campo5', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '6', PK: true, name: 'campo6', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '7', PK: true, name: 'campo7', type: 'string', children: [], isCollapsed: false, isArray: false},
],
tableName: 'table1',
x: 100,
y: 300
},
{
id: '2',
fields: [
{ id: '1', PK: true, name: 'campo1', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '2', PK: true, name: 'campo2', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '3', PK: true, name: 'campo3', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '4', PK: true, name: 'campo4', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '5', PK: true, name: 'campo5', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '6', PK: true, name: 'campo6', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '7', PK: true, name: 'campo7', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '8', PK: true, name: 'campo8', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '9', PK: true, name: 'campo9', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '10', PK: true, name: 'campo10', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '11', PK: true, name: 'campo11', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '12', PK: true, name: 'campo12', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '13', PK: true, name: 'campo13', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '14', PK: true, name: 'campo14', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '15', PK: true, name: 'campo15', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '16', PK: true, name: 'campo16', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '17', PK: true, name: 'campo17', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '18', PK: true, name: 'campo18', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '19', PK: true, name: 'campo19', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '20', PK: true, name: 'campo20', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '21', PK: true, name: 'campo21', type: 'string', children: [], isCollapsed: false, isArray: false},
{ id: '22', PK: true, name: 'campo22', type: 'string', children: [], isCollapsed: false, isArray: false},
],
tableName: 'table2',
x: 450,
y: 100,
width: 780
},
{
id: '3',
fields: [],
tableName: 'table3',
x: 1200,
y: 700
},
{
id: '4',
fields: [],
tableName: 'table4',
x: 1500,
y: 100
},
{
id: '5',
fields: [],
tableName: 'table5',
x: 300,
y: 100,
},
{
id: '6',
fields: [],
tableName: 'table6',
x: 100,
y: 150,
},
{
id: '7',
fields: [],
tableName: 'table7',
x: 150,
y: 150,
},
];

// Act
const result = placeAllTablesWithoutOverlap(tables);


// Assert
result.forEach((table, index) => {
const tableWidth = table.width ?? TABLE_CONST.DEFAULT_TABLE_WIDTH;
const tableHeight = calculateTableHeight(table.fields);
for (let i = 0; i < result.length; i++) {
if (i !== index) {
const iWidth = result[i].width ?? TABLE_CONST.DEFAULT_TABLE_WIDTH;
const iHeight = calculateTableHeight(result[i].fields);

const isOverlapping = !(
table.x >= result[i].x + iWidth ||
table.x + tableWidth <= result[i].x ||
table.y >= result[i].y + iHeight ||
table.y + tableHeight <= result[i].y
);

const hasBadPosition = (isOverlapping) &&
(table.x <= TABLE_CONST.TABLE_SHIFT_DISTANCE) &&
(tableWidth > TABLE_CONST.DEFAULT_TABLE_WIDTH);

expect(hasBadPosition).toBe(false);
}
}
});
});
});
});

Expand All @@ -1981,6 +2098,27 @@ describe('getPropertyJsonSchema', () => {
//Assert
expect(result).toBe('"fieldName": { bsonType: "string" }');
});
});



describe('getPropertyJsonSchema', () => {
it('should generate json schema for non-array field', () => {
//Arrange
const field: FieldVm = {
id: '1',
PK: false,
name: 'fieldName',
type: 'string',
};

//Act
const result = getPropertyJsonSchema(field);

//Assert
expect(result).toBe('"fieldName": { bsonType: "string" }');
});


it('should generate json schema for array field', () => {
//Arrange
Expand Down
10 changes: 8 additions & 2 deletions src/pods/toolbar/components/export-button/export-button.business.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ export const placeTableWithoutOverlap = (
): TableVm => {
let newTable = table;
let attempts = 0;

while (
doesTableOverlap(newTable, tables) &&
attempts < TABLE_CONST.MAX_PLACEMENT_ATTEMPTS
attempts < TABLE_CONST.MAX_PLACEMENT_ATTEMPTS
) {
newTable = {
...newTable,
Expand All @@ -120,6 +120,12 @@ export const placeTableWithoutOverlap = (
attempts++;
}

// If relocated table still overlaps, restore original position.
if ((newTable.width) && (newTable.width > TABLE_CONST.DEFAULT_TABLE_WIDTH) && doesTableOverlap(newTable, tables)) {
newTable.x = table.x;
newTable.y = table.y;
}

return newTable;
};

Expand Down