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

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) => {

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;
       }

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();

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;
       }

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);

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();

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;

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;

app/static/js/forms/create-contribution-form.js

@@ -1,10 +1,5 @@
 Forms.CreateContributionForm = class CreateContributionForm extends Forms.BaseForm {
-  static autoInit() {
+  static htmlClass = 'create-contribution-form';
-    let createContributionFormElements = document.querySelectorAll('.create-contribution-form');
-    for (let createContributionFormElement of createContributionFormElements) {
-      new Forms.CreateContributionForm(createContributionFormElement);
-    }
-  }
 
   constructor(formElement) {
     super(formElement);

app/static/js/forms/create-corpus-file-form.js

@@ -1,10 +1,5 @@
 Forms.CreateCorpusFileForm = class CreateCorpusFileForm extends Forms.BaseForm {
-  static autoInit() {
+  static htmlClass = 'create-corpus-file-form';
-    let createCorpusFileFormElements = document.querySelectorAll('.create-corpus-file-form');
-    for (let createCorpusFileFormElement of createCorpusFileFormElements) {
-      new Forms.CreateCorpusFileForm(createCorpusFileFormElement);
-    }
-  }
 
   constructor(formElement) {
     super(formElement);

app/static/js/forms/create-job-form.js

@@ -1,10 +1,5 @@
 Forms.CreateJobForm = class CreateJobForm extends Forms.BaseForm {
-  static autoInit() {
+  static htmlClass = 'create-job-form';
-    let createJobFormElements = document.querySelectorAll('.create-job-form');
-    for (let createJobFormElement of createJobFormElements) {
-      new Forms.CreateJobForm(createJobFormElement);
-    }
-  }
 
   constructor(formElement) {
     super(formElement);

app/static/js/forms/index.js

@@ -3,15 +3,22 @@ var Forms = {};
 Forms.autoInit = () => {
   for (let propertyName in Forms) {
     let property = Forms[propertyName];
-    // Call the autoInit method of all properties that are subclasses of Forms.BaseForm
+    // Call autoInit of all properties that are subclasses of Forms.BaseForm.
+    // This does not include Forms.BaseForm itself.
     if (property.prototype instanceof Forms.BaseForm) {
-      property.autoInit();
+      // Check if the static htmlClass property is defined.
+      if (property.htmlClass === undefined) {return;}
+      // Gather all HTML elements that have the `this.htmlClass` class
+      // and do not have the no-autoinit class.
+      let formElements = document.querySelectorAll(`.${property.htmlClass}:not(.no-autoinit)`);
+      // Create an instance of this class for each form element.
+      for (let formElement of formElements) {new property(formElement);}
     }
   }
 };
 
 Forms.BaseForm = class BaseForm {
-  static autoInit() {throw 'Not implemented';}
+  static htmlClass;
 
   constructor(formElement) {
     this.formElement = formElement;

app/static/js/resource-displays/corpus-display.js

@@ -1,11 +1,13 @@
 ResourceDisplays.CorpusDisplay = class CorpusDisplay extends ResourceDisplays.BaseDisplay {
+  static htmlClass = 'corpus-display';
+
   constructor(displayElement) {
     super(displayElement);
     this.corpusId = displayElement.dataset.corpusId;
     this.displayElement
       .querySelector('.action-button[data-action="build-request"]')
       .addEventListener('click', (event) => {
-        Requestscorpora.entity.build(this.corpusId);
+        Requests.corpora.entity.build(this.corpusId);
       });
   }
 

app/static/js/resource-displays/index.js

@@ -1,6 +1,25 @@
 var ResourceDisplays = {};
 
+ResourceDisplays.autoInit = () => {
+  for (let propertyName in ResourceDisplays) {
+    let property = ResourceDisplays[propertyName];
+    // Call autoInit of all properties that are subclasses of `ResourceDisplays.BaseDisplay`.
+    // This does not include `ResourceDisplays.BaseDisplay` itself.
+    if (property.prototype instanceof ResourceDisplays.BaseDisplay) {
+      // Check if the static `htmlClass` property is defined.
+      if (property.htmlClass === undefined) {return;}
+      // Gather all HTML elements that have the `this.htmlClass` class
+      // and do not have the `no-autoinit` class.
+      let displayElements = document.querySelectorAll(`.${property.htmlClass}:not(.no-autoinit)`);
+      // Create an instance of this class for each display element.
+      for (let displayElement of displayElements) {new property(displayElement);}
+    }
+  }
+}
+
 ResourceDisplays.BaseDisplay = class BaseDisplay {
+  static htmlClass;
+
   constructor(displayElement) {
     this.displayElement = displayElement;
     this.userId = this.displayElement.dataset.userId;

app/static/js/resource-displays/job-display.js

@@ -1,4 +1,6 @@
 ResourceDisplays.JobDisplay = class JobDisplay extends ResourceDisplays.BaseDisplay {
+  static htmlClass = 'job-display';
+
   constructor(displayElement) {
     super(displayElement);
     this.jobId = this.displayElement.dataset.jobId;

app/templates/_scripts.html.j2

@@ -140,6 +140,7 @@
     document.querySelectorAll('#nav-more-dropdown-trigger'),
     {alignment: 'right', constrainWidth: false, coverTrigger: false}
   );
+  ResourceDisplays.autoInit();
   ResourceList.autoInit();
   Forms.autoInit();
 

app/templates/corpora/corpus.html.j2

@@ -5,7 +5,7 @@
 
 {% block page_content %}
 <div class="container">
-  <div class="row" data-corpus-id="{{ corpus.hashid }}" data-user-id="{{ corpus.user.hashid }}" id="corpus-display">
+  <div class="row corpus-display" data-corpus-id="{{ corpus.hashid }}" data-user-id="{{ corpus.user.hashid }}">
     <div class="col s12">
       <h1>{{ corpus.title }}</h1>
     </div>
@@ -237,8 +237,6 @@
 {% block scripts %}
 {{ super() }}
 <script>
-let corpusDisplay = new ResourceDisplays.CorpusDisplay(document.querySelector('#corpus-display'));
-
 {# {% if current_user.is_following_corpus(corpus) %}
   let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]');
   unfollowRequestElement.addEventListener('click', () => {

app/templates/jobs/job.html.j2

@@ -5,7 +5,7 @@
 {% block page_content %}
 <div class="container">
   <div class="row">
-    <div class="col s12" data-job-id="{{ job.hashid }}" data-user-id="{{ job.user.hashid }}" id="job-display">
+    <div class="col s12 job-display" data-job-id="{{ job.hashid }}" data-user-id="{{ job.user.hashid }}">
       <div class="row">
         <div class="col s8 m9 l10">
           <h1 id="title"><i style="font-size: inherit;" class="nopaque-icons service-icons" data-service="{{ job.service }}"></i> <span class="job-title"></span></h1>
@@ -150,7 +150,6 @@
 {% block scripts %}
 {{ super() }}
 <script>
-  let jobDisplay = new ResourceDisplays.JobDisplay(document.querySelector('#job-display'));
   let deleteJobRequestElement = document.querySelector('#delete-job-request');
   let restartJobRequestElement = document.querySelector('#restart-job-request');
   deleteJobRequestElement.addEventListener('click', (event) => {