Fix the setup of the setup_awesomplete_builder function

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Feb 19, 2024 · c4b4363 · c4b4363
1 parent 8030ec3
commit c4b4363
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/component_catalog/templates/component_catalog/base_component_package_details.html b/component_catalog/templates/component_catalog/base_component_package_details.html
@@ -20,7 +20,7 @@
 {% block javascripts %}
   {{ block.super }}
   <script src="{% static 'awesomplete/awesomplete-1.1.5.min.js' %}" integrity="sha384-p5NIw+GEWbrK/9dC3Vuxh36c2HL0ETAXQ81nk8gl1B7FHZmXehonZWs/HBqunmCI" crossorigin="anonymous"></script>
-  <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-4HsJEwGM0+w+SABCJJ53kp6t8ClDVpaL1J381RyPr7Coyw8vwZ4k1ergxs2XknIF" crossorigin="anonymous"></script>
+  <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-oTqsk3bKZbt7gvIiSLAxv/f/1zUBuzofCLQcVe+9J9s7zHhGnWfebQu3miHGT1Vc" crossorigin="anonymous"></script>
   <script src="{% static 'json-viewer/jquery.json-viewer-1.4.0.js' %}" integrity="sha384-mCd7P/7rxz1zpQAb195/BFZG4pDkLO6GdkRi772EZRiLTGdfnlhC74NrrwtSHvBI" crossorigin="anonymous"></script>
   {% include 'includes/dependencies-json-viewer.js.html' %}
   {% if open_add_to_package_modal %}

diff --git a/component_catalog/templates/component_catalog/includes/scan_summary_to_package_modal.html b/component_catalog/templates/component_catalog/includes/scan_summary_to_package_modal.html
@@ -21,7 +21,7 @@ <h5 class="modal-title">Set values from Scan Summary to Package</h5>
 
 <script>
 document.addEventListener('DOMContentLoaded', function () {
-  NEXB.setup_awesomplete_builder($('#id_scan-summary-to-package-license_expression').get(0));
+  setup_awesomplete_builder($('#id_scan-summary-to-package-license_expression').get(0));
 
   $('#scan-summary-to-package-modal').on('show.bs.modal', function () {
     let checkbox_and_radio = $("#tab_scan").find("input[type='checkbox']:checked, input[type='radio']:checked");

diff --git a/component_catalog/templates/component_catalog/includes/scan_to_package_modal.html b/component_catalog/templates/component_catalog/includes/scan_to_package_modal.html
@@ -21,6 +21,6 @@ <h5 class="modal-title">Set values from Scan to Package</h5>
 
 <script>
 document.addEventListener('DOMContentLoaded', function () {
-  NEXB.setup_awesomplete_builder($('#id_scan-to-package-license_expression').get(0));
+  setup_awesomplete_builder($('#id_scan-to-package-license_expression').get(0));
 });
 </script>
diff --git a/dejacode/static/js/license_expression_builder.js b/dejacode/static/js/license_expression_builder.js
@@ -76,7 +76,7 @@ if (typeof(grp) !== 'undefined') {
         }
     }
 
-    NEXB.setup_awesomplete_builder = function(element, related_field, max_items, license_data) {
+    setup_awesomplete_builder = function(element, related_field, max_items, license_data) {
         if (!element) return false;
         console.log('Setup license expression builder for #' + element.id);
 
@@ -144,7 +144,7 @@ if (typeof(grp) !== 'undefined') {
     function add_expression_builder(license_expression_field) {
         let fieldset = $(license_expression_field).parents('fieldset');
         let related_component_field = fieldset.find("input[name$='component'], input[name$='child'], input[name$='package']");
-        NEXB.setup_awesomplete_builder(license_expression_field, related_component_field);
+        setup_awesomplete_builder(license_expression_field, related_component_field);
     }
 
     function add_expression_builder_in_inlines_on_add_another(form) {

diff --git a/dje/templates/object_form.html b/dje/templates/object_form.html
@@ -43,7 +43,7 @@ <h1 class="header-title">
 {% block javascripts %}
   {{ block.super }}
   {% if form.fields.license_expression %}
-    <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-4HsJEwGM0+w+SABCJJ53kp6t8ClDVpaL1J381RyPr7Coyw8vwZ4k1ergxs2XknIF" crossorigin="anonymous"></script>
+    <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-oTqsk3bKZbt7gvIiSLAxv/f/1zUBuzofCLQcVe+9J9s7zHhGnWfebQu3miHGT1Vc" crossorigin="anonymous"></script>
   {% endif %}
   {{ licenses_data_for_builder|json_script:"licenses_data_for_builder" }}
   {{ form.identifier_fields|json_script:"identifier_fields" }}
@@ -53,8 +53,7 @@ <h1 class="header-title">
 
       {% if form.fields.license_expression and licenses_data_for_builder %}
         let licenses_data_for_builder = JSON.parse(document.getElementById("licenses_data_for_builder").textContent);
-        NEXB.setup_awesomplete_builder(
-          $('#id_license_expression').get(0), null, 100,licenses_data_for_builder);
+        setup_awesomplete_builder($('#id_license_expression').get(0), null, 100,licenses_data_for_builder);
       {% endif %}
 
       {% if form.fields.keywords %}

diff --git a/product_portfolio/templates/product_portfolio/object_manage_grid.html b/product_portfolio/templates/product_portfolio/object_manage_grid.html
@@ -167,7 +167,7 @@ <h5 class="modal-title">Create new Component</h5>
 {% endblock %}
 
 {% block javascripts %}
-  <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-4HsJEwGM0+w+SABCJJ53kp6t8ClDVpaL1J381RyPr7Coyw8vwZ4k1ergxs2XknIF" crossorigin="anonymous"></script>
+  <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-oTqsk3bKZbt7gvIiSLAxv/f/1zUBuzofCLQcVe+9J9s7zHhGnWfebQu3miHGT1Vc" crossorigin="anonymous"></script>
   <script src="{% static 'js/jquery.dirtyforms.2.0.0.min.js' %}" integrity="sha384-xesGfeB9VUH4sEN2ROWGaWMcYi5B/NjoBb5XK6cvcuUyL6f+GI2B7kcCzbqsJcwc" crossorigin="anonymous"></script>
   {% if component_add_form %}
     <script src="{% static 'js/csrf_header.js' %}" integrity="sha384-H61e46QMjASwnZFb/rwCl9PANtdqt1dbKU8gnGOh9lIGQEoi1B6qkWROHnrktD3R" crossorigin="anonymous"></script>
@@ -247,7 +247,7 @@ <h5 class="modal-title">Create new Component</h5>
         let create_component_modal = $('#create-component-modal');
         let license_expression_field = create_component_modal.find('.licenseexpressionwidget');
         let licenses_data_for_builder = JSON.parse(document.getElementById("licenses_data_for_builder").textContent);
-        NEXB.setup_awesomplete_builder(license_expression_field.get(0), null,  100, licenses_data_for_builder);
+        setup_awesomplete_builder(license_expression_field.get(0), null,  100, licenses_data_for_builder);
 
         $('#component-add-form').on('submit', function(e) {
           e.preventDefault();

diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html
@@ -137,7 +137,7 @@
 
   {% if has_edit_productpackage or has_edit_productcomponent or has_add_productcomponent %}
     <script src="{% static 'awesomplete/awesomplete-1.1.5.min.js' %}" integrity="sha384-p5NIw+GEWbrK/9dC3Vuxh36c2HL0ETAXQ81nk8gl1B7FHZmXehonZWs/HBqunmCI" crossorigin="anonymous"></script>
-    <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-4HsJEwGM0+w+SABCJJ53kp6t8ClDVpaL1J381RyPr7Coyw8vwZ4k1ergxs2XknIF" crossorigin="anonymous"></script>
+    <script src="{% static 'js/license_expression_builder.js' %}" integrity="sha384-oTqsk3bKZbt7gvIiSLAxv/f/1zUBuzofCLQcVe+9J9s7zHhGnWfebQu3miHGT1Vc" crossorigin="anonymous"></script>
     <script>
       $(document).ready(function () {
         let edit_modal = $('#edit-productrelation-modal');
@@ -171,7 +171,7 @@
               modal_body.html(data);
               let license_expression_input = $('#id_license_expression');
               let licenses_data = license_expression_input.data('licenses');
-              NEXB.setup_awesomplete_builder(license_expression_input.get(0), null,  100, licenses_data);
+              setup_awesomplete_builder(license_expression_input.get(0), null,  100, licenses_data);
             },
             error: function() {
               modal_body.html('Error.');