Skip to content

Commit 5108afb

Browse files
authored
Rename setting detail original filters to original filter for v0.30.0 (#1402)
1 parent 2f560cc commit 5108afb

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/types/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ export type TaskObject = Omit<EnqueuedTaskObject, 'taskUid'> & {
319319
deletedTasks?: number
320320

321321
// Query parameters used to filter the tasks
322-
originalFilters?: string
322+
originalFilter?: string
323323
}
324324
error: MeiliSearchErrorInfo | null
325325
duration: string

tests/task.test.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
364364
)
365365

366366
expect(cancelationTask.type).toEqual(TaskTypes.TASK_CANCELATION)
367-
expect(cancelationTask.details.originalFilters).toEqual(
367+
expect(cancelationTask.details.originalFilter).toEqual(
368368
`uids=${addDocumentsTask.taskUid}`
369369
)
370370
})
@@ -441,7 +441,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
441441
const task = await client.waitForTask(enqueuedTask.taskUid)
442442

443443
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
444-
expect(task.details?.originalFilters).toContain('uids=')
444+
expect(task.details?.originalFilter).toContain('uids=')
445445
expect(task.details?.matchedTasks).toBeDefined()
446446
expect(task.details?.canceledTasks).toBeDefined()
447447
})
@@ -456,7 +456,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
456456
const task = await client.waitForTask(enqueuedTask.taskUid)
457457

458458
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
459-
expect(task.details?.originalFilters).toEqual('indexUids=movies_test')
459+
expect(task.details?.originalFilter).toEqual('indexUids=movies_test')
460460
})
461461

462462
// cancel: type
@@ -472,7 +472,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
472472
const task = await client.waitForTask(enqueuedTask.taskUid)
473473

474474
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
475-
expect(task.details?.originalFilters).toEqual(
475+
expect(task.details?.originalFilter).toEqual(
476476
'types=documentAdditionOrUpdate%2CdocumentDeletion'
477477
)
478478
})
@@ -487,7 +487,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
487487
const task = await client.waitForTask(enqueuedTask.taskUid)
488488

489489
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
490-
expect(task.details?.originalFilters).toEqual(
490+
expect(task.details?.originalFilter).toEqual(
491491
'statuses=enqueued%2Cprocessing'
492492
)
493493
})
@@ -504,7 +504,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
504504
const task = await client.waitForTask(enqueuedTask.taskUid)
505505

506506
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
507-
expect(task.details?.originalFilters).toContain('beforeEnqueuedAt')
507+
expect(task.details?.originalFilter).toContain('beforeEnqueuedAt')
508508
})
509509

510510
// cancel: afterEnqueuedAt
@@ -519,7 +519,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
519519
const task = await client.waitForTask(enqueuedTask.taskUid)
520520

521521
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
522-
expect(task.details?.originalFilters).toContain('afterEnqueuedAt')
522+
expect(task.details?.originalFilter).toContain('afterEnqueuedAt')
523523
})
524524

525525
// cancel: beforeStartedAt
@@ -534,7 +534,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
534534
const task = await client.waitForTask(enqueuedTask.taskUid)
535535

536536
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
537-
expect(task.details?.originalFilters).toContain('beforeStartedAt')
537+
expect(task.details?.originalFilter).toContain('beforeStartedAt')
538538
})
539539

540540
// cancel: afterStartedAt
@@ -549,7 +549,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
549549
const task = await client.waitForTask(enqueuedTask.taskUid)
550550

551551
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
552-
expect(task.details?.originalFilters).toContain('afterStartedAt')
552+
expect(task.details?.originalFilter).toContain('afterStartedAt')
553553
})
554554

555555
// cancel: beforeFinishedAt
@@ -564,7 +564,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
564564
const task = await client.waitForTask(enqueuedTask.taskUid)
565565

566566
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
567-
expect(task.details?.originalFilters).toContain('beforeFinishedAt')
567+
expect(task.details?.originalFilter).toContain('beforeFinishedAt')
568568
})
569569

570570
// cancel: afterFinishedAt
@@ -579,7 +579,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
579579
const task = await client.waitForTask(enqueuedTask.taskUid)
580580

581581
expect(task.type).toEqual(TaskTypes.TASK_CANCELATION)
582-
expect(task.details?.originalFilters).toContain('afterFinishedAt')
582+
expect(task.details?.originalFilter).toContain('afterFinishedAt')
583583
})
584584

585585
// cancel error code: MISSING_TASK_FILTER
@@ -644,7 +644,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
644644
const deleteTask = await client.waitForTask(enqueuedTask.taskUid)
645645

646646
expect(deleteTask.type).toEqual(TaskTypes.TASK_DELETION)
647-
expect(deleteTask.details?.originalFilters).toEqual(
647+
expect(deleteTask.details?.originalFilter).toEqual(
648648
'types=documentAdditionOrUpdate%2CdocumentDeletion'
649649
)
650650
})
@@ -659,7 +659,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
659659
const task = await client.waitForTask(enqueuedTask.taskUid)
660660

661661
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
662-
expect(task.details?.originalFilters).toEqual(
662+
expect(task.details?.originalFilter).toEqual(
663663
'statuses=enqueued%2Cprocessing'
664664
)
665665
})
@@ -676,7 +676,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
676676
const task = await client.waitForTask(enqueuedTask.taskUid)
677677

678678
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
679-
expect(task.details?.originalFilters).toContain('beforeEnqueuedAt')
679+
expect(task.details?.originalFilter).toContain('beforeEnqueuedAt')
680680
})
681681

682682
// delete: afterEnqueuedAt
@@ -691,7 +691,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
691691
const task = await client.waitForTask(enqueuedTask.taskUid)
692692

693693
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
694-
expect(task.details?.originalFilters).toContain('afterEnqueuedAt')
694+
expect(task.details?.originalFilter).toContain('afterEnqueuedAt')
695695
})
696696

697697
// delete: beforeStartedAt
@@ -706,7 +706,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
706706
const task = await client.waitForTask(enqueuedTask.taskUid)
707707

708708
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
709-
expect(task.details?.originalFilters).toContain('beforeStartedAt')
709+
expect(task.details?.originalFilter).toContain('beforeStartedAt')
710710
})
711711

712712
// delete: afterStartedAt
@@ -721,7 +721,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
721721
const task = await client.waitForTask(enqueuedTask.taskUid)
722722

723723
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
724-
expect(task.details?.originalFilters).toContain('afterStartedAt')
724+
expect(task.details?.originalFilter).toContain('afterStartedAt')
725725
})
726726

727727
// delete: beforeFinishedAt
@@ -736,7 +736,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
736736
const task = await client.waitForTask(enqueuedTask.taskUid)
737737

738738
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
739-
expect(task.details?.originalFilters).toContain('beforeFinishedAt')
739+
expect(task.details?.originalFilter).toContain('beforeFinishedAt')
740740
})
741741

742742
// delete: afterFinishedAt
@@ -751,7 +751,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
751751
const task = await client.waitForTask(enqueuedTask.taskUid)
752752

753753
expect(task.type).toEqual(TaskTypes.TASK_DELETION)
754-
expect(task.details?.originalFilters).toContain('afterFinishedAt')
754+
expect(task.details?.originalFilter).toContain('afterFinishedAt')
755755
})
756756

757757
test(`${permission} key: Get all indexes tasks with index instance`, async () => {

0 commit comments

Comments
 (0)