Skip to content

Commit 79af2d2

Browse files
committed
fix(editor): change the delete column endpoint to not take request body
1 parent 69842f5 commit 79af2d2

File tree

5 files changed

+8
-23
lines changed

5 files changed

+8
-23
lines changed

packages/@n8n/api-types/src/dto/data-store/delete-data-store-column.dto.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/@n8n/api-types/src/dto/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,4 @@ export {
9191
export { CreateDataStoreColumnDto } from './data-store/create-data-store-column.dto';
9292
export { AddDataStoreRowsDto } from './data-store/add-data-store-rows.dto';
9393
export { AddDataStoreColumnDto } from './data-store/add-data-store-column.dto';
94-
export { DeleteDataStoreColumnDto } from './data-store/delete-data-store-column.dto';
9594
export { MoveDataStoreColumnDto } from './data-store/move-data-store-column.dto';

packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,7 @@ describe('dataStore', () => {
484484
});
485485

486486
// ACT
487-
const result = await dataStoreService.deleteColumn(dataStoreId, {
488-
columnId: c1.id,
489-
});
487+
const result = await dataStoreService.deleteColumn(dataStoreId, c1.id);
490488

491489
// ASSERT
492490
expect(result).toEqual(true);
@@ -520,9 +518,7 @@ describe('dataStore', () => {
520518
const { id: dataStoreId } = dataStore!;
521519

522520
// ACT
523-
const result = dataStoreService.deleteColumn(dataStoreId, {
524-
columnId: 'thisIsNotAnId',
525-
});
521+
const result = dataStoreService.deleteColumn(dataStoreId, 'thisIsNotAnId');
526522

527523
// ASSERT
528524
await expect(result).rejects.toThrow(
@@ -542,9 +538,7 @@ describe('dataStore', () => {
542538
});
543539

544540
// ACT
545-
const result = dataStoreService.deleteColumn('this is not an id', {
546-
columnId: c1.id,
547-
});
541+
const result = dataStoreService.deleteColumn('this is not an id', c1.id);
548542

549543
// ASSERT
550544
await expect(result).rejects.toThrow(

packages/cli/src/modules/data-store/data-store.controller.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
AddDataStoreRowsDto,
33
AddDataStoreColumnDto,
44
CreateDataStoreDto,
5-
DeleteDataStoreColumnDto,
65
ListDataStoreContentQueryDto,
76
ListDataStoreQueryDto,
87
MoveDataStoreColumnDto,
@@ -94,15 +93,15 @@ export class DataStoreController {
9493
return await this.dataStoreService.addColumn(dataStoreId, dto);
9594
}
9695

97-
@Delete('/:dataStoreId/columns')
96+
@Delete('/:dataStoreId/columns/:columnId')
9897
@ProjectScope('dataStore:update')
9998
async deleteColumn(
10099
_req: AuthenticatedRequest<{ projectId: string }>,
101100
_res: Response,
102101
@Param('dataStoreId') dataStoreId: string,
103-
@Body dto: DeleteDataStoreColumnDto,
102+
@Param('columnId') columnId: string,
104103
) {
105-
return await this.dataStoreService.deleteColumn(dataStoreId, dto);
104+
return await this.dataStoreService.deleteColumn(dataStoreId, columnId);
106105
}
107106

108107
@Patch('/:dataStoreId/columns/:columnId/move')

packages/cli/src/modules/data-store/data-store.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type {
22
AddDataStoreColumnDto,
33
CreateDataStoreDto,
4-
DeleteDataStoreColumnDto,
54
ListDataStoreContentQueryDto,
65
MoveDataStoreColumnDto,
76
DataStoreListOptions,
@@ -113,14 +112,14 @@ export class DataStoreService {
113112
return true;
114113
}
115114

116-
async deleteColumn(dataStoreId: string, dto: DeleteDataStoreColumnDto) {
115+
async deleteColumn(dataStoreId: string, columnId: string) {
117116
await this.validateDataStoreExists(
118117
dataStoreId,
119118
`Tried to delete column from non-existent data store '${dataStoreId}'`,
120119
);
121120

122121
const existingColumnMatch = await this.dataStoreColumnRepository.findOneBy({
123-
id: dto.columnId,
122+
id: columnId,
124123
dataStoreId,
125124
});
126125

0 commit comments

Comments
 (0)