✨ Search results pagination

src/app/gui/inputs/service.js

@@ -1,6 +1,5 @@
 import { toRawType } from 'utils/toRawType';
-
-const { t }         = require('g3w-i18n');
+import { t }         from 'g3w-i18n';
 
 const Validators = {
 

src/components/App.vue

@@ -537,8 +537,7 @@ import ModalLogin         from 'components/ModalLogin.vue';
 import ModalAddlayer      from 'components/ModalAddLayer.vue';
 import ModalChangemap     from 'components/ModalChangeMap.vue';
 import ModalMetadata      from 'components/ModalMetadata.vue';
-
-const { t }               = require('g3w-i18n');
+import { t }              from 'g3w-i18n';
 
 export default {
 
@@ -549,14 +548,14 @@ export default {
     const custom_links = (window.initConfig.header_custom_links || []).concat(ApplicationState.navbaritems).filter(Boolean)
 
     custom_links.unshift({
-      id: 'credits',
-      type: 'metadata',
+      id:     'credits',
+      type:   'metadata',
       target: '#metadata_credits',
-      icon: 'far fa-question-circle',
-      title: 'Credits'
+      icon:   'far fa-question-circle',
+      title:  'Credits',
     });
 
-    custom_links.forEach(item => !item.id && (item.id = getUniqueDomId()));
+    custom_links.forEach(l => !l.id && (l.id = getUniqueDomId()));
 
     return {
       language:              null,
@@ -642,9 +641,9 @@ export default {
     },
 
     breadcrumb() {
-        return this.state.content.contentsdata
-          .filter(c => c.options.crumb)
-          .map(c => c.options.crumb);
+      return this.state.content.contentsdata
+        .filter(c => c.options.crumb)
+        .map(c => c.options.crumb);
     },
 
     showresize() {
@@ -664,7 +663,7 @@ export default {
     showtitle() {
       if (this.state.content.contentsdata.length > 0) {
         const options = this.state.content.contentsdata[this.state.content.contentsdata.length - 1].options;
-        if (true === options.showtitle || false === options.showtitle) { return options.showtitle }
+        if ( [true, false].includes(options.showtitle) ) { return options.showtitle }
       }
       return true;
     },

src/components/Catalog.vue

@@ -416,7 +416,7 @@ export default {
           _layers.push(layer);
         }
         if (null !== layer.nodes && undefined !== layer.nodes) {
-          _layers = _layers.concat(this._traverseVisibleLayers(layer.nodes, _layers));
+          this._traverseVisibleLayers(layer.nodes, _layers);
         }
       }
       return _layers;

src/components/CatalogChangeMapThemes.vue

@@ -186,8 +186,7 @@ import InputText          from "./InputText.vue";
 import GUI                from "services/gui";
 import ApplicationState   from 'store/application';
 import { XHR }            from 'utils/XHR';
-
-const { t } = require('g3w-i18n');
+import { t }              from 'g3w-i18n';
 
 /**
  * Attributes to send to server of layerstrees object

src/components/CatalogContextMenu.vue

@@ -455,10 +455,9 @@
   import GUI                           from 'services/gui';
   import { downloadFile }              from 'utils/downloadFile';
   import { getCatalogLayerById }       from 'utils/getCatalogLayerById';
+  import { t }                         from 'g3w-i18n';
 
-  const { t }                        = require('g3w-i18n');
-  const shpwrite                     = require('shp-write');
-
+  import shpwrite                      from 'shp-write';
   /**
    * @see https://www.w3schools.com/howto/howto_js_draggable.asp 
    */

src/components/CatalogTristateTree.vue

@@ -163,7 +163,7 @@
 
         <!-- TOGGLE FILTER  -->
         <span
-          v-if                         = "!layerstree.external && (layerstree.selection.active || layerstree.filter.active)"
+          v-if                         = "!layerstree.external && (layerstree.selection.active || layerstree.filter.active) && !layerstree.filter.pagination"
           class                        = "action-button skin-tooltip-left selection-filter-icon"
           data-placement               = "left"
           data-toggle                  = "tooltip"
@@ -336,7 +336,7 @@ export default {
 
     isHighLight() {
       const layer = getCatalogLayerById(this.layerstree.id) || this.layerstree;
-      return layer && ApplicationState.highlightlayers && layer.isVisible() && layer.getTocHighlightable();
+      return !this.isGroup && ApplicationState.highlightlayers && layer && layer.isVisible() && layer.getTocHighlightable();
     },
 
     isInGrey() {

src/components/GlobalTabs.vue

@@ -124,7 +124,7 @@
       },
       handleRelation: {
         type:     Function,
-        default: ({relation, layerId, feature}={}) => GUI.getService('queryresults').showRelation({relation, layerId, feature})
+        default: ({ relation, layerId, feature } = {}) => GUI.getService('queryresults').showRelation({relation, layerId, feature})
       }
     },
     data() {

src/components/GlobalTabsNode.vue

@@ -44,7 +44,7 @@
               <div
                 v-if        = "showRelationByField"
                 v-disabled  = "isRelationDisabled(getNode(row, column)) || loadingRelation(getNode(row, column)).loading"
-                @click.stop = "handleRelation({relation: getNode(row, column), feature:feature, layerId: layerid})"
+                @click.stop = "handleRelation({ relation: getNode(row, column), feature:feature, layerId: layerid })"
                 :style      = "{cursor: showRelationByField && 'pointer'}"
               >
                 <bar-loader :loading="loadingRelation(getNode(row, column)).loading"/>

src/components/InputMedia.vue

@@ -35,9 +35,9 @@
 <script>
   import GUI                from 'services/gui';
   import { getUniqueDomId } from 'utils/getUniqueDomId';
+  import { t }              from 'g3w-i18n';
 
   const InputMixins                 = require('gui/inputs/input');
-  const { t }                       = require('g3w-i18n');
   const { media_field: MediaField } = require('gui/fields/fields');
 
   export default {

src/components/MapControlGeocoding.vue

@@ -192,8 +192,7 @@ import { isPointGeometryType }          from 'utils/isPointGeometryType';
 import { convertSingleMultiGeometry }   from 'utils/convertSingleMultiGeometry';
 import { getCatalogLayerById }          from 'utils/getCatalogLayerById';
 import { getCatalogLayers }             from 'utils/getCatalogLayers';
-
-const { t } = require('g3w-i18n');
+import { t }                            from 'g3w-i18n';
 
 /**
  * Provider definitions.

src/components/Print.vue

@@ -182,8 +182,7 @@ import { getCatalogLayerById }      from 'utils/getCatalogLayerById';
 import resizeMixin                  from 'mixins/resize';
 
 import * as vueComp                 from 'components/PrintPage.vue';
-
-const { t } = require('g3w-i18n');
+import { t }                        from 'g3w-i18n';
 
 export default {
 

src/components/ProjectsMenu.vue

@@ -31,9 +31,8 @@
 </template>
 
 <script>
-import GUI from 'services/gui';
-
-const { t } = require('g3w-i18n');
+import GUI   from 'services/gui';
+import { t } from 'g3w-i18n';
 
 export default {
 

src/components/QueryBuilder.vue

@@ -122,8 +122,7 @@ import { getUniqueDomId }          from 'utils/getUniqueDomId';
 import { createFilterFromString }  from 'utils/createFilterFromString';
 import { XHR }                     from 'utils/XHR';
 import { getCatalogLayerById }     from 'utils/getCatalogLayerById';
-
-const { t } = require('g3w-i18n');
+import { t }                       from 'g3w-i18n';
 
 export default {