diff --git a/packages/api/src/entity/label.ts b/packages/api/src/entity/label.ts index fc45f2179..30d145f5d 100644 --- a/packages/api/src/entity/label.ts +++ b/packages/api/src/entity/label.ts @@ -28,4 +28,7 @@ export class Label { @CreateDateColumn() createdAt!: Date + + @Column('integer', { default: 0 }) + position!: number } diff --git a/packages/api/src/resolvers/labels/index.ts b/packages/api/src/resolvers/labels/index.ts index 9f600e5ff..acdbfa7f0 100644 --- a/packages/api/src/resolvers/labels/index.ts +++ b/packages/api/src/resolvers/labels/index.ts @@ -57,7 +57,7 @@ export const labelsResolver = authorized( relations: ['labels'], order: { labels: { - createdAt: 'DESC', + position: 'ASC', }, }, }) diff --git a/packages/api/test/resolvers/labels.test.ts b/packages/api/test/resolvers/labels.test.ts index afd3a6c85..c895044f4 100644 --- a/packages/api/test/resolvers/labels.test.ts +++ b/packages/api/test/resolvers/labels.test.ts @@ -101,7 +101,7 @@ describe('Labels API', () => { user: { id: user.id }, }) expect(res.body.data.labels.labels).to.eql( - labels.reverse().map((label) => ({ + labels.map((label) => ({ id: label.id, name: label.name, color: label.color,