jQuery upgrade to version 3.7.1 (#8015)

* jQuery 3.7.1 upgrade * Test to use jQuery 3.0.0 * Test to use jQuery 3.4.1 * Update to Jetty 10 - Update download distribution url * Remove jQuery 2.2.4 * Update jQueryUI slider to 1.13.2 * HTML tags must be properly closed * Disable jQuery migrate warnings * HTML tags must be properly closed * Update to boostrap-datepicker 1.10.0 to work with jQuery 3.7.1 * Update to bootstrap-datepicker 1.10.0 - add minified file and remove old css * Disable jQueryMigrate self-closed-tags patch Wrong self-closed html tags will cause the application to fail * Update to bootstrap-datepicker 1.10.0 - Fix wro4j configuration
geonetwork · May 17, 2024 · 34be55b · 34be55b
1 parent 512b1cc
commit 34be55b
Show file tree

Hide file tree

Showing 198 changed files with 15,224 additions and 13,303 deletions.
diff --git a/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml b/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml
@@ -34,7 +34,9 @@
   </require>
   <declarative name="lib" pathOnDisk="web-ui/src/main/resources">
     <jsSource webappPath="/catalog/lib/modernizr.js" minimize="false"/>
-    <jsSource webappPath="/catalog/lib/jquery-2.2.4.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-3.7.1.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-migrate-mute.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-migrate-3.4.1.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-with-locales.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-timezone-with-data-1970-2030.min.js" minimize="false" />
     <jsSource webappPath="/catalog/lib/angular/angular.min.js" minimize="false"/>
@@ -73,14 +75,14 @@
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.fileupload-process.js"/>
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.fileupload-angular.js"/>
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.floatThead-slim.min.js"/>
-    <jsSource webappPath="/catalog/lib/jquery.ext/jquery-ui-slider.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery.ext/jquery-ui-slider-1.13.2.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/typeahead.js/typeahead.bundle.js"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput-angular.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.js"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table-locale-all.min.js"
@@ -103,7 +105,9 @@
   <!-- Same as previous + olcesium -->
   <declarative name="lib3d" pathOnDisk="web-ui/src/main/resources">
     <jsSource webappPath="/catalog/lib/modernizr.js" minimize="false"/>
-    <jsSource webappPath="/catalog/lib/jquery-2.2.4.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-3.7.1.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-migrate-mute.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-migrate-3.4.1.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-with-locales.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-timezone-with-data-1970-2030.min.js" minimize="false" />
     <jsSource webappPath="/catalog/lib/angular/angular.min.js" minimize="false"/>
@@ -145,14 +149,14 @@
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.fileupload.js"/>
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.fileupload-process.js"/>
     <jsSource webappPath="/catalog/lib/jquery.ext/jquery.fileupload-angular.js"/>
-    <jsSource webappPath="/catalog/lib/jquery.ext/jquery-ui-slider.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery.ext/jquery-ui-slider-1.13.2.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/typeahead.js/typeahead.bundle.js"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput-angular.js"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.js"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table-locale-all.min.js"

diff --git a/web-ui/src/main/resources/catalog/components/admin/batch/partials/batchstatuscontainer.html b/web-ui/src/main/resources/catalog/components/admin/batch/partials/batchstatuscontainer.html
@@ -1,3 +1,6 @@
 <div ng-repeat="t in ctrl.tasks track by t.id">
-  <gn-batch-task-status task-info="t" task-status-lbl="taskStatusLbl" />
+  <gn-batch-task-status
+    task-info="t"
+    task-status-lbl="taskStatusLbl"
+  ></gn-batch-task-status>
 </div>
diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html
@@ -73,7 +73,7 @@
       groups="groups"
       data-optional="false"
       data-exclude-special-groups="true"
-    />
+    ></div>
 
     <p class="help-block" data-translate="">harvesterGroupHelp</p>
   </div>

diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html
@@ -52,15 +52,15 @@
           class="btn btn-default dropdown-toggle"
           data-toggle="dropdown"
         >
-          <i class="fa fa-clock-o"></i>&nbsp;<span class="caret" />
+          <i class="fa fa-clock-o"></i>&nbsp;<span class="caret"></span>
         </button>
         <ul class="dropdown-menu pull-right">
           <li data-ng-repeat="exp in cronExp">
             <a href="" data-ng-click="setSchedule(exp)" title="{{exp}}"
               >{{('cron-' + exp) | translate}}</a
             >
           </li>
-          <li class="divider" />
+          <li class="divider"></li>
           <li>
             <a
               class="btn btn-link"

diff --git a/...i/src/main/resources/catalog/components/admin/index/partials/indexingstatuscontainer.html b/...i/src/main/resources/catalog/components/admin/index/partials/indexingstatuscontainer.html
@@ -1,3 +1,3 @@
 <div ng-repeat="t in ctrl.tasks track by t.id">
-  <gn-indexing-task-status task-info="t" />
+  <gn-indexing-task-status task-info="t"></gn-indexing-task-status>
 </div>
diff --git a/...rces/catalog/components/admin/recordlink/partials/recordlinksanalyseprocesscontainer.html b/...rces/catalog/components/admin/recordlink/partials/recordlinksanalyseprocesscontainer.html
@@ -1,4 +1,8 @@
 <div ng-repeat="t in ctrl.tasks" class="row" title="{{'Task id: ' + t.id}}">
-  <gn-dashboard-record-links-processes-status task-info="t.records" />
-  <gn-dashboard-record-links-processes-status task-info="t.links" />
+  <gn-dashboard-record-links-processes-status
+    task-info="t.records"
+  ></gn-dashboard-record-links-processes-status>
+  <gn-dashboard-record-links-processes-status
+    task-info="t.links"
+  ></gn-dashboard-record-links-processes-status>
 </div>
diff --git a/web-ui/src/main/resources/catalog/components/admin/registry/partials/registrybrowser.html b/web-ui/src/main/resources/catalog/components/admin/registry/partials/registrybrowser.html
@@ -79,13 +79,13 @@
 
   <div class="form-group" data-ng-show="itemClass.length > 0 && !isSimple">
     <label class="form-label" data-translate=""> registryChooseItem </label>
-    <i class="fa fa-spinner fa-spin" data-ng-show="loadingCollection" />
+    <i class="fa fa-spinner fa-spin" data-ng-show="loadingCollection"></i>
     <select
       class="form-control"
       data-ng-hide="loadingCollection"
       data-ng-options="i[selectedClass].id as i[selectedClass].label.text for i in itemCollection track by i[selectedClass].id"
       data-ng-model="selectedCollection"
-    />
+    ></select>
   </div>
 
   <input type="hidden" name="registryUrl" value="{{selectedCollection}}" />

diff --git a/web-ui/src/main/resources/catalog/components/admin/schematron/partials/criteria-viewer.html b/web-ui/src/main/resources/catalog/components/admin/schematron/partials/criteria-viewer.html
@@ -5,7 +5,7 @@
         class="fa fa-edit"
         data-ng-class="calculateClassOnDirty('col-sm-1', null)"
         data-ng-show="isDirty()"
-      />
+      ></i>
       <div
         data-ng-if="(original.uitype | uppercase) !== 'NEW'"
         data-ng-class="calculateClassOnDirty('col-sm-10', 'col-sm-11')"

diff --git a/web-ui/src/main/resources/catalog/components/admin/uiconfig/partials/mapconfig.html b/web-ui/src/main/resources/catalog/components/admin/uiconfig/partials/mapconfig.html
@@ -17,7 +17,7 @@
           data-ng-click="updateParams();triggerSearch();"
           type="text"
         >
-          <i class="fa fa-search" />
+          <i class="fa fa-search"></i>
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
@@ -99,7 +99,7 @@
           title="{{'remove' | translate}}"
           data-ng-click="removeItem(mCfg[key]['layers'], $index)"
         >
-          <i class="fa fa-times text-danger" />
+          <i class="fa fa-times text-danger"></i>
         </a>
       </td>
     </tr>
@@ -110,7 +110,7 @@
           title="{{'add' | translate}}"
           data-ng-click="addItem(mCfg[key]['layers'], {type: 'osm'})"
         >
-          <i class="fa fa-fw fa-plus" />
+          <i class="fa fa-fw fa-plus"></i>
           <span translate="">add</span>
         </a>
       </td>

diff --git a/web-ui/src/main/resources/catalog/components/admin/uiconfig/partials/projectionSwitcher.html b/web-ui/src/main/resources/catalog/components/admin/uiconfig/partials/projectionSwitcher.html
@@ -16,7 +16,7 @@
             title="{{'ui-getProj' | translate:epsgHelpers.getServiceName()}}"
             data-ng-click="populateProjSettings(mCfg[key][$index])"
           >
-            <i class="fa fa-globe" />
+            <i class="fa fa-globe"></i>
           </button>
         </span>
       </div>
@@ -133,7 +133,7 @@
                 title="{{'remove' | translate}}"
                 data-ng-click="removeItem(mCfg[key][parentIndex].resolutions, $index)"
               >
-                <i class="fa fa-times text-danger" />
+                <i class="fa fa-times text-danger"></i>
               </a>
             </td>
           </tr>
@@ -144,7 +144,7 @@
                 title="{{'add' | translate}}"
                 data-ng-click="addItem(mCfg[key][$index].resolutions, '')"
               >
-                <i class="fa fa-fw fa-plus" />
+                <i class="fa fa-fw fa-plus"></i>
                 <span translate="add"></span>
               </a>
             </td>
@@ -161,7 +161,7 @@
         title="{{'remove' | translate}}"
         data-ng-click="removeItem(mCfg[key], $index)"
       >
-        <i class="fa fa-times text-danger" />
+        <i class="fa fa-times text-danger"></i>
       </a>
     </td>
   </tr>
@@ -172,7 +172,7 @@
         title="{{'add' | translate}}"
         data-ng-click="addItem(mCfg[key], {'label': '', 'code': 'EPSG:', 'extent': [], worldExtent: [], resolutions: []})"
       >
-        <i class="fa fa-fw fa-plus" />
+        <i class="fa fa-fw fa-plus"></i>
         <span translate="add"></span>
       </a>
     </td>