diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js b/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js index 0c0107420b..280dd13061 100644 --- a/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js +++ b/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js @@ -201,7 +201,6 @@ $http .get("info?_content_type=json&" + "type=groupsIncludingSystemGroups", { cache: true - }) .then(function (response) { scope.groups = response.data !== "null" ? response.data.group : null; diff --git a/web-ui/src/main/resources/catalog/components/admin/schematron/SchematronAdminService.js b/web-ui/src/main/resources/catalog/components/admin/schematron/SchematronAdminService.js index 4753ab1d01..a1d23c6e29 100644 --- a/web-ui/src/main/resources/catalog/components/admin/schematron/SchematronAdminService.js +++ b/web-ui/src/main/resources/catalog/components/admin/schematron/SchematronAdminService.js @@ -136,15 +136,16 @@ uitype: updated.uitype, uivalue: updated.uivalue } - }) - .then( + }).then( function (response) { updateCacheOnCriteriaChange(group.id.schematronid, group.id.name); angular.copy(updated, original); - },function (response) { + }, + function (response) { alert("Error updating criteria: " + original.id); - }); + } + ); }, add: function (criteria, original, group) { $http({ @@ -266,15 +267,16 @@ includeCriteria: true, schematronId: schematronId } - }) - .then(function (response) { + }).then( + function (response) { var data = response.data; if (data === "null") { data = []; } putDataIntoCache(groupCacheId(schematronId), data); successFunction(data); - },function (response) { + }, + function (response) { alert( "Error occurred during loading schematron criteria " + " groups for schematron: " + diff --git a/web-ui/src/main/resources/catalog/components/admin/uiconfig/ProjectionService.js b/web-ui/src/main/resources/catalog/components/admin/uiconfig/ProjectionService.js index a31d379865..bf2ef9e1ff 100644 --- a/web-ui/src/main/resources/catalog/components/admin/uiconfig/ProjectionService.js +++ b/web-ui/src/main/resources/catalog/components/admin/uiconfig/ProjectionService.js @@ -133,22 +133,23 @@ cache: true, timeout: REQUEST_TIMEOUT }) - .then(function (response) { - try { - defer.resolve(parseProjDef(response.data)); - } catch (e) { - console.error(e); - defer.reject($translate.instant("failedToParseProjDefinition")); - } - }, - function (response) { - defer.reject( - $translate.instant( - response.status === 401 - ? "checkProjectionUrlUnauthorized" - : "checkProjectionUrl", - { url: url, status: response.status } - ) + .then( + function (response) { + try { + defer.resolve(parseProjDef(response.data)); + } catch (e) { + console.error(e); + defer.reject($translate.instant("failedToParseProjDefinition")); + } + }, + function (response) { + defer.reject( + $translate.instant( + response.status === 401 + ? "checkProjectionUrlUnauthorized" + : "checkProjectionUrl", + { url: url, status: response.status } + ) ); } ); diff --git a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js index 4adf82595d..b2e18536f0 100644 --- a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js +++ b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js @@ -664,7 +664,6 @@ var record = this; - if (angular.isDefined(record.geom) && !angular.isArray(record.geom)) { record.geom = [record.geom]; } diff --git a/web-ui/src/main/resources/catalog/components/category/CategoryDirective.js b/web-ui/src/main/resources/catalog/components/category/CategoryDirective.js index 4b3399e33b..b98318aca9 100644 --- a/web-ui/src/main/resources/catalog/components/category/CategoryDirective.js +++ b/web-ui/src/main/resources/catalog/components/category/CategoryDirective.js @@ -119,8 +119,7 @@ url = url + "&removeId=" + tagsToRemove.join("&removeId="); } - $http - .put(url).then( + $http.put(url).then( function (response) { var data = response.data; scope.processReport = data; @@ -140,7 +139,8 @@ scope.report = data; defer.resolve(data); - },function (response) { + }, + function (response) { scope.processReport = response.data; gnUtilityService.openModal( diff --git a/web-ui/src/main/resources/catalog/components/common/map/mapService.js b/web-ui/src/main/resources/catalog/components/common/map/mapService.js index 06725622d2..1f7c1b926a 100644 --- a/web-ui/src/main/resources/catalog/components/common/map/mapService.js +++ b/web-ui/src/main/resources/catalog/components/common/map/mapService.js @@ -1992,10 +1992,11 @@ if (!createOnly) { map.addLayer(olL); } - olL.set( + olL.set( "layerTitleFromMetadata", $this.getLinkDescription(olL.get("md"), url, name) - ); gnWmsQueue.removeFromQueue(url, name, map); + ); + gnWmsQueue.removeFromQueue(url, name, map); defer.resolve(olL); }; diff --git a/web-ui/src/main/resources/catalog/components/common/multiselect/partials/multiselect.html b/web-ui/src/main/resources/catalog/components/common/multiselect/partials/multiselect.html index 18575065b8..b884e37090 100644 --- a/web-ui/src/main/resources/catalog/components/common/multiselect/partials/multiselect.html +++ b/web-ui/src/main/resources/catalog/components/common/multiselect/partials/multiselect.html @@ -26,14 +26,14 @@
-
-
- -
-
+
+
+ +
+
+
-
- - -
+ +
-
+
diff --git a/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js b/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js index b93564b95a..cc3fef14c1 100644 --- a/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js +++ b/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js @@ -180,11 +180,12 @@ // Default to empty string and prevent 'Invalid Date' string to xmlSnippet scope.date = ""; - if (moment(isDateTime ? tokens[0] : scope.value).isValid()) {scope.date = new Date( - moment(isDateTime ? tokens[0] : scope.value) - .utc() - .format() - ); + if (moment(isDateTime ? tokens[0] : scope.value).isValid()) { + scope.date = new Date( + moment(isDateTime ? tokens[0] : scope.value) + .utc() + .format() + ); } var time = tokens[1]; diff --git a/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html b/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html index e31dac3074..c5c5a43561 100644 --- a/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html +++ b/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html @@ -70,7 +70,6 @@ class="form-control" data-ng-model="config.selected" data-ng-options="o as o['#text'] disable when o.disabled for o in config.option" - >
diff --git a/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js b/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js index f91efaab94..c5aed1fb7b 100644 --- a/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js +++ b/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js @@ -266,9 +266,11 @@ scope.resource.title, scope.resource["abstract"] ) - .then(function (response) { + .then( + function (response) { readResponse(response.data, "publish"); - },function (response) { + }, + function (response) { scope.statusCode = response.data.description; scope.isPublished = false; } diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js index b2ef11e641..e48c23a9b3 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js @@ -885,7 +885,8 @@ scope.isEditing = angular.isDefined(linkToEdit); // Flag used when editing an online resource to prevent the watcher to update the online // resource description when loading the dialog. - scope.processSelectedWMSLayer = false;scope.codelistFilter = + scope.processSelectedWMSLayer = false; + scope.codelistFilter = scope.gnCurrentEdit && scope.gnCurrentEdit.codelistFilter; scope.metadataId = gnCurrentEdit.id; @@ -1491,7 +1492,8 @@ return; } - if (o !== n && + if ( + o !== n && scope.params.selectedLayers && scope.params.selectedLayers.length > 0 ) { @@ -1509,20 +1511,18 @@ descs.push(layer.Title || layer.title); }); - - if (scope.isMdMultilingual) { - var langCode = scope.mdLangs[scope.mdLang]; - scope.params.name[langCode] = names.join(","); - scope.params.desc[langCode] = descs.join(","); - } else { - angular.extend(scope.params, { - name: names.join(","), - desc: descs.join(",") - }); - } + if (scope.isMdMultilingual) { + var langCode = scope.mdLangs[scope.mdLang]; + scope.params.name[langCode] = names.join(","); + scope.params.desc[langCode] = descs.join(","); + } else { + angular.extend(scope.params, { + name: names.join(","), + desc: descs.join(",") + }); } } - ); + }); /** * Init link based on linkType configuration. diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html index d13607db82..8e3138e52f 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html @@ -36,9 +36,9 @@ class="btn navbar-btn btn-success" data-gn-click-and-spin="gnOnlinesrc.linkToMd(mode, selectRecords[0], popupid)" ng-disabled="(selectRecords.length < 1)" - - > -   {{btn.label}} + > +   + {{btn.label}}
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html index 45290556f5..bde4ba3f9a 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html @@ -100,7 +100,6 @@ data-gn-confirm-click="{{'removeThumbnailConfirm' | translate:{url: thumb.lUrl} }}" title="{{'removeThumbnail' | translate}}" aria-label="{{'removeThumbnail' | translate}}" - > @@ -111,7 +110,6 @@ data-ng-show="allowEdits" title="{{'edit' | translate}}" data-ng-click="onlinesrcService.onOpenPopup('onlinesrc', thumb)" - > diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js index 6348ed217e..888176dabe 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js +++ b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js @@ -282,10 +282,10 @@ action: addWMTSToMap }, "3DTILES": { - iconClass: "fa-globe", - label: "addToMap", - action: add3dTilesToMap - }, + iconClass: "fa-globe", + label: "addToMap", + action: add3dTilesToMap + }, TMS: { iconClass: "fa-globe", label: "addToMap", @@ -517,7 +517,7 @@ return "WMTS"; } else if (protocolOrType.match(/3dtiles/i)) { return "3DTILES"; - }else if (protocolOrType.match(/tms/i)) { + } else if (protocolOrType.match(/tms/i)) { return "TMS"; } else if (protocolOrType.match(/wfs/i)) { return "WFS"; diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/partials/recordLinkButton.html b/web-ui/src/main/resources/catalog/components/metadataactions/partials/recordLinkButton.html index e7ad3a7415..4f71d3cae8 100644 --- a/web-ui/src/main/resources/catalog/components/metadataactions/partials/recordLinkButton.html +++ b/web-ui/src/main/resources/catalog/components/metadataactions/partials/recordLinkButton.html @@ -1,12 +1,13 @@ + {{md.resourceTitle}} @@ -35,7 +34,6 @@ rel="noopener noreferrer" target="_blank" title="{{md.resourceTitle}}" - > {{md.resourceTitle}} {{md.resourceTitle}} @@ -25,7 +24,6 @@ rel="noopener noreferrer" target="_blank" title="{{md.resourceTitle}}" - > {{md.resourceTitle}} {{page.label}} @@ -13,7 +12,6 @@ data-gn-active-tb-item="{{gnCfg.mods.page.appUrl + '/' + page.pageId}}?page={{page.pageId}}" title="{{page.pageId}}" data-ng-click="changePage($event)" - > {{page.pageId}} diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js index a3768228b2..04838583f9 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js +++ b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js @@ -165,28 +165,30 @@ }); // Collect stats in main portal as some records may not be visible in subportal - if (Object.entries(recordsMap).length !== 0) {$http - .post("../../srv/api/search/records/_msearch", body) - .then(function (data) { - gnMdViewObj.current.record.related = []; - - Object.keys(relatedRecords).map(function (k) { - relatedRecords[k] && - relatedRecords[k].map(function (l, i) { - var md = recordsMap[l._id]; - relatedRecords[k][i] = md; - }); + if (Object.entries(recordsMap).length !== 0) { + $http + .post("../../srv/api/search/records/_msearch", body) + .then(function (data) { + gnMdViewObj.current.record.related = []; + + Object.keys(relatedRecords).map(function (k) { + relatedRecords[k] && + relatedRecords[k].map(function (l, i) { + var md = recordsMap[l._id]; + relatedRecords[k][i] = md; + }); + }); + + gnMdViewObj.current.record.related = relatedRecords; + gnMdViewObj.current.record.related.all = Object.values(recordsMap); + gnMdViewObj.current.record.related.uuids = Object.keys(recordsMap); + + relatedRecordKeysWithValues.forEach(function (key, index) { + gnMdViewObj.current.record.related["aggregations_" + key] = + data.data.responses[index].aggregations; + }); }); - - gnMdViewObj.current.record.related = relatedRecords; - gnMdViewObj.current.record.related.all = Object.values(recordsMap); - gnMdViewObj.current.record.related.uuids = Object.keys(recordsMap); - - relatedRecordKeysWithValues.forEach(function (key, index) { - gnMdViewObj.current.record.related["aggregations_" + key] = - data.data.responses[index].aggregations; - }); - });} + } } } diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html index 0fe53fb9e8..0d11fcf1bd 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html @@ -16,8 +16,7 @@
{{c.role | translate}}
-
- {{c.organisation}}
+
{{c.organisation}}
diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/SelectionDirective.js b/web-ui/src/main/resources/catalog/components/search/resultsview/SelectionDirective.js index 6005d2900e..f9f16d196e 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/SelectionDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/SelectionDirective.js @@ -266,13 +266,12 @@ element[0] && element[0].addEventListener("click", function (e) { var method = element[0].checked ? "select" : "unselect"; - gnSearchManagerService[method](scope.md.uuid, scope.bucket).then( - function (response + gnSearchManagerService[method](scope.md.uuid, scope.bucket).then(function ( + response ) { scope.md.selected = element[0].checked; scope.results.selectedCount = parseInt(response.data, 10); - } - ); + }); e.stopPropagation(); }); } diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/selection-widget.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/selection-widget.html index cadc9af17c..bf8318e114 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/selection-widget.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/selection-widget.html @@ -93,26 +93,30 @@
  • -  {{ 'publish' + (pubOption.name === 'default'? '': pubOption.name)}} {{ 'publish' + (pubOption.name === 'default'? '': pubOption.name)}}
  • -  {{ 'unpublish' + (pubOption.name === 'default'? '': pubOption.name)}} {{ 'unpublish' + (pubOption.name === 'default'? '': pubOption.name)}}
    • diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/list.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/list.html index 7c83531d57..5ffa158a54 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/list.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/list.html @@ -62,7 +62,8 @@

    diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js index fe767e6123..79a61720f5 100644 --- a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js +++ b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js @@ -541,7 +541,6 @@ facet.items.length + (moreItemsNumber || 20), facet.include || undefined, facet.exclude || undefined - ); }; diff --git a/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html b/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html index 8b5b382c62..e038943dc9 100644 --- a/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html +++ b/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html @@ -15,7 +15,6 @@

    ')[0], - positioning: "bottom-center", - stopEvent: false, - offset: [0, -2] - }); - ctrl.map.addOverlay(ctrl.overlay); - ctrl.hoverInteration.on("select", function (event) { - var selected = event.selected[0]; + // add popover for feature info + ctrl.overlay = new ol.Overlay({ + element: $('
    ')[0], + positioning: "bottom-center", + stopEvent: false, + offset: [0, -2] + }); + ctrl.map.addOverlay(ctrl.overlay); + ctrl.hoverInteration.on("select", function (event) { + var selected = event.selected[0]; - // hide if no feature hovered; else move overlay on hovered feature - if (!selected) { - ctrl.overlay.setPosition(); - } else { - var center = ol.extent.getCenter(selected.getGeometry().getExtent()); - var topleft = ol.extent.getTopLeft(selected.getGeometry().getExtent()); - ctrl.overlay.setPosition([center[0], topleft[1]]); - ctrl.overlay.getElement().innerText = - $translate.instant("featureCount") + ": " + selected.get("count"); - } - }); - - // this will refresh the heatmap - ctrl.refresh = function () { - gnHeatmapService - .requestHeatmapData(ctrl.featureType, ctrl.map, ctrl.filter) - .then(function (cells) { - // add cells as features - ctrl.source.clear(); - ctrl.hoverInteration.getFeatures().clear(); + // hide if no feature hovered; else move overlay on hovered feature + if (!selected) { ctrl.overlay.setPosition(); - ctrl.source.addFeatures(cells); - }); - }; + } else { + var center = ol.extent.getCenter(selected.getGeometry().getExtent()); + var topleft = ol.extent.getTopLeft(selected.getGeometry().getExtent()); + ctrl.overlay.setPosition([center[0], topleft[1]]); + ctrl.overlay.getElement().innerText = + $translate.instant("featureCount") + ": " + selected.get("count"); + } + }); - // watch "enabled" param to show/hide layer - $scope.$watch("ctrl.enabled", function (newValue, oldValue) { - ctrl.layer.setVisible(!!newValue); - ctrl.hoverInteration.setActive(!!newValue); + // this will refresh the heatmap + ctrl.refresh = function () { + gnHeatmapService + .requestHeatmapData(ctrl.featureType, ctrl.map, ctrl.filter) + .then(function (cells) { + // add cells as features + ctrl.source.clear(); + ctrl.hoverInteration.getFeatures().clear(); + ctrl.overlay.setPosition(); + ctrl.source.addFeatures(cells); + }); + }; - // the heatmap was enabled: refresh data - // else: clear select interaction - if (newValue) { - ctrl.refresh(); - } else { - ctrl.hoverInteration.getFeatures().clear(); - } - }); + // watch "enabled" param to show/hide layer + $scope.$watch("ctrl.enabled", function (newValue, oldValue) { + ctrl.layer.setVisible(!!newValue); + ctrl.hoverInteration.setActive(!!newValue); - // refresh features on map move - var mapEventKey = ctrl.map.on("moveend", function () { - if (!ctrl.enabled) { - return; - } - ctrl.refresh(); - }); + // the heatmap was enabled: refresh data + // else: clear select interaction + if (newValue) { + ctrl.refresh(); + } else { + ctrl.hoverInteration.getFeatures().clear(); + } + }); + + // refresh features on map move + var mapEventKey = ctrl.map.on("moveend", function () { + if (!ctrl.enabled) { + return; + } + ctrl.refresh(); + }); - // unbind event & remove layer on destroy - $scope.$on("$destroy", function () { - ctrl.map.un(mapEventKey); - ctrl.map.removeLayer(ctrl.layer); - ctrl.map.removeInteraction(ctrl.hoverInteration); - ctrl.map.removeInteraction(ctrl.overlay); - }); + // unbind event & remove layer on destroy + $scope.$on("$destroy", function () { + ctrl.map.un(mapEventKey); + ctrl.map.removeLayer(ctrl.layer); + ctrl.map.removeInteraction(ctrl.hoverInteration); + ctrl.map.removeInteraction(ctrl.overlay); + }); // adjust ES request based on current filters // (skip the initial watch trigger) diff --git a/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/WfsFilterDirective.js b/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/WfsFilterDirective.js index 24a6c8dc17..e53117490c 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/WfsFilterDirective.js +++ b/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/WfsFilterDirective.js @@ -398,10 +398,9 @@ featureTypes.forEach(function (featureTypeName) { var layer = gnOwsCapabilities.getLayerInfoFromWfsCap( - featureTypeName, - capObj, - scope.uuid - + featureTypeName, + capObj, + scope.uuid ); if (layer) { diff --git a/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/partials/wfsfilterfacet.html b/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/partials/wfsfilterfacet.html index d1b7e30a09..3a6f43c3a4 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/partials/wfsfilterfacet.html +++ b/web-ui/src/main/resources/catalog/components/viewer/wfsfilter/partials/wfsfilterfacet.html @@ -6,9 +6,10 @@ || (user.isAdministrator() && md.isHarvested == 'true')) && isWfsAvailable == false" class="alert alert-warning" - > - + wfsNotAvailable diff --git a/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js b/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js index 9506035cb3..c78f56515a 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js +++ b/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js @@ -397,27 +397,25 @@ if (!geom) { return; } - var geom_type; - geom = geom.toLowerCase(); - switch ( - geom - ) { - case "line": - geom_type = "LineString"; - break; + var geom_type; + geom = geom.toLowerCase(); + switch (geom) { + case "line": + geom_type = "LineString"; + break; - case "point": - geom_type = "Point"; - break; + case "point": + geom_type = "Point"; + break; - case "polygon": - geom_type = "Polygon"; - break; + case "polygon": + geom_type = "Polygon"; + break; - // TODO: add other types? + // TODO: add other types? - default: - geom_type = null; + default: + geom_type = null; } if (geom_type && isMulti) { geom_type = "Multi" + geom_type; @@ -443,7 +441,7 @@ .map(function (i) { return i.href; })[0] - ); + ); } // try in ows:Metadata if not found if ( @@ -778,16 +776,18 @@ scope.running = true; scope.executeState = "sent"; - gnWpsService.execute(processUri, processId, inputs, output, scope.processDescription).then( - function (response) { - processResponse(response); - }, - function (response) { - scope.executeState = "failed"; - scope.executeResponse = response; - scope.running = false; - } - ); + gnWpsService + .execute(processUri, processId, inputs, output, scope.processDescription) + .then( + function (response) { + processResponse(response); + }, + function (response) { + scope.executeState = "failed"; + scope.executeResponse = response; + scope.running = false; + } + ); // update local storage if ($window.localStorage) { diff --git a/web-ui/src/main/resources/catalog/components/viewer/wps/partials/processform.html b/web-ui/src/main/resources/catalog/components/viewer/wps/partials/processform.html index a1e35cf57b..2227d8e817 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/wps/partials/processform.html +++ b/web-ui/src/main/resources/catalog/components/viewer/wps/partials/processform.html @@ -76,10 +76,11 @@

    wpsDescribeProcessFailed

    gn-bootstrap-datepicker="pickerValues" config="{dateMin: getDateBounds(input, true), dateMax: getDateBounds(input, false)}" data-date-format="dd-mm-yyyy" - - > + @@ -182,7 +183,7 @@

    wpsDescribeProcessFailed

    output-crs="{{ map.getView().getProjection().getCode() }}" output-as-features="true" map="map" - active-geometry-tool="activeGeometryTool" + active-geometry-tool="activeGeometryTool" /> diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js index 1c2642cdff..130e6ed122 100644 --- a/web-ui/src/main/resources/catalog/js/CatController.js +++ b/web-ui/src/main/resources/catalog/js/CatController.js @@ -1533,7 +1533,8 @@ "$cookies", "gnExternalViewer", "gnAlertService", - "gnESFacet",function ( + "gnESFacet", + function ( $scope, $http, $q, @@ -1552,8 +1553,7 @@ gnSearchSettings, $cookies, gnExternalViewer, - gnAlertService - , + gnAlertService, gnESFacet ) { $scope.version = "0.0.1"; diff --git a/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js b/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js index b63e8029be..68e2597d24 100644 --- a/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js +++ b/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js @@ -311,8 +311,7 @@ $scope.formatterDelete = function (f) { var url = "../api/formatters/" + f.schema + "/" + f.id; - $http - .delete(url).then( + $http.delete(url).then( function (response) { $scope.formatterSelected = null; loadFormatter(); diff --git a/web-ui/src/main/resources/catalog/js/admin/AdminToolsController.js b/web-ui/src/main/resources/catalog/js/admin/AdminToolsController.js index 4b76c56186..cdc3ef699c 100644 --- a/web-ui/src/main/resources/catalog/js/admin/AdminToolsController.js +++ b/web-ui/src/main/resources/catalog/js/admin/AdminToolsController.js @@ -256,8 +256,7 @@ dropFirst + "&asynchronous=true" + (index ? "&indices=" + index : ""); - return $http - .put(url).then( + return $http.put(url).then( function (response) { checkIsIndexing(); }, @@ -273,8 +272,7 @@ }; $scope.commitIndexChanges = function (dropFirst) { - return $http - .put("../api/site/index/commit").then( + return $http.put("../api/site/index/commit").then( function (response) { checkIsIndexing(); }, diff --git a/web-ui/src/main/resources/catalog/js/admin/DashboardStatusController.js b/web-ui/src/main/resources/catalog/js/admin/DashboardStatusController.js index f2cb5bae8f..779c3c4d29 100644 --- a/web-ui/src/main/resources/catalog/js/admin/DashboardStatusController.js +++ b/web-ui/src/main/resources/catalog/js/admin/DashboardStatusController.js @@ -139,9 +139,7 @@ threadActivityEl.collapse("toggle"); } $scope.threadInfoLoading = true; - $http - .get("../api/site/threads/status") - .then( + $http.get("../api/site/threads/status").then( function (response) { $scope.threadInfoLoading = false; $scope.threadStatus = response.data; @@ -160,9 +158,11 @@ $scope.openThreadActivity(true); } }, 2000); - },function (response) { + }, + function (response) { $scope.threadInfoLoading = false; - }); + } + ); }; $scope.showStackTrace = function (thread, $event) { $scope.selectedThread = thread; @@ -209,9 +209,7 @@ logActivityEl.collapse("toggle"); } $scope.logInfoLoading = true; - $http - .get("../api/site/logging/activity") - .then( + $http.get("../api/site/logging/activity").then( function (response) { $scope.logInfoLoading = false; $scope.logActivity = response.data; @@ -230,9 +228,11 @@ $scope.openLogActivity(true); } }, 2000); - },function (response) { + }, + function (response) { $scope.logInfoLoading = false; - }); + } + ); }; $scope.downloadLog = function () { diff --git a/web-ui/src/main/resources/catalog/js/admin/HarvestController.js b/web-ui/src/main/resources/catalog/js/admin/HarvestController.js index e486426cf2..a01f8b56d9 100644 --- a/web-ui/src/main/resources/catalog/js/admin/HarvestController.js +++ b/web-ui/src/main/resources/catalog/js/admin/HarvestController.js @@ -150,23 +150,25 @@ harvesterIndex[oldH["@id"]] = oldH; }); - for (var i = 0; i < data.length; i++) { - var h = data[i]; - gnUtilityService.parseBoolean(h.info); - var old = harvesterIndex[h["@id"]]; - if (old && !angular.equals(old.info, h.info)) { - old.info = h.info; + for (var i = 0; i < data.length; i++) { + var h = data[i]; + gnUtilityService.parseBoolean(h.info); + var old = harvesterIndex[h["@id"]]; + if (old && !angular.equals(old.info, h.info)) { + old.info = h.info; + } + if (old && !angular.equals(old.error, h.error)) { + old.error = h.error; + } } - if (old && !angular.equals(old.error, h.error)) { - old.error = h.error; - } - } - setTimeout(pollHarvesterStatus, 5000); + setTimeout(pollHarvesterStatus, 5000); + } + }, + function (response) { + isPolling = false; } - },function (response) { - isPolling = false; - }); + ); }; $scope.refreshHarvester = function () { diff --git a/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js b/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js index f13073cf0d..b93b9606a4 100644 --- a/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js +++ b/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js @@ -82,8 +82,7 @@ * if favicon parameter is set to true. */ $scope.setCatalogLogo = function (logoName, asFavicon) { - $http - .put("../api/site/logo?file=" + logoName + "&asFavicon=" + asFavicon).then( + $http.put("../api/site/logo?file=" + logoName + "&asFavicon=" + asFavicon).then( function (response) { $rootScope.$broadcast("StatusUpdated", { msg: $translate.instant("logoUpdated"), diff --git a/web-ui/src/main/resources/catalog/js/admin/ReportController.js b/web-ui/src/main/resources/catalog/js/admin/ReportController.js index fb9dc9508c..5a6c4250e2 100644 --- a/web-ui/src/main/resources/catalog/js/admin/ReportController.js +++ b/web-ui/src/main/resources/catalog/js/admin/ReportController.js @@ -157,9 +157,7 @@ } ); } else { - $http - .get("../api/users/" + $scope.user.id + "/groups") - .then( + $http.get("../api/users/" + $scope.user.id + "/groups").then( function (response) { // Extract the group property from user groups array var groups = _.map(response.data, "group"); diff --git a/web-ui/src/main/resources/catalog/js/admin/SourcesController.js b/web-ui/src/main/resources/catalog/js/admin/SourcesController.js index 145bedb14c..87e47090d0 100644 --- a/web-ui/src/main/resources/catalog/js/admin/SourcesController.js +++ b/web-ui/src/main/resources/catalog/js/admin/SourcesController.js @@ -137,8 +137,7 @@ $scope.updateSource = function () { var url = "../api/sources" + ($scope.isNew ? "" : "/" + $scope.source.uuid); - $http - .put(url, $scope.source).then( + $http.put(url, $scope.source).then( function (response) { $rootScope.$broadcast("StatusUpdated", { msg: $translate.instant("sourceUpdated"), @@ -155,7 +154,8 @@ timeout: 0, type: "danger" }); - }); + } + ); }; $scope.deleteSourceConfig = function () { @@ -163,8 +163,7 @@ }; $scope.confirmDeleteSourceConfig = function () { - $http - .delete("../api/sources/" + $scope.source.uuid).then( + $http.delete("../api/sources/" + $scope.source.uuid).then( function (response) { $rootScope.$broadcast("StatusUpdated", { msg: $translate.instant("sourceRemoved"), diff --git a/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js b/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js index 3fbe431a74..9783dcc5a8 100644 --- a/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js +++ b/web-ui/src/main/resources/catalog/js/edit/BatchEditController.js @@ -304,8 +304,7 @@ value, index, insertMode, - isXpath - , + isXpath, condition ) { $scope.changes[index] = { @@ -327,8 +326,7 @@ field.template, $event.target.value, $scope.changes.length, - field.insertMode - , + field.insertMode, field.condition ); }; @@ -352,8 +350,7 @@ field.template, $event.target.value, index, - field.insertMode - , + field.insertMode, field.condition ); } @@ -478,8 +475,7 @@ c.value, $scope.changes.length, c.insertMode, - true - , + true, c.condition ); @@ -541,7 +537,7 @@ } else { value = value; } - params.push({ xpath: xpath, value: value , condition: field.condition }); + params.push({ xpath: xpath, value: value, condition: field.condition }); i++; } }); diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest-settings.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest-settings.html index 2c6b1f9fb6..ce673e343e 100644 --- a/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest-settings.html +++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest-settings.html @@ -288,7 +288,11 @@ - +
    || isLoadingOneHarvester || deleting.indexOf(harvesterSelected['@id']) > -1" role="tab" - active="activeTab.results" - >
    + >
    summary diff --git a/web-ui/src/main/resources/catalog/templates/admin/settings/system.html b/web-ui/src/main/resources/catalog/templates/admin/settings/system.html index 40c4cb69f6..74c241a6b9 100644 --- a/web-ui/src/main/resources/catalog/templates/admin/settings/system.html +++ b/web-ui/src/main/resources/catalog/templates/admin/settings/system.html @@ -311,9 +311,7 @@

    {{section2.name | translate}}

    data-ng-model="draftInAllGroupsUserValue" data-ng-init="draftInAllGroupsInputValue=s.value || '.*'" data-ng-change="draftInAllGroups == true?null:draftInAllGroupsInputValue=draftInAllGroupsUserValue" - - - data-ng-readonly="draftInAllGroups == true" + data-ng-readonly="draftInAllGroups == true" data-ng-value="draftInAllGroups == true ? '.*' : draftInAllGroupsInputValue" />
    diff --git a/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html b/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html index 19c897e416..b0749777f6 100644 --- a/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html +++ b/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html @@ -95,8 +95,8 @@ data-ng-disabled="!gnUserEdit.$valid && !gnUserEdit.dirty" data-ng-click="saveUser('#gn-user-edit')" id="gn-btn-user-save" - - > saveUser + > + saveUser
    @@ -242,7 +242,8 @@ name="password2" class="form-control" autocomplete="off" - gn-valid-password-confirmation="{{userSelected.password===passwordCheck}}"data-ng-model="passwordCheck" + gn-valid-password-confirmation="{{userSelected.password===passwordCheck}}" + data-ng-model="passwordCheck" /> {{attribute.code}}     data-ng-repeat="facetKey in homeFacet.list" data-ng-init="agg = searchInfo.aggregations[facetKey]" data-ng-show="facetKey != homeFacet.lastKey" - > class="sr-only" data-ng-model="homeFacet.key" data-ng-value="facetKey" - - />{{::('facet-' + facetKey) | facetKeyTranslator}}{{::('facet-' + facetKey) | facetKeyTranslator}} 
    diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadata.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadata.html index 3cf722fe37..a3aa4c34bf 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadata.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/metadata.html @@ -5,7 +5,7 @@ metadataInXML diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/title.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/title.html index 691e54981f..5d4ac0cc73 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/title.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/title.html @@ -18,7 +18,7 @@

    alternateTitle diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html index d049c897e8..582d0f1b15 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-dataset.html @@ -1,7 +1,6 @@
    diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html index b3cfbaa6dd..3486e7c7e5 100644 --- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html +++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html @@ -1,6 +1,5 @@