diff --git a/cypress/integration/vault.spec.js b/cypress/integration/vault.spec.js --- a/cypress/integration/vault.spec.js +++ b/cypress/integration/vault.spec.js @@ -36,11 +36,11 @@ // objectType : {'directory', 'revision'} function genVaultCookingResponse(objectType, objectId, status, message, fetchUrl) { return { - 'obj_type': objectType, + 'type': objectType, 'id': 1, - 'progress_message': message, - 'status': status, - 'obj_id': objectId, + 'progress_msg': message, + 'task_status': status, + 'object_id': objectId, 'fetch_url': fetchUrl }; }; @@ -80,12 +80,12 @@ this.vaultFetchRevisionUrl = this.Urls.api_1_vault_fetch_revision_gitfast(this.revision); vaultItems[0] = { - 'object_type': 'revision', + 'type': 'revision', 'object_id': this.revision, 'email': '', - 'status': 'done', + 'task_status': 'done', 'fetch_url': `/api/1/vault/revision/${this.revision}/gitfast/raw/`, - 'progress_message': null + 'progress_msg': null }; }); diff --git a/swh/web/assets/src/bundles/vault/vault-ui.js b/swh/web/assets/src/bundles/vault/vault-ui.js --- a/swh/web/assets/src/bundles/vault/vault-ui.js +++ b/swh/web/assets/src/bundles/vault/vault-ui.js @@ -146,10 +146,10 @@ .then(cookingTasks => { let table = $('#vault-cooking-tasks tbody'); for (let i = 0; i < cookingTasks.length; ++i) { - let cookingTask = tasks[cookingTasks[i].obj_id]; - cookingTask.status = cookingTasks[i].status; + let cookingTask = tasks[cookingTasks[i].object_id]; + cookingTask.status = cookingTasks[i].task_status; cookingTask.fetch_url = cookingTasks[i].fetch_url; - cookingTask.progress_message = cookingTasks[i].progress_message; + cookingTask.progress_message = cookingTasks[i].progress_msg; } for (let i = 0; i < vaultCookingTasks.length; ++i) { let cookingTask = vaultCookingTasks[i]; @@ -193,7 +193,9 @@ localStorage.setItem('swh-vault-cooking-tasks', JSON.stringify(vaultCookingTasks)); checkVaultId = setTimeout(checkVaultCookingTasks, pollingInterval); }) - .catch(() => {}); + .catch(error => { + console.log('Error when fetching vault cooking tasks:', error); + }); } export function removeCookingTaskInfo(tasksToRemove) { diff --git a/swh/web/tests/api/views/test_vault.py b/swh/web/tests/api/views/test_vault.py --- a/swh/web/tests/api/views/test_vault.py +++ b/swh/web/tests/api/views/test_vault.py @@ -36,10 +36,10 @@ ) stub_cook = { "fetch_url": fetch_url, - "obj_id": obj_id, - "obj_type": obj_type, + "object_id": obj_id, + "type": obj_type, "progress_message": None, - "status": "done", + "task_status": "done", "task_uuid": "de75c902-5ee5-4739-996e-448376a93eff", } stub_fetch = b"content"