Skip to content
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

Jump to bottom

refactor: align backend response status with UI #4433

Merged
merged 9 commits into from
Dec 22, 2023
Merged

refactor: align backend response status with UI #4433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2168c91
refactor: deprecate missing status in favour of pending
frascuchon Dec 19, 2023
18d3da2
tests: covering new pending status
frascuchon Dec 19, 2023
cfc5a07
chore: update changelog
frascuchon Dec 19, 2023
6dd1b65
Apply suggestions from code review
frascuchon Dec 19, 2023
f978648
✨ Change`missing`status to `pending`
damianpumar Dec 20, 2023
7250bc3
Merge branch 'develop' into refactor/align-backend-response-status-wi…
frascuchon Dec 20, 2023
5ea3b10
Merge branch 'refactor/align-backend-response-status-with-UI' of gith…
frascuchon Dec 20, 2023
b1e8987
Apply suggestions from code review
frascuchon Dec 20, 2023
f7be670
Merge branch 'develop' into refactor/align-backend-response-status-wi…
frascuchon Dec 22, 2023
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
Prev Previous commit
Next Next commit
✨ Changemissingstatus to pending
  • Loading branch information
@damianpumar
damianpumar committed Dec 20, 2023
commit f978648ec9c63473c2d97fe0e4b140212584f13c
4 changes: 2 additions & 2 deletions frontend/e2e/common/metadata-api-mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const metadataPropertiesCompleted = async (page, datasetId) => {

export const mockRecordForMetadataFilter = async (page, datasetId) => {
await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft&metadata=correctness-langsmith%3Aincorrect`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft&metadata=correctness-langsmith%3Aincorrect`,
async (route) => {
await route.fulfill({
json: recordsMatchingMetadata,
Expand All @@ -98,7 +98,7 @@ export const mockRecordForMetadataFilter = async (page, datasetId) => {

export const mockRecordForMetadataSorting = async (page, datasetId) => {
await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft&sort_by=metadata.model-name%3Aasc`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft&sort_by=metadata.model-name%3Aasc`,
async (route) => {
await route.fulfill({
json: recordsMatchingMetadata,
Expand Down
12 changes: 6 additions & 6 deletions frontend/e2e/common/record-api-mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export const mockRecord = async (
await mockFields(page, datasetId);

await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand All @@ -166,7 +166,7 @@ export const mockTwoRecords = async (

await mockFields(page, datasetId);
await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand All @@ -190,7 +190,7 @@ export const mockRecordForLongAndShortQuestion = async (
await mockFields(page, datasetId);

await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand Down Expand Up @@ -273,7 +273,7 @@ export const mockRecordWith12Ranking = async (
await mockFields(page, datasetId);

await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand All @@ -283,7 +283,7 @@ export const mockRecordWith12Ranking = async (
}
);
await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=2&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=2&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand All @@ -305,7 +305,7 @@ export const mockRecordWithRating = async (
await mockFields(page, datasetId);

await page.route(
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=missing&response_status=draft`,
`*/**/api/v1/me/datasets/${datasetId}/records?include=responses&include=suggestions&offset=0&limit=10&response_status=pending&response_status=draft`,
async (route) => {
await route.fulfill({
json: {
Expand Down
3 changes: 1 addition & 2 deletions frontend/v1/infrastructure/repositories/RecordRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,14 +436,13 @@ export class RecordRepository {

private createParams(fromRecord: number, howMany: number, status: string) {
const offset = `${fromRecord - 1}`;
const backendStatus = status === "pending" ? "missing" : status;
const params = new URLSearchParams();

params.append("include", "responses");
params.append("include", "suggestions");
params.append("offset", offset);
params.append("limit", howMany.toString());
params.append("response_status", backendStatus);
params.append("response_status", status);

return params;
}
Expand Down
Loading