From 27fe4a95e4c3ff2da84170b70267f53a1b75fecb Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Wed, 26 Jul 2023 09:03:36 +0200
Subject: [PATCH] Add "(beta)" to Static Visualization + small fixes

---
 app/corpora/json_routes.py                                  | 2 +-
 .../js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js  | 5 ++---
 app/static/js/ResourceLists/CorpusTokenList.js              | 6 +++---
 .../corpora/_analysis/static_visualization.html.j2          | 4 ++--
 app/templates/corpora/analysis.html.j2                      | 6 +++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/corpora/json_routes.py b/app/corpora/json_routes.py
index 6784bb9e..5ba4d7a2 100644
--- a/app/corpora/json_routes.py
+++ b/app/corpora/json_routes.py
@@ -66,7 +66,7 @@ def get_stopwords():
     stopwords = {}
     for language in languages:
         stopwords[language] = nltk.corpus.stopwords.words(language)
-    stopwords['punctuation'] = list(punctuation) + ['—', '|']
+    stopwords['punctuation'] = list(punctuation) + ['—', '|', '–', '“', '„']
     stopwords['user_stopwords'] = []
     response_data = stopwords
     return response_data, 202
diff --git a/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js b/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js
index 01c8f08f..e51a3534 100644
--- a/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js
+++ b/app/static/js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js
@@ -1,5 +1,5 @@
 class CorpusAnalysisStaticVisualization {
-  name = 'Static Visualization';
+  name = 'Static Visualization (beta)';
 
   constructor(app) {
     this.app = app;
@@ -65,7 +65,6 @@ class CorpusAnalysisStaticVisualization {
       actionButton.addEventListener('click', (event) => {
         let action = event.target.closest('.frequencies-stopword-setting-modal-action-buttons').dataset.action;
         if (action === 'submit') {
-          console.log('Stopwords changed');
           this.renderTokenList();
         } else if (action === 'cancel') {
           this.data.stopwords = structuredClone(this.data.stopwordCache);
@@ -279,7 +278,7 @@ class CorpusAnalysisStaticVisualization {
       },
       height: 627,
       margin: {
-        l: 17
+        l: 33
       }
     };
     let config = {
diff --git a/app/static/js/ResourceLists/CorpusTokenList.js b/app/static/js/ResourceLists/CorpusTokenList.js
index 48129217..cc16692b 100644
--- a/app/static/js/ResourceLists/CorpusTokenList.js
+++ b/app/static/js/ResourceLists/CorpusTokenList.js
@@ -26,7 +26,7 @@ class CorpusTokenList extends ResourceList {
           this.selectedItemTerms.add(termElement.textContent);
         }
       }
-      corpusAnalysisApp.extensions['Static Visualization'].renderFrequenciesGraphic(this.selectedItemTerms);
+      corpusAnalysisApp.extensions['Static Visualization (beta)'].renderFrequenciesGraphic(this.selectedItemTerms);
     });
     
     let tokenListResetButtonElement = this.listContainerElement.querySelector('#token-list-reset-button');
@@ -43,7 +43,7 @@ class CorpusTokenList extends ResourceList {
           item.elm.querySelector('.select-checkbox').checked = false;
         }
       }
-      corpusAnalysisApp.extensions['Static Visualization'].renderFrequenciesGraphic(this.selectedItemTerms);
+      corpusAnalysisApp.extensions['Static Visualization (beta)'].renderFrequenciesGraphic(this.selectedItemTerms);
     });
   }
 
@@ -129,7 +129,7 @@ class CorpusTokenList extends ResourceList {
         } else {
           this.selectedItemTerms.delete(item);
         }
-        corpusAnalysisApp.extensions['Static Visualization'].renderFrequenciesGraphic(this.selectedItemTerms);
+        corpusAnalysisApp.extensions['Static Visualization (beta)'].renderFrequenciesGraphic(this.selectedItemTerms);
         break;
       }
       default: {
diff --git a/app/templates/corpora/_analysis/static_visualization.html.j2 b/app/templates/corpora/_analysis/static_visualization.html.j2
index 8ff56178..c457cbf3 100644
--- a/app/templates/corpora/_analysis/static_visualization.html.j2
+++ b/app/templates/corpora/_analysis/static_visualization.html.j2
@@ -1,4 +1,4 @@
-{% set name = 'Static Visualization' %}
+{% set name = 'Static Visualization (beta)' %}
 
 {% set description = '' %}
 
@@ -108,7 +108,7 @@
             <div>
               <a class="btn disabled frequencies-graph-mode-button" data-graph-type="bar"><i class="material-icons">stacked_bar_chart</i></a>
               <a class="btn frequencies-graph-mode-button" data-graph-type="scatter"><i class="material-icons">show_chart</i></a>
-              <a class="btn frequencies-graph-mode-button" data-graph-type="markers"><i class="material-icons">bubble_chart</i></a>
+              {# <a class="btn frequencies-graph-mode-button" data-graph-type="markers"><i class="material-icons">bubble_chart</i></a> #}
             </div>
           </div>
         </div>
diff --git a/app/templates/corpora/analysis.html.j2 b/app/templates/corpora/analysis.html.j2
index 2938f886..046fa161 100644
--- a/app/templates/corpora/analysis.html.j2
+++ b/app/templates/corpora/analysis.html.j2
@@ -12,7 +12,7 @@
 {% block page_content %}
 <ul class="row tabs no-autoinit" id="corpus-analysis-app-extension-tabs">
   <li class="tab col s3"><a class="active" href="#corpus-analysis-app-home-container"><i class="nopaque-icons service-icons left" data-service="corpus-analysis"></i>Corpus analysis</a></li>
-  {% for extension in extensions if extension.name != 'Static Visualization' %}
+  {% for extension in extensions if extension.name != 'Static Visualization (beta)' %}
   <li class="tab col s3"><a href="#{{ extension.id_prefix }}-container">{{ extension.tab_content }}</a></li>
   {% endfor %}
 </ul>
@@ -21,7 +21,7 @@
   <h1>{{ title }}</h1>
 
   <div class="row" id="corpus-analysis-app-extension-cards">
-    {% for extension in extensions if extension.name != 'Static Visualization' %}
+    {% for extension in extensions if extension.name != 'Static Visualization (beta)' %}
     <div class="col s3">
       <div class="card extension-selector hoverable" data-target="{{ extension.id_prefix }}-container">
         <div class="card-content">
@@ -37,7 +37,7 @@
 </div>
 
 
-{% for extension in extensions if extension.name != 'Static Visualization' %}
+{% for extension in extensions if extension.name != 'Static Visualization (beta)' %}
 <div id="{{ extension.id_prefix }}-container">
   {{ extension.container_content }}
 </div>