Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus

app/static/js/Requests/Requests.js

@@ -11,6 +11,14 @@ Requests.JSONfetch = (input, init={}) => {
     fetch(input, Utils.mergeObjectsDeep(init, fixedInit))
       .then(
         (response) => {
+          if (response.ok) {
+            resolve(response.clone());
+          } else {
+            reject(response);
+          }
+          if (response.status === 204) {
+            return;
+          } 
           response.json()
             .then(
               (json) => {
@@ -22,11 +30,6 @@ Requests.JSONfetch = (input, init={}) => {
                 app.flash(`[${response.status}]: ${response.statusText}`, 'error');
               }
             );
-          if (response.ok) {
-            resolve(response);
-          } else {
-            reject(response);
-          }
         },
         (response) => {
           app.flash('Something went wrong', 'error');

app/static/js/Requests/corpora/corpora.js

@@ -4,9 +4,9 @@
 *****************************************************************************/
 Requests.corpora = {};
 
-Requests.corpora.ent = {};
+Requests.corpora.entity = {};
 
-Requests.corpora.ent.delete = (corpusId) => {
+Requests.corpora.entity.delete = (corpusId) => {
   let input = `/corpora/${corpusId}`;
   let init = {
     method: 'DELETE'
@@ -14,7 +14,7 @@ Requests.corpora.ent.delete = (corpusId) => {
   return Requests.JSONfetch(input, init);
 };
 
-Requests.corpora.ent.build = (corpusId) => {
+Requests.corpora.entity.build = (corpusId) => {
   let input = `/corpora/${corpusId}/build`;
   let init = {
     method: 'POST',
@@ -22,9 +22,18 @@ Requests.corpora.ent.build = (corpusId) => {
   return Requests.JSONfetch(input, init);
 };
 
-Requests.corpora.ent.isPublic = {};
+Requests.corpora.entity.generateShareLink = (corpusId, role, expiration) => {
+  let input = `/corpora/${corpusId}/generate-corpus-share-link`;
+  let init = {
+    method: 'POST',
+    body: JSON.stringify({role: role, expiration: expiration})
+  };
+  return Requests.JSONfetch(input, init);
+};
 
-Requests.corpora.ent.isPublic.update = (corpusId, value) => {
+Requests.corpora.entity.isPublic = {};
+
+Requests.corpora.entity.isPublic.update = (corpusId, value) => {
   let input = `/corpora/${corpusId}/is_public`;
   let init = {
     method: 'PUT',
@@ -33,46 +42,5 @@ Requests.corpora.ent.isPublic.update = (corpusId, value) => {
   return Requests.JSONfetch(input, init);
 };
 
-Requests.corpora.ent.files = {};
 
-Requests.corpora.ent.files.ent = {};
 
-Requests.corpora.ent.files.ent.delete = (corpusId, corpusFileId) => {
-  let input = `/corpora/${corpusId}/files/${corpusFileId}`;
-  let init = {
-    method: 'DELETE',
-  };
-  return Requests.JSONfetch(input, init);
-};
-
-Requests.corpora.ent.followers = {};
-
-Requests.corpora.ent.followers.add = (corpusId, usernames) => {
-  let input = `/corpora/${corpusId}/followers`;
-  let init = {
-    method: 'POST',
-    body: JSON.stringify(usernames)
-  };
-  return Requests.JSONfetch(input, init);
-};
-
-Requests.corpora.ent.followers.ent = {};
-
-Requests.corpora.ent.followers.ent.delete = (corpusId, followerId) => {
-  let input = `/corpora/${corpusId}/followers/${followerId}`;
-  let init = {
-    method: 'DELETE',
-  };
-  return Requests.JSONfetch(input, init);
-};
-
-Requests.corpora.ent.followers.ent.role = {};
-
-Requests.corpora.ent.followers.ent.role.update = (corpusId, followerId, value) => {
-  let input = `/corpora/${corpusId}/followers/${followerId}/role`;
-  let init = {
-    method: 'PUT',
-    body: JSON.stringify(value)
-  };
-  return Requests.JSONfetch(input, init);
-};

app/static/js/Requests/corpora/files.js

@@ -0,0 +1,15 @@
+/*****************************************************************************
+* Corpora                                                                    *
+* Fetch requests for /corpora/<entity>/files routes                          *
+*****************************************************************************/
+Requests.corpora.entity.files = {};
+
+Requests.corpora.entity.files.ent = {};
+
+Requests.corpora.entity.files.ent.delete = (corpusId, corpusFileId) => {
+  let input = `/corpora/${corpusId}/files/${corpusFileId}`;
+  let init = {
+    method: 'DELETE',
+  };
+  return Requests.JSONfetch(input, init);
+};

app/static/js/Requests/corpora/followers.js

@@ -0,0 +1,35 @@
+/*****************************************************************************
+* Corpora                                                                    *
+* Fetch requests for /corpora/<entity>/followers routes                      *
+*****************************************************************************/
+Requests.corpora.entity.followers = {};
+
+Requests.corpora.entity.followers.add = (corpusId, usernames) => {
+  let input = `/corpora/${corpusId}/followers`;
+  let init = {
+    method: 'POST',
+    body: JSON.stringify(usernames)
+  };
+  return Requests.JSONfetch(input, init);
+};
+
+Requests.corpora.entity.followers.entity = {};
+
+Requests.corpora.entity.followers.entity.delete = (corpusId, followerId) => {
+  let input = `/corpora/${corpusId}/followers/${followerId}`;
+  let init = {
+    method: 'DELETE',
+  };
+  return Requests.JSONfetch(input, init);
+};
+
+Requests.corpora.entity.followers.entity.role = {};
+
+Requests.corpora.entity.followers.entity.role.update = (corpusId, followerId, value) => {
+  let input = `/corpora/${corpusId}/followers/${followerId}/role`;
+  let init = {
+    method: 'PUT',
+    body: JSON.stringify(value)
+  };
+  return Requests.JSONfetch(input, init);
+};

app/static/js/ResourceDisplays/CorpusDisplay.js

@@ -5,7 +5,7 @@ class CorpusDisplay extends ResourceDisplay {
     this.displayElement
       .querySelector('.action-button[data-action="build-request"]')
       .addEventListener('click', (event) => {
-        Requests.corpora.corpus.build(this.corpusId);
+        Requests.corpora.entity.build(this.corpusId);
       });
   }
 

app/static/js/ResourceLists/CorpusFollowerList.js

@@ -122,7 +122,7 @@ class CorpusFollowerList extends ResourceList {
       case 'update-role': {
         let followerId = listItemElement.dataset.followerId;
         let roleName = event.target.value;
-        Utils.updateCorpusFollowerRole(this.corpusId, followerId, roleName);
+        Requests.corpora.entity.followers.entity.role.update(this.corpusId, followerId, roleName);
         break;
       }
       default: {
@@ -141,7 +141,7 @@ class CorpusFollowerList extends ResourceList {
     switch (listAction) {
       case 'unfollow-request': {
         let followerId = listItemElement.dataset.followerId;
-        Utils.unfollowCorpusRequest(this.corpusId, followerId);
+        Requests.corpora.entity.followers.entity.delete(this.corpusId, followerId);
         break;
       }
       case 'view': {

app/static/js/ResourceLists/CorpusList.js

@@ -95,7 +95,7 @@ class CorpusList extends ResourceList {
     let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction;
     switch (listAction) {
       case 'delete-request': {
-        Utils.deleteCorpusRequest(this.userId, itemId);
+        Requests.corpora.entity.delete(this.userId, itemId);
         break;
       }
       case 'view': {

app/static/js/Utils.js

@@ -69,151 +69,6 @@ class Utils {
     return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2));
   }
 
-  static updateCorpusIsPublicRequest(corpusId, isPublic) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/corpora/${corpusId}/is_public`;
-      let fetchOptions = {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(isPublic)
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              app.flash(`Corpus is now ${isPublic ? 'public' : 'private'}`, 'corpus');
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static updateCorpusFollowerRole(corpusId, followerId, roleName) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/corpora/${corpusId}/followers/${followerId}/role`;
-      let fetchOptions = {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({role: roleName})
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              app.flash('Role updated', 'corpus');
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static addCorpusFollowersRequest(corpusId, usernames) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/corpora/${corpusId}/followers/add`;
-      let fetchOptions = {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(usernames)
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              app.flash(`${usernames.length > 1 ? 'Users are' : 'User is'} following now`, 'corpus');
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static buildCorpusRequest(userId, corpusId) {
-    return new Promise((resolve, reject) => {
-      let corpus;
-      try {
-        corpus = app.data.users[userId].corpora[corpusId];
-      } catch (error) {
-        corpus = {};
-      }
-
-      fetch(`/corpora/${corpusId}/build`, {method: 'POST', headers: {Accept: 'application/json'}})
-        .then(
-          (response) => {
-            if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);}
-            if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);}
-            if (response.status === 409) {app.flash('Conflict', 'error'); reject(response);}
-            app.flash(`Corpus "${corpus?.title}" marked for building`, 'corpus');
-            resolve(response);
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static unfollowCorpusRequest(corpusId, followerId) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/corpora/${corpusId}/followers/${followerId}/unfollow`;
-      let fetchOptions = {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        }
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              app.flash(`User unfollowed from Corpus`, 'corpus');
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
   static deleteCorpusRequest(userId, corpusId) {
     return new Promise((resolve, reject) => {
       let corpus;
@@ -326,116 +181,6 @@ class Utils {
     });
   }
 
-  static deleteSpaCyNLPPipelineModelRequest(userId, spaCyNLPPipelineModelId) {
-    return new Promise((resolve, reject) => {
-      let spaCyNLPPipelineModel;
-      try {
-        spaCyNLPPipelineModel = app.data.users[userId].spacy_nlp_pipeline_models[spaCyNLPPipelineModelId];
-      } catch (error) {
-        spaCyNLPPipelineModel = {};
-      }
-
-      let modalElement = Utils.HTMLToElement(
-        `
-          <div class="modal">
-            <div class="modal-content">
-              <h4>Confirm SpaCy NLP Pipeline Model deletion</h4>
-              <p>Do you really want to delete the SpaCy NLP Pipeline Model <b>${spaCyNLPPipelineModel?.title}</b>? All files will be permanently deleted!</p>
-            </div>
-            <div class="modal-footer">
-              <a class="action-button btn modal-close waves-effect waves-light" data-action="cancel">Cancel</a>
-              <a class="action-button btn modal-close red waves-effect waves-light" data-action="confirm">Delete</a>
-            </div>
-          </div>
-        `
-      );
-      document.querySelector('#modals').appendChild(modalElement);
-      let modal = M.Modal.init(
-        modalElement,
-        {
-          dismissible: false,
-          onCloseEnd: () => {
-            modal.destroy();
-            modalElement.remove();
-          }
-        }
-      );
-      let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]');
-      confirmElement.addEventListener('click', (event) => {
-        let spaCyNLPPipelineModelTitle = spaCyNLPPipelineModel?.title;
-        fetch(`/contributions/spacy-nlp-pipeline-models/${spaCyNLPPipelineModelId}`, {method: 'DELETE'})
-          .then(
-            (response) => {
-              if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);}
-              if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);}
-              app.flash(`SpaCy NLP Pipeline Model "${spaCyNLPPipelineModelTitle}" marked for deletion`);
-              resolve(response);
-            },
-            (response) => {
-              app.flash('Something went wrong', 'error');
-              reject(response);
-            }
-          );
-      });
-      modal.open();
-    });
-  }
-
-  static deleteTesseractOCRPipelineModelRequest(userId, tesseractOCRPipelineModelId) {
-    return new Promise((resolve, reject) => {
-      let tesseractOCRPipelineModel;
-      try {
-        tesseractOCRPipelineModel = app.data.users[userId].tesseract_ocr_pipeline_models[tesseractOCRPipelineModelId];
-      } catch (error) {
-        tesseractOCRPipelineModel = {};
-      }
-
-      let modalElement = Utils.HTMLToElement(
-        `
-          <div class="modal">
-            <div class="modal-content">
-              <h4>Confirm Tesseract OCR Pipeline Model deletion</h4>
-              <p>Do you really want to delete the Tesseract OCR Pipeline Model <b>${tesseractOCRPipelineModel?.title}</b>? All files will be permanently deleted!</p>
-            </div>
-            <div class="modal-footer">
-              <a class="action-button btn modal-close waves-effect waves-light" data-action="cancel">Cancel</a>
-              <a class="action-button btn modal-close red waves-effect waves-light" data-action="confirm">Delete</a>
-            </div>
-          </div>
-        `
-      );
-      document.querySelector('#modals').appendChild(modalElement);
-      let modal = M.Modal.init(
-        modalElement,
-        {
-          dismissible: false,
-          onCloseEnd: () => {
-            modal.destroy();
-            modalElement.remove();
-          }
-        }
-      );
-      let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]');
-      confirmElement.addEventListener('click', (event) => {
-        let tesseractOCRPipelineModelTitle = tesseractOCRPipelineModel?.title;
-        fetch(`/contributions/tesseract-ocr-pipeline-models/${tesseractOCRPipelineModelId}`, {method: 'DELETE'})
-          .then(
-            (response) => {
-              if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);}
-              if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);}
-              app.flash(`Tesseract OCR Pipeline Model "${tesseractOCRPipelineModelTitle}" marked for deletion`);
-              resolve(response);
-            },
-            (response) => {
-              app.flash('Something went wrong', 'error');
-              reject(response);
-            }
-          );
-      });
-      modal.open();
-    });
-  }
-
   static deleteProfileAvatarRequest(userId) {
     return new Promise((resolve, reject) => {
       let modalElement = Utils.HTMLToElement(
@@ -672,94 +417,4 @@ class Utils {
       modal.open();
     });
   }
-
-  static updateTesseractOCRPipelineModelIsPublicRequest(tesseractOCRPipelineModelId, newIsPublicValue) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/contributions/tesseract-ocr-pipeline-models/${tesseractOCRPipelineModelId}/is_public`;
-      let fetchOptions = {
-        method: 'PUT',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(newIsPublicValue)
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              response.json().then((data) => {app.flash(data);});
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static updateSpaCyNLPPipelineModelIsPublicRequest(SpaCyNLPPipelineModelId, newIsPublicValue) {
-    return new Promise((resolve, reject) => {
-      let fetchRessource = `/contributions/spacy-nlp-pipeline-models/${SpaCyNLPPipelineModelId}/is_public`;
-      let fetchOptions = {
-        method: 'PUT',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(newIsPublicValue)
-      };
-      fetch(fetchRessource, fetchOptions)
-        .then(
-          (response) => {
-            if (response.ok) {
-              response.json().then((data) => {app.flash(data);});
-              resolve(response);
-            } else {
-              app.flash(`${response.statusText}`, 'error');
-              reject(response);
-            }
-          },
-          (response) => {
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        );
-    });
-  }
-
-  static generateCorpusShareLinkRequest(corpusId, role, expiration) {
-    return new Promise((resolve, reject) => {
-      const data = {role: role, expiration: expiration};
-      fetch(`/corpora/${corpusId}/generate-corpus-share-link`, {method: 'POST', headers: {Accept: 'text/plain'}, body: JSON.stringify(data)})
-        .then(
-          (response) => {
-            if (!response.ok) {
-              app.flash(`Something went wrong: ${response.status} ${response.statusText}`, 'error');
-              reject(response);
-              return;
-            }
-            return response.text();
-          },
-          (response) => {
-            // Something went wrong during the HTTP request
-            app.flash('Something went wrong', 'error');
-            reject(response);
-          }
-        )
-        .then(
-          (corpusShareLink) => {resolve(corpusShareLink);},
-          (error) => {
-            // Something went wrong during ReadableStream processing
-            app.flash('Something went wrong', 'error');
-            reject(error);
-          }
-        );
-    });
-  }
 }