From 34be55b26af6e36c6e3d19048678ceecda5345bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Garc=C3=ADa?= Date: Fri, 17 May 2024 09:10:22 +0200 Subject: [PATCH] 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 --- .../WEB-INF/classes/web-ui-wro-sources.xml | 22 +- .../batch/partials/batchstatuscontainer.html | 5 +- .../harvester/partials/identification.html | 2 +- .../admin/harvester/partials/schedule.html | 4 +- .../partials/indexingstatuscontainer.html | 2 +- .../recordlinksanalyseprocesscontainer.html | 8 +- .../registry/partials/registrybrowser.html | 4 +- .../schematron/partials/criteria-viewer.html | 2 +- .../admin/uiconfig/partials/mapconfig.html | 6 +- .../uiconfig/partials/projectionSwitcher.html | 10 +- .../admin/uiconfig/partials/uiconfig.html | 136 +- .../common/alert/partials/alert.html | 2 +- .../common/needhelp/partials/needhelp.html | 2 +- .../savedselections/partials/panel.html | 4 +- .../common/share/partials/panel.html | 2 +- .../contactus/partials/contactusform.html | 2 +- .../partials/batchprocessbutton.html | 2 +- .../crsselector/partials/crsselector.html | 2 +- .../edit/datepicker/partials/datepicker.html | 4 +- .../partials/associated-results.html | 6 +- .../partials/directoryentryselector.html | 8 +- .../editorhelper/partials/editorhelper.html | 2 +- .../fieldupload/partials/fieldupload.html | 4 +- .../logoselector/partials/logoselector.html | 6 +- ...rycombiner_onlineresourcesdescription.html | 2 +- .../partials/multilingualfield.html | 2 +- .../edit/onlinesrc/partials/addOnlinesrc.html | 16 +- .../onlinesrc/partials/doisearchpanel.html | 4 +- .../partials/linkServiceToDataset.html | 4 +- .../edit/onlinesrc/partials/linkToMd.html | 4 +- .../onlinesrc/partials/linktosibling.html | 12 +- .../onlinesrc/partials/onlinesrcList.html | 2 +- .../partials/rfselector.html | 2 +- .../edit/suggestion/partials/runprocess.html | 4 +- .../suggestion/partials/suggestbutton.html | 2 +- .../directives/partials/facet-cards.html | 2 +- .../directives/partials/facet-tab.html | 2 +- .../directives/partials/facet.html | 2 +- .../directives/partials/facetDecorator.html | 4 +- .../directives/partials/facets.html | 4 +- .../partials/dataUploaderButton.html | 11 +- .../filestore/partials/filestore.html | 2 +- .../components/history/partials/history.html | 4 +- .../history/partials/historyStep.html | 2 +- .../history/partials/recordHistory.html | 4 +- .../components/index/partials/datatable.html | 2 +- .../associatedResourcesContainer.html | 4 +- .../metadataactions/partials/citation.html | 2 +- .../partials/metadataCard.html | 2 +- .../partials/recordLinkButton.html | 4 +- .../partials/recordLinksButton.html | 4 +- .../metadataactions/partials/related.html | 6 +- .../partials/relatedDropdown.html | 2 +- .../partials/relatedEditorList.html | 4 +- .../partials/relatedSimpleList.html | 2 +- .../partials/relatedWithStats.html | 2 +- .../templates/skos-concept-thesaurus.html | 4 +- .../ng-skos/templates/skos-concept.html | 6 +- .../formfields/partials/sortByCombo.html | 2 +- .../search/mdview/partials/contact.html | 18 +- .../search/mdview/partials/keywordBadges.html | 2 +- .../search/mdview/partials/morelikethis.html | 2 +- .../mdview/partials/objectFieldWithLink.html | 2 +- .../search/mdview/partials/rate.html | 2 +- .../partials/templateswitcher.html | 4 +- .../partials/viewtemplates/grid.html | 2 +- .../partials/viewtemplates/list.html | 2 +- .../searchmanager/partials/searchresults.html | 10 +- .../thesaurus/ThesaurusDirective.js | 2 +- .../thesaurus/partials/keywordselector.html | 4 +- .../thesaurus/partials/thesaurusselector.html | 6 +- .../toolbar/partials/menu-contribute.html | 2 +- .../components/toolbar/partials/menu-map.html | 2 +- .../partials/userfeedbackfull.html | 2 +- .../partials/usersearchesmanager.html | 2 +- .../partials/usersearchespanel.html | 6 +- .../components/utility/UtilityDirective.js | 6 +- .../partials/draftvalidationwidget.html | 10 +- .../utility/partials/indexerrorpanel.html | 4 +- .../components/utility/partials/linkicon.html | 2 +- .../utility/partials/metadataselector.html | 2 +- .../partials/typeinspirevalidationwidget.html | 20 +- .../utility/partials/typewidget.html | 10 +- .../partials/mdValidationTools.html | 14 +- .../viewer/gfi/partials/featurestable.html | 2 +- .../viewer/gfi/partials/featurestables.html | 2 +- .../layermanager/partials/layermanager.html | 2 +- .../partials/layermanageritem.html | 4 +- .../localisation/partials/localisation.html | 2 +- .../owscontext/partials/owscontext.html | 8 +- .../viewer/partials/layerindicator.html | 2 +- .../viewer/partials/mainviewer.html | 25 +- .../viewer/partials/mouseposition.html | 2 +- .../viewer/profile/partials/profile.html | 2 +- .../partials/searchlayerformap.html | 2 +- .../partials/terrainswitcher.html | 4 +- .../viewer/wfs/partials/download.html | 4 +- .../wfsfilter/partials/wfsfilterfacet.html | 8 +- .../viewer/wmsimport/partials/layer.html | 2 +- .../viewer/wmsimport/partials/styles.html | 2 +- .../viewer/wps/partials/processform.html | 14 +- .../viewer/wps/partials/recentprocesses.html | 3 +- .../viewer/wps/partials/urldiscovery.html | 2 +- .../admin/DashboardWfsIndexingController.js | 6 +- .../datepicker/bootstrap-datepicker.fr.js | 18 - .../datepicker/bootstrap-datepicker.fr.min.js | 1 + .../datepicker/bootstrap-datepicker.js | 3993 +++--- .../datepicker/bootstrap-datepicker.min.js | 8 + .../datepicker/bootstrap-datepicker.nl.js | 18 - .../datepicker/bootstrap-datepicker.nl.min.js | 1 + .../datepicker/bootstrap-datepicker3.css | 683 + .../bootstrap.ext/datepicker/datepicker.css | 510 - .../bootstrap.ext/datepicker/datepicker.less | 258 - .../resources/catalog/lib/jquery-2.2.4.js | 9814 -------------- .../resources/catalog/lib/jquery-2.2.4.min.js | 4 - .../catalog/lib/jquery-2.2.4.min.map | 1 - .../resources/catalog/lib/jquery-3.7.1.js | 10716 ++++++++++++++++ .../resources/catalog/lib/jquery-3.7.1.min.js | 2 + .../catalog/lib/jquery-3.7.1.min.map | 1 + .../catalog/lib/jquery-migrate-3.4.1.js | 1018 ++ .../catalog/lib/jquery-migrate-mute.js | 2 + .../jquery.ext/jquery-ui-slider-1.13.2.min.js | 6 + .../resources/catalog/style/gn_pickers.less | 2 +- .../catalog/templates/admin/admin.html | 4 +- .../admin/classification/categories.html | 4 +- .../admin/classification/thesaurus.html | 50 +- .../templates/admin/dashboard/feedbacks.html | 2 +- .../admin/dashboard/record-links.html | 10 +- .../templates/admin/dashboard/status.html | 4 +- .../admin/harvest/harvest-settings.html | 16 +- .../templates/admin/harvest/type/arcsde.html | 10 +- .../templates/admin/harvest/type/csw.html | 20 +- .../admin/harvest/type/filesystem.html | 16 +- .../admin/harvest/type/geoPREST.html | 12 +- .../admin/harvest/type/geonetwork.html | 14 +- .../admin/harvest/type/geonetwork20.html | 10 +- .../templates/admin/harvest/type/oaipmh.html | 12 +- .../templates/admin/harvest/type/ogcwxs.html | 16 +- .../admin/harvest/type/simpleurl.html | 20 +- .../templates/admin/harvest/type/thredds.html | 16 +- .../templates/admin/harvest/type/webdav.html | 12 +- .../admin/harvest/type/wfsfeatures.html | 16 +- .../templates/admin/harvest/wfs-indexing.html | 11 +- .../templates/admin/metadata/formatter.html | 16 +- .../admin/metadata/metadata-and-template.html | 11 +- .../metadata-identifier-templates.html | 2 +- .../templates/admin/metadata/standards.html | 2 +- .../catalog/templates/admin/page-layout.html | 2 +- .../templates/admin/settings/csw-test.html | 10 +- .../catalog/templates/admin/settings/csw.html | 2 +- .../templates/admin/settings/logo.html | 4 +- .../templates/admin/settings/mapservers.html | 4 +- .../templates/admin/settings/sources.html | 6 +- .../admin/settings/static-pages.html | 8 +- .../templates/admin/settings/system.html | 6 +- .../catalog/templates/admin/tools/batch.html | 4 +- .../catalog/templates/admin/tools/index.html | 2 +- .../templates/admin/usergroup/groups.html | 10 +- .../templates/admin/usergroup/users.html | 6 +- .../catalog/templates/contactus.html | 2 +- .../catalog/templates/editor/batchedit.html | 18 +- .../catalog/templates/editor/directory.html | 88 +- .../catalog/templates/editor/editorboard.html | 29 +- .../catalog/templates/editor/import.html | 16 +- .../editor/new-metadata-horizontal.html | 8 +- .../editor/new-metadata-vertical.html | 8 +- .../catalog/templates/editor/top-toolbar.html | 14 +- .../catalog/templates/gn-typeahead-match.html | 2 +- .../catalog/templates/new-password.html | 2 +- .../resources/catalog/templates/signin.html | 6 +- .../catalog/templates/top-toolbar.html | 18 +- .../default/directives/partials/linksbtn.html | 2 +- .../views/default/templates/footer.html | 2 +- .../catalog/views/default/templates/home.html | 10 +- .../views/default/templates/index.html | 12 +- .../catalog/views/default/templates/page.html | 2 +- .../templates/recordView/constraints.html | 8 +- .../default/templates/recordView/contact.html | 4 +- .../templates/recordView/downloads.html | 2 +- .../recordView/featurecatalogue.html | 2 +- .../default/templates/recordView/footer.html | 4 +- .../default/templates/recordView/lineage.html | 6 +- .../templates/recordView/measures.html | 2 +- .../templates/recordView/metadata.html | 11 +- .../templates/recordView/metadatacontact.html | 4 +- .../templates/recordView/processsteps.html | 2 +- .../templates/recordView/recordView.html | 8 +- .../default/templates/recordView/share.html | 7 +- .../default/templates/recordView/summary.html | 6 +- .../default/templates/recordView/tabbed.html | 20 +- .../templates/recordView/technical.html | 10 +- .../default/templates/recordView/title.html | 4 +- .../templates/recordView/type-dataset.html | 68 +- .../templates/recordView/type-series.html | 50 +- .../templates/recordView/type-service.html | 4 +- .../views/default/templates/results.html | 2 +- .../webapp/xslt/base-layout-cssjs-loader.xsl | 14 +- .../webapp/xslt/ui-metadata/form-builder.xsl | 4 +- 198 files changed, 15224 insertions(+), 13303 deletions(-) delete mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.js create mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.min.js create mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.min.js delete mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.js create mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.min.js create mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker3.css delete mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/datepicker.css delete mode 100644 web-ui/src/main/resources/catalog/lib/bootstrap.ext/datepicker/datepicker.less delete mode 100644 web-ui/src/main/resources/catalog/lib/jquery-2.2.4.js delete mode 100644 web-ui/src/main/resources/catalog/lib/jquery-2.2.4.min.js delete mode 100644 web-ui/src/main/resources/catalog/lib/jquery-2.2.4.min.map create mode 100644 web-ui/src/main/resources/catalog/lib/jquery-3.7.1.js create mode 100644 web-ui/src/main/resources/catalog/lib/jquery-3.7.1.min.js create mode 100644 web-ui/src/main/resources/catalog/lib/jquery-3.7.1.min.map create mode 100644 web-ui/src/main/resources/catalog/lib/jquery-migrate-3.4.1.js create mode 100644 web-ui/src/main/resources/catalog/lib/jquery-migrate-mute.js create mode 100644 web-ui/src/main/resources/catalog/lib/jquery.ext/jquery-ui-slider-1.13.2.min.js 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 index cc0595625e0..ab5ea473495 100644 --- 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 @@ - + + + @@ -73,14 +75,14 @@ - + - - - + + + - + + + @@ -145,14 +149,14 @@ - + - - + + - + 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 index de8c3449b8e..d95f0675848 100644 --- 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" - /> + >

harvesterGroupHelp

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 index 55f0f74e5cf..cac13cc3d06 100644 --- 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,7 +52,7 @@ class="btn btn-default dropdown-toggle" data-toggle="dropdown" > -   +