From 1b974f0bbc02586d640be5b9d079b3c59ef58796 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 6 Oct 2023 15:04:36 +0200 Subject: [PATCH] Fix Requests usage again --- .../CorpusAnalysis/CorpusAnalysisStaticVisualization.js | 2 +- app/static/js/ResourceLists/AdminUserList.js | 2 +- app/static/js/ResourceLists/CorpusFileList.js | 8 ++++---- app/static/js/ResourceLists/CorpusFollowerList.js | 6 +++--- app/static/js/ResourceLists/CorpusList.js | 8 ++++---- app/static/js/ResourceLists/JobList.js | 4 ++-- app/static/js/ResourceLists/SpacyNLPPipelineModelList.js | 4 ++-- .../js/ResourceLists/TesseractOCRPipelineModelList.js | 4 ++-- app/static/js/resource-displays/corpus-display.js | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js b/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js index bdebb152..38c48c3c 100644 --- a/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js +++ b/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js @@ -75,7 +75,7 @@ class CorpusAnalysisStaticVisualization { getStopwords() { this.data.promises.getStopwords = new Promise((resolve, reject) => { - Requestscorpora.entity.getStopwords() + Requests.corpora.entity.getStopwords() .then((response) => { response.json() .then((json) => { diff --git a/app/static/js/ResourceLists/AdminUserList.js b/app/static/js/ResourceLists/AdminUserList.js index 3bbd73ca..0b8f0c16 100644 --- a/app/static/js/ResourceLists/AdminUserList.js +++ b/app/static/js/ResourceLists/AdminUserList.js @@ -91,7 +91,7 @@ class AdminUserList extends ResourceList { let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction; switch (listAction) { case 'delete': { - Requestsusers.entity.delete(itemId); + Requests.users.entity.delete(itemId); if (itemId === currentUserId) {window.location.href = '/';} break; } diff --git a/app/static/js/ResourceLists/CorpusFileList.js b/app/static/js/ResourceLists/CorpusFileList.js index af718a4d..9997b061 100644 --- a/app/static/js/ResourceLists/CorpusFileList.js +++ b/app/static/js/ResourceLists/CorpusFileList.js @@ -153,12 +153,12 @@ class CorpusFileList extends ResourceList { let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { if (currentUserId != this.userId) { - Requestscorpora.entity.files.ent.delete(this.corpusId, itemId) + Requests.corpora.entity.files.ent.delete(this.corpusId, itemId) .then(() => { window.location.reload(); }); } else { - Requestscorpora.entity.files.ent.delete(this.corpusId, itemId) + Requests.corpora.entity.files.ent.delete(this.corpusId, itemId) } }); modal.open(); @@ -250,12 +250,12 @@ class CorpusFileList extends ResourceList { confirmElement.addEventListener('click', (event) => { this.selectedItemIds.forEach(selectedItemId => { if (currentUserId != this.userId) { - Requestscorpora.entity.files.ent.delete(this.corpusId, selectedItemId) + Requests.corpora.entity.files.ent.delete(this.corpusId, selectedItemId) .then(() => { window.location.reload(); }); } else { - Requestscorpora.entity.files.ent.delete(this.corpusId, selectedItemId); + Requests.corpora.entity.files.ent.delete(this.corpusId, selectedItemId); } }); this.selectedItemIds.clear(); diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index d4950a06..ca70a6c7 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -124,7 +124,7 @@ class CorpusFollowerList extends ResourceList { case 'update-role': { let followerId = listItemElement.dataset.followerId; let roleName = event.target.value; - Requestscorpora.entity.followers.entity.role.update(this.corpusId, followerId, roleName); + Requests.corpora.entity.followers.entity.role.update(this.corpusId, followerId, roleName); break; } default: { @@ -144,12 +144,12 @@ class CorpusFollowerList extends ResourceList { case 'unfollow-request': { let followerId = listItemElement.dataset.followerId; if (currentUserId != this.userId) { - Requestscorpora.entity.followers.entity.delete(this.corpusId, followerId) + Requests.corpora.entity.followers.entity.delete(this.corpusId, followerId) .then(() => { window.location.reload(); }); } else { - Requestscorpora.entity.followers.entity.delete(this.corpusId, followerId); + Requests.corpora.entity.followers.entity.delete(this.corpusId, followerId); } break; } diff --git a/app/static/js/ResourceLists/CorpusList.js b/app/static/js/ResourceLists/CorpusList.js index 0906eaac..985ff1d1 100644 --- a/app/static/js/ResourceLists/CorpusList.js +++ b/app/static/js/ResourceLists/CorpusList.js @@ -171,12 +171,12 @@ class CorpusList extends ResourceList { let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { if (!values['is-owner']) { - Requestscorpora.entity.followers.entity.delete(itemId, currentUserId) + Requests.corpora.entity.followers.entity.delete(itemId, currentUserId) .then((response) => { window.location.reload(); }); } else { - Requestscorpora.entity.delete(itemId); + Requests.corpora.entity.delete(itemId); } }); modal.open(); @@ -272,9 +272,9 @@ class CorpusList extends ResourceList { let listItem = this.listjs.get('id', selectedItemId)[0].elm; let values = this.listjs.get('id', listItem.dataset.id)[0].values(); if (values['is-owner']) { - Requestscorpora.entity.delete(selectedItemId); + Requests.corpora.entity.delete(selectedItemId); } else { - Requestscorpora.entity.followers.entity.delete(selectedItemId, currentUserId); + Requests.corpora.entity.followers.entity.delete(selectedItemId, currentUserId); setTimeout(() => { window.location.reload(); }, 1000); diff --git a/app/static/js/ResourceLists/JobList.js b/app/static/js/ResourceLists/JobList.js index eb9d7b7a..1cb3ea60 100644 --- a/app/static/js/ResourceLists/JobList.js +++ b/app/static/js/ResourceLists/JobList.js @@ -143,7 +143,7 @@ class JobList extends ResourceList { ); let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { - Requestsjobs.entity.delete(itemId); + Requests.jobs.entity.delete(itemId); }); modal.open(); break; @@ -228,7 +228,7 @@ class JobList extends ResourceList { let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { this.selectedItemIds.forEach(selectedItemId => { - Requestsjobs.entity.delete(selectedItemId); + Requests.jobs.entity.delete(selectedItemId); }); this.selectedItemIds.clear(); this.renderingItemSelection(); diff --git a/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js b/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js index 4cb58e2f..46d3739d 100644 --- a/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js +++ b/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js @@ -120,7 +120,7 @@ class SpaCyNLPPipelineModelList extends ResourceList { switch (listAction) { case 'toggle-is-public': { let newIsPublicValue = listActionElement.checked; - Requestscontributions.spacy_nlp_pipeline_models.entity.isPublic.update(itemId, newIsPublicValue) + Requests.contributions.spacy_nlp_pipeline_models.entity.isPublic.update(itemId, newIsPublicValue) .catch((response) => { listActionElement.checked = !newIsPublicValue; }); @@ -169,7 +169,7 @@ class SpaCyNLPPipelineModelList extends ResourceList { ); let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { - Requestscontributions.spacy_nlp_pipeline_models.entity.delete(itemId); + Requests.contributions.spacy_nlp_pipeline_models.entity.delete(itemId); }); modal.open(); break; diff --git a/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js b/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js index 83156320..765f44a6 100644 --- a/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js +++ b/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js @@ -129,7 +129,7 @@ class TesseractOCRPipelineModelList extends ResourceList { switch (listAction) { case 'toggle-is-public': { let newIsPublicValue = listActionElement.checked; - Requestscontributions.tesseract_ocr_pipeline_models.entity.isPublic.update(itemId, newIsPublicValue) + Requests.contributions.tesseract_ocr_pipeline_models.entity.isPublic.update(itemId, newIsPublicValue) .catch((response) => { listActionElement.checked = !newIsPublicValue; }); @@ -178,7 +178,7 @@ class TesseractOCRPipelineModelList extends ResourceList { ); let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { - Requestscontributions.tesseract_ocr_pipeline_models.entity.delete(itemId); + Requests.contributions.tesseract_ocr_pipeline_models.entity.delete(itemId); }); modal.open(); break; diff --git a/app/static/js/resource-displays/corpus-display.js b/app/static/js/resource-displays/corpus-display.js index 52b08fbf..f68977c7 100644 --- a/app/static/js/resource-displays/corpus-display.js +++ b/app/static/js/resource-displays/corpus-display.js @@ -5,7 +5,7 @@ ResourceDisplays.CorpusDisplay = class CorpusDisplay extends ResourceDisplays.Ba this.displayElement .querySelector('.action-button[data-action="build-request"]') .addEventListener('click', (event) => { - Requestscorpora.entity.build(this.corpusId); + Requests.corpora.entity.build(this.corpusId); }); }