mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Merge branch 'query-builder' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into query-builder
This commit is contained in:
		@@ -7,9 +7,17 @@
 | 
			
		||||
{%- assets
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/app.%(version)s.js',
 | 
			
		||||
  'js/App.js',
 | 
			
		||||
  'js/Utils.js',
 | 
			
		||||
  'js/XMLtoObject.js'
 | 
			
		||||
  'js/app/index.js',
 | 
			
		||||
  'js/app/app.js'
 | 
			
		||||
%}
 | 
			
		||||
<script src="{{ ASSET_URL }}"></script>
 | 
			
		||||
{%- endassets %}
 | 
			
		||||
 | 
			
		||||
{%- assets
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/utils.%(version)s.js',
 | 
			
		||||
  'js/utils/index.js',
 | 
			
		||||
  'js/utils/utils.js'
 | 
			
		||||
%}
 | 
			
		||||
<script src="{{ ASSET_URL }}"></script>
 | 
			
		||||
{%- endassets %}
 | 
			
		||||
@@ -18,6 +26,7 @@
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/cqi.%(version)s.js',
 | 
			
		||||
  'js/cqi/index.js',
 | 
			
		||||
  'js/cqi/constants.js',
 | 
			
		||||
  'js/cqi/errors.js',
 | 
			
		||||
  'js/cqi/status.js',
 | 
			
		||||
  'js/cqi/api/index.js',
 | 
			
		||||
@@ -36,6 +45,7 @@
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/Forms.%(version)s.js',
 | 
			
		||||
  'js/forms/index.js',
 | 
			
		||||
  'js/forms/base-form.js',
 | 
			
		||||
  'js/forms/create-contribution-form.js',
 | 
			
		||||
  'js/forms/create-corpus-file-form.js',
 | 
			
		||||
  'js/forms/create-job-form.js'
 | 
			
		||||
@@ -47,6 +57,7 @@
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/resource-displays.%(version)s.js',
 | 
			
		||||
  'js/resource-displays/index.js',
 | 
			
		||||
  'js/resource-displays/resource-display.js',
 | 
			
		||||
  'js/resource-displays/corpus-display.js',
 | 
			
		||||
  'js/resource-displays/job-display.js'
 | 
			
		||||
%}
 | 
			
		||||
@@ -55,22 +66,23 @@
 | 
			
		||||
 | 
			
		||||
{%- assets
 | 
			
		||||
  filters='rjsmin',
 | 
			
		||||
  output='gen/ResourceLists.%(version)s.js',
 | 
			
		||||
  'js/ResourceLists/ResourceList.js',
 | 
			
		||||
  'js/ResourceLists/CorpusFileList.js',
 | 
			
		||||
  'js/ResourceLists/CorpusList.js',
 | 
			
		||||
  'js/ResourceLists/PublicCorpusList.js',
 | 
			
		||||
  'js/ResourceLists/JobList.js',
 | 
			
		||||
  'js/ResourceLists/JobInputList.js',
 | 
			
		||||
  'js/ResourceLists/JobResultList.js',
 | 
			
		||||
  'js/ResourceLists/SpacyNLPPipelineModelList.js',
 | 
			
		||||
  'js/ResourceLists/TesseractOCRPipelineModelList.js',
 | 
			
		||||
  'js/ResourceLists/UserList.js',
 | 
			
		||||
  'js/ResourceLists/AdminUserList.js',
 | 
			
		||||
  'js/ResourceLists/CorpusFollowerList.js',
 | 
			
		||||
  'js/ResourceLists/CorpusTextInfoList.js',
 | 
			
		||||
  'js/ResourceLists/DetailledPublicCorpusList.js',
 | 
			
		||||
  'js/ResourceLists/CorpusTokenList.js'
 | 
			
		||||
  output='gen/resource-lists.%(version)s.js',
 | 
			
		||||
  'js/resource-lists/index.js',
 | 
			
		||||
  'js/resource-lists/resource-list.js',
 | 
			
		||||
  'js/resource-lists/admin-user-list.js',
 | 
			
		||||
  'js/resource-lists/corpus-file-list.js',
 | 
			
		||||
  'js/resource-lists/corpus-follower-list.js',
 | 
			
		||||
  'js/resource-lists/corpus-list.js',
 | 
			
		||||
  'js/resource-lists/corpus-text-info-list.js',
 | 
			
		||||
  'js/resource-lists/corpus-token-list.js',
 | 
			
		||||
  'js/resource-lists/detailed-public-corpus-list.js',
 | 
			
		||||
  'js/resource-lists/job-input-list.js',
 | 
			
		||||
  'js/resource-lists/job-list.js',
 | 
			
		||||
  'js/resource-lists/job-result-list.js',
 | 
			
		||||
  'js/resource-lists/public-corpus-list.js',
 | 
			
		||||
  'js/resource-lists/spacy-nlp-pipeline-model-list.js',
 | 
			
		||||
  'js/resource-lists/tesseract-ocr-pipeline-model-list.js',
 | 
			
		||||
  'js/resource-lists/user-list.js'
 | 
			
		||||
%}
 | 
			
		||||
<script src="{{ ASSET_URL }}"></script>
 | 
			
		||||
{%- endassets %}
 | 
			
		||||
@@ -106,7 +118,7 @@
 | 
			
		||||
 | 
			
		||||
<script>
 | 
			
		||||
  // TODO: Implement an app.run method and use this for all of the following
 | 
			
		||||
  const app = new App();
 | 
			
		||||
  const app = new App.App();
 | 
			
		||||
  {%- if current_user.is_authenticated %}
 | 
			
		||||
  const currentUserId = {{ current_user.hashid|tojson }};
 | 
			
		||||
 | 
			
		||||
@@ -141,7 +153,7 @@
 | 
			
		||||
    {alignment: 'right', constrainWidth: false, coverTrigger: false}
 | 
			
		||||
  );
 | 
			
		||||
  ResourceDisplays.autoInit();
 | 
			
		||||
  ResourceList.autoInit();
 | 
			
		||||
  ResourceLists.autoInit();
 | 
			
		||||
  Forms.autoInit();
 | 
			
		||||
 | 
			
		||||
  // Display flashed messages
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
  let corpusListElement = document.querySelector('#corpus-list');
 | 
			
		||||
  let corpusList = new CorpusList(corpusListElement);
 | 
			
		||||
  let corpusList = new ResourceLists.CorpusList(corpusListElement);
 | 
			
		||||
  corpusList.add(
 | 
			
		||||
    [
 | 
			
		||||
      {% for corpus in corpora %}
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
  let adminUserListElement = document.querySelector('#admin-user-list');
 | 
			
		||||
  let adminUserList = new AdminUserList(adminUserListElement);
 | 
			
		||||
  let adminUserList = new ResourceLists.AdminUserList(adminUserListElement);
 | 
			
		||||
  adminUserList.add(
 | 
			
		||||
    [
 | 
			
		||||
      {% for user in users %}
 | 
			
		||||
 
 | 
			
		||||
@@ -242,7 +242,7 @@
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
 | 
			
		||||
let publicCorpusFileList = new CorpusFileList(document.querySelector('#corpus-file-list'));
 | 
			
		||||
let publicCorpusFileList = new ResourceLists.CorpusFileList(document.querySelector('#corpus-file-list'));
 | 
			
		||||
publicCorpusFileList.add(
 | 
			
		||||
  [
 | 
			
		||||
    {% for corpus_file in corpus.files %}
 | 
			
		||||
@@ -259,7 +259,7 @@ refreshButton.addEventListener('click', () => {
 | 
			
		||||
{% endif %}
 | 
			
		||||
 | 
			
		||||
{% if cfr.has_permission('MANAGE_FOLLOWERS') %}
 | 
			
		||||
let publicCorpusFollowerList = new CorpusFollowerList(document.querySelector('.corpus-follower-list'));
 | 
			
		||||
let publicCorpusFollowerList = new ResourceLists.CorpusFollowerList(document.querySelector('.corpus-follower-list'));
 | 
			
		||||
publicCorpusFollowerList.add(
 | 
			
		||||
  [
 | 
			
		||||
    {% for cfa in cfas %}
 | 
			
		||||
 
 | 
			
		||||
@@ -148,7 +148,8 @@
 | 
			
		||||
          return response.text();
 | 
			
		||||
        })
 | 
			
		||||
        .then((responseText) => {return new DOMParser().parseFromString(responseText, 'application/xml');})
 | 
			
		||||
        .then((xmlDocument) => {return xmlDocument.toObject();})
 | 
			
		||||
        // .then((xmlDocument) => {return xmlDocument.toObject();})
 | 
			
		||||
        .then((xmlDocument) => {return {};})
 | 
			
		||||
        .then((feed) => {resolve(feed);});
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -62,7 +62,7 @@
 | 
			
		||||
{% block scripts %}
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
  let userList = new UserList(document.querySelector('.user-list'));
 | 
			
		||||
  let userList = new ResourceLists.UserList(document.querySelector('.user-list'));
 | 
			
		||||
  userList.add(
 | 
			
		||||
    [
 | 
			
		||||
      {% for user in users %}
 | 
			
		||||
@@ -70,7 +70,7 @@
 | 
			
		||||
      {% endfor %}
 | 
			
		||||
    ]
 | 
			
		||||
  );
 | 
			
		||||
  let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list'));
 | 
			
		||||
  let publicCorpusList = new ResourceLists.PublicCorpusList(document.querySelector('.public-corpus-list'));
 | 
			
		||||
  publicCorpusList.add(
 | 
			
		||||
    [
 | 
			
		||||
      {% for corpus in corpora %}
 | 
			
		||||
 
 | 
			
		||||
@@ -122,7 +122,7 @@
 | 
			
		||||
{% block scripts %}
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
let followedCorpusList = new PublicCorpusList(document.querySelector('.followed-corpus-list'));
 | 
			
		||||
let followedCorpusList = new ResourceLists.PublicCorpusList(document.querySelector('.followed-corpus-list'));
 | 
			
		||||
followedCorpusList.add(
 | 
			
		||||
  [
 | 
			
		||||
    {% for corpus in user.followed_corpora %}
 | 
			
		||||
@@ -132,7 +132,7 @@ followedCorpusList.add(
 | 
			
		||||
    {% endfor %}
 | 
			
		||||
  ]
 | 
			
		||||
);
 | 
			
		||||
let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list'));
 | 
			
		||||
let publicCorpusList = new ResourceLists.PublicCorpusList(document.querySelector('.public-corpus-list'));
 | 
			
		||||
publicCorpusList.add(
 | 
			
		||||
  [
 | 
			
		||||
    {% for corpus in user.corpora %}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user