Restructure some javascript

.gitignore

@@ -5,7 +5,8 @@
 
 # Flask-Assets files
 .webassets-cache
-*.compiled.js
+*.bundle.css
+*.bundle.js
 
 # Docker related files
 docker-compose.override.yml

web/app/static/js/list.min.js

@@ -1,2 +1,2 @@
 var List;List=function(){var t={"./src/add-async.js":function(t){t.exports=function(t){return function e(r,n,s){var i=r.splice(0,50);s=(s=s||[]).concat(t.add(i)),r.length>0?setTimeout((function(){e(r,n,s)}),1):(t.update(),n(s))}}},"./src/filter.js":function(t){t.exports=function(t){return t.handlers.filterStart=t.handlers.filterStart||[],t.handlers.filterComplete=t.handlers.filterComplete||[],function(e){if(t.trigger("filterStart"),t.i=1,t.reset.filter(),void 0===e)t.filtered=!1;else{t.filtered=!0;for(var r=t.items,n=0,s=r.length;n<s;n++){var i=r[n];e(i)?i.filtered=!0:i.filtered=!1}}return t.update(),t.trigger("filterComplete"),t.visibleItems}}},"./src/fuzzy-search.js":function(t,e,r){r("./src/utils/classes.js");var n=r("./src/utils/events.js"),s=r("./src/utils/extend.js"),i=r("./src/utils/to-string.js"),a=r("./src/utils/get-by-class.js"),o=r("./src/utils/fuzzy.js");t.exports=function(t,e){e=s({location:0,distance:100,threshold:.4,multiSearch:!0,searchClass:"fuzzy-search"},e=e||{});var r={search:function(n,s){for(var i=e.multiSearch?n.replace(/ +$/,"").split(/ +/):[n],a=0,o=t.items.length;a<o;a++)r.item(t.items[a],s,i)},item:function(t,e,n){for(var s=!0,i=0;i<n.length;i++){for(var a=!1,o=0,l=e.length;o<l;o++)r.values(t.values(),e[o],n[i])&&(a=!0);a||(s=!1)}t.found=s},values:function(t,r,n){if(t.hasOwnProperty(r)){var s=i(t[r]).toLowerCase();if(o(s,n,e))return!0}return!1}};return n.bind(a(t.listContainer,e.searchClass),"keyup",t.utils.events.debounce((function(e){var n=e.target||e.srcElement;t.search(n.value,r.search)}),t.searchDelay)),function(e,n){t.search(e,n,r.search)}}},"./src/index.js":function(t,e,r){var n=r("./node_modules/string-natural-compare/natural-compare.js"),s=r("./src/utils/get-by-class.js"),i=r("./src/utils/extend.js"),a=r("./src/utils/index-of.js"),o=r("./src/utils/events.js"),l=r("./src/utils/to-string.js"),u=r("./src/utils/classes.js"),c=r("./src/utils/get-attribute.js"),f=r("./src/utils/to-array.js");t.exports=function(t,e,h){var d,v=this,g=r("./src/item.js")(v),m=r("./src/add-async.js")(v),p=r("./src/pagination.js")(v);d={start:function(){v.listClass="list",v.searchClass="search",v.sortClass="sort",v.page=1e4,v.i=1,v.items=[],v.visibleItems=[],v.matchingItems=[],v.searched=!1,v.filtered=!1,v.searchColumns=void 0,v.searchDelay=0,v.handlers={updated:[]},v.valueNames=[],v.utils={getByClass:s,extend:i,indexOf:a,events:o,toString:l,naturalSort:n,classes:u,getAttribute:c,toArray:f},v.utils.extend(v,e),v.listContainer="string"==typeof t?document.getElementById(t):t,v.listContainer&&(v.list=s(v.listContainer,v.listClass,!0),v.parse=r("./src/parse.js")(v),v.templater=r("./src/templater.js")(v),v.search=r("./src/search.js")(v),v.filter=r("./src/filter.js")(v),v.sort=r("./src/sort.js")(v),v.fuzzySearch=r("./src/fuzzy-search.js")(v,e.fuzzySearch),this.handlers(),this.items(),this.pagination(),v.update())},handlers:function(){for(var t in v.handlers)v[t]&&v.handlers.hasOwnProperty(t)&&v.on(t,v[t])},items:function(){v.parse(v.list),void 0!==h&&v.add(h)},pagination:function(){if(void 0!==e.pagination){!0===e.pagination&&(e.pagination=[{}]),void 0===e.pagination[0]&&(e.pagination=[e.pagination]);for(var t=0,r=e.pagination.length;t<r;t++)p(e.pagination[t])}}},this.reIndex=function(){v.items=[],v.visibleItems=[],v.matchingItems=[],v.searched=!1,v.filtered=!1,v.parse(v.list)},this.toJSON=function(){for(var t=[],e=0,r=v.items.length;e<r;e++)t.push(v.items[e].values());return t},this.add=function(t,e){if(0!==t.length){if(!e){var r=[],n=!1;void 0===t[0]&&(t=[t]);for(var s=0,i=t.length;s<i;s++){var a;n=v.items.length>v.page,a=new g(t[s],void 0,n),v.items.push(a),r.push(a)}return v.update(),r}m(t.slice(0),e)}},this.show=function(t,e){return this.i=t,this.page=e,v.update(),v},this.remove=function(t,e,r){for(var n=0,s=0,i=v.items.length;s<i;s++)v.items[s].values()[t]==e&&(v.templater.remove(v.items[s],r),v.items.splice(s,1),i--,s--,n++);return v.update(),n},this.get=function(t,e){for(var r=[],n=0,s=v.items.length;n<s;n++){var i=v.items[n];i.values()[t]==e&&r.push(i)}return r},this.size=function(){return v.items.length},this.clear=function(){return v.templater.clear(),v.items=[],v},this.on=function(t,e){return v.handlers[t].push(e),v},this.off=function(t,e){var r=v.handlers[t],n=a(r,e);return n>-1&&r.splice(n,1),v},this.trigger=function(t){for(var e=v.handlers[t].length;e--;)v.handlers[t][e](v);return v},this.reset={filter:function(){for(var t=v.items,e=t.length;e--;)t[e].filtered=!1;return v},search:function(){for(var t=v.items,e=t.length;e--;)t[e].found=!1;return v}},this.update=function(){var t=v.items,e=t.length;v.visibleItems=[],v.matchingItems=[],v.templater.clear();for(var r=0;r<e;r++)t[r].matching()&&v.matchingItems.length+1>=v.i&&v.visibleItems.length<v.page?(t[r].show(),v.visibleItems.push(t[r]),v.matchingItems.push(t[r])):t[r].matching()?(v.matchingItems.push(t[r]),t[r].hide()):t[r].hide();return v.trigger("updated"),v},d.start()}},"./src/item.js":function(t){t.exports=function(t){return function(e,rLine truncated
-//# sourceMappingURL=list.min.js.map
+//# sourceMappingURL=list.min.js.map

web/app/static/js/list.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.min.js","sources":["webpack://List/list.min.js"],"mappings":"AAAA","sourceRoot":""}

web/app/static/js/nopaque/RessourceLists/CorpusFileList.js

@@ -28,7 +28,7 @@ class CorpusFileList extends RessourceList {
                                    <a class="btn modal-close red waves-effect waves-light" href="${this.user.data.corpora[this.corpusId].files[corpusFileId].url}/delete"><i class="material-icons left">delete</i>Delete</a>
                                  </div>
                                </div>`;
-        let deleteModalParentElement = document.querySelector('main');
+        let deleteModalParentElement = document.querySelector('#modals');
         deleteModalParentElement.insertAdjacentHTML('beforeend', deleteModalHTML);
         let deleteModalElement = deleteModalParentElement.lastChild;
         let deleteModal = M.Modal.init(deleteModalElement, {onCloseEnd: () => {deleteModal.destroy(); deleteModalElement.remove();}});

web/app/static/js/nopaque/RessourceLists/CorpusList.js

@@ -26,7 +26,7 @@ class CorpusList extends RessourceList {
                                    <a class="btn modal-close red waves-effect waves-light" href="${this.user.data.corpora[corpusId].url}/delete"><i class="material-icons left">delete</i>Delete</a>
                                  </div>
                                </div>`;
-        let deleteModalParentElement = document.querySelector('main');
+        let deleteModalParentElement = document.querySelector('#modals');
         deleteModalParentElement.insertAdjacentHTML('beforeend', deleteModalHTML);
         let deleteModalElement = deleteModalParentElement.lastChild;
         let deleteModal = M.Modal.init(deleteModalElement, {onCloseEnd: () => {deleteModal.destroy(); deleteModalElement.remove();}});

web/app/static/js/nopaque/RessourceLists/JobList.js

@@ -26,7 +26,7 @@ class JobList extends RessourceList {
                                    <a class="btn modal-close red waves-effect waves-light" href="${this.user.data.jobs[jobId].url}/delete"><i class="material-icons left">delete</i>Delete</a>
                                  </div>
                                </div>`;
-        let deleteModalParentElement = document.querySelector('main');
+        let deleteModalParentElement = document.querySelector('#modals');
         deleteModalParentElement.insertAdjacentHTML('beforeend', deleteModalHTML);
         let deleteModalElement = deleteModalParentElement.lastChild;
         let deleteModal = M.Modal.init(deleteModalElement, {onCloseEnd: () => {deleteModal.destroy(); deleteModalElement.remove();}});

web/app/static/js/nopaque/RessourceLists/QueryResultList.js

@@ -26,7 +26,7 @@ class QueryResultList extends RessourceList {
                                    <a class="btn modal-close red waves-effect waves-light" href="${this.user.data.query_results[queryResultId].url}/delete"><i class="material-icons left">delete</i>Delete</a>
                                  </div>
                                </div>`;
-        let deleteModalParentElement = document.querySelector('main');
+        let deleteModalParentElement = document.querySelector('#modals');
         deleteModalParentElement.insertAdjacentHTML('beforeend', deleteModalHTML);
         let deleteModalElement = deleteModalParentElement.lastChild;
         let deleteModal = M.Modal.init(deleteModalElement, {onCloseEnd: () => {deleteModal.destroy(); deleteModalElement.remove();}});

web/app/static/js/nopaque/RessourceLists/RessourceList.js

@@ -39,6 +39,7 @@ class RessourceList {
                                     </div>
                                   </td>
                                 </tr>`;
+    this.list.list.style.cursor = 'pointer';
     if (typeof this.onclick === 'function') {this.list.list.addEventListener('click', event => this.onclick(event));}
   }
 

web/app/static/js/nopaque/RessourceLists/UserList.js

@@ -27,7 +27,7 @@ class UserList extends RessourceList {
                                    <a class="btn modal-close red waves-effect waves-light" href="/admin/users/${userId}/delete"><i class="material-icons left">delete</i>Delete</a>
                                  </div>
                                </div>`;
-        let deleteModalParentElement = document.querySelector('main');
+        let deleteModalParentElement = document.querySelector('#modals');
         deleteModalParentElement.insertAdjacentHTML('beforeend', deleteModalHTML);
         let deleteModalElement = deleteModalParentElement.lastChild;
         let deleteModal = M.Modal.init(deleteModalElement, {onCloseEnd: () => {deleteModal.destroy(); deleteModalElement.remove();}});

web/app/templates/_scripts.html.j2

@@ -8,13 +8,13 @@
 <script src="{{ url_for('static', filename='js/list.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/socket.io.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/nopaque/main.js') }}"></script>
-{% assets filters='rjsmin', output="js/nopaque/RessourceDisplays.min.compiled.js",
+{% assets filters='rjsmin', output="js/nopaque/RessourceDisplays.min.bundle.js",
           "js/nopaque/RessourceDisplays/RessourceDisplay.js",
           "js/nopaque/RessourceDisplays/CorpusDisplay.js",
           "js/nopaque/RessourceDisplays/JobDisplay.js" %}
 <script src="{{ ASSET_URL }}"></script>
 {% endassets %}
-{% assets filters='rjsmin', output="js/nopaque/RessourceLists.min.compiled.js",
+{% assets filters='rjsmin', output="js/nopaque/RessourceLists.min.bundle.js",
           "js/nopaque/RessourceLists/RessourceList.js",
           "js/nopaque/RessourceLists/CorpusList.js",
           "js/nopaque/RessourceLists/CorpusFileList.js",

web/app/templates/base.html.j2

@@ -33,9 +33,11 @@
 {% block main_attribs %} class="background-color"{% endblock main_attribs %}
 {% block main %}
 {% block page_content %}{% endblock page_content %}
+<div id="modals">
 {% if current_user.is_authenticated %}
 {% include "_roadmap.html.j2" %}
 {% endif %}
+</div>
 {% endblock main %}
 
 {% block footer_attribs %} class="page-footer primary-variant-color"{% endblock footer_attribs %}