@opengeoweb/layer-select 12.11.0 → 12.12.0

package/index.esm.js

@@ -4,7 +4,7 @@ import React__default from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { CustomIconButton, FilterOption, ToolContainerDraggable, CustomAccordion, CustomToggleButton, CustomTooltip, SearchHighlight, SearchField, AlertBanner, ToggleMenu, CustomDialog, sessionStorageProvider } from '@opengeoweb/shared';
 import { Filter, LayersAdd, Add, Cached, Edit, Visibility, Delete, MeteoGate, Copy } from '@opengeoweb/theme';
-import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, mapListener, serviceListener, layersListener, openlayersListener, uiReducer, layerReducer, serviceReducer, mapReducer, useSetupDialog, mapSelectors, layerTypes } from '@opengeoweb/store';
+import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, mapListener, serviceListener, layersListener, openlayersListener, uiReducer, layerReducer, serviceReducer, mapReducer, useSetupDialog, mapSelectors, layerTypes, mapEnums } from '@opengeoweb/store';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { compact, countBy, partition } from 'lodash';
 import { snackbarListener, snackbarReducer, snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
@@ -505,12 +505,13 @@ var getSearchFilter = createSelector(layerSelectStore, function (store) {
 var getActiveServices = function getActiveServices(store) {
   return getActiveServicesDictionary(store);
 };
+var EMPTY_ACTIVE_SERVICES = {
+  entities: {},
+  ids: []
+};
 var _layerSelectActiveSer = layerSelectActiveServicesAdapter.getSelectors(function (store) {
     var _store$layerSelect;
-    return (store == null || (_store$layerSelect = store.layerSelect) == null || (_store$layerSelect = _store$layerSelect.filters) == null ? void 0 : _store$layerSelect.activeServices) || {
-      entities: {},
-      ids: []
-    };
+    return (store == null || (_store$layerSelect = store.layerSelect) == null || (_store$layerSelect = _store$layerSelect.filters) == null ? void 0 : _store$layerSelect.activeServices) || EMPTY_ACTIVE_SERVICES;
   }),
   getActiveServicesDictionary = _layerSelectActiveSer.selectEntities,
   getActiveServiceById = _layerSelectActiveSer.selectById,
@@ -533,12 +534,13 @@ var getEnabledServiceIds = createSelector(getAllActiveServices, function (servic
 var getAllFilterIds = function getAllFilterIds(store) {
   return getAllFilterIdsEntity(store);
 };
+var EMPTY_FILTERS = {
+  entities: {},
+  ids: []
+};
 var _layerSelectFilterAda = layerSelectFilterAdapter.getSelectors(function (store) {
     var _store$layerSelect2;
-    return (store == null || (_store$layerSelect2 = store.layerSelect) == null || (_store$layerSelect2 = _store$layerSelect2.filters) == null ? void 0 : _store$layerSelect2.filters) || {
-      entities: {},
-      ids: []
-    };
+    return (store == null || (_store$layerSelect2 = store.layerSelect) == null || (_store$layerSelect2 = _store$layerSelect2.filters) == null ? void 0 : _store$layerSelect2.filters) || EMPTY_FILTERS;
   }),
   getAllFilters = _layerSelectFilterAda.selectAll,
   getAllFilterIdsEntity = _layerSelectFilterAda.selectIds,
@@ -579,11 +581,11 @@ var getFilters = createSelector(getAllActiveServices, getAllFilters, function (s
     }),
     groupsWithCount = _partition[0],
     keywordsWithCount = _partition[1];
-  var groupsSorted = [].concat(groupsWithCount).sort(function (a, b) {
-    return a.name.localeCompare(b.name);
+  var groupsSorted = [].concat(groupsWithCount).sort(function (groupA, groupB) {
+    return groupA.name.localeCompare(groupB.name);
   });
-  var keywordsSorted = [].concat(keywordsWithCount).sort(function (a, b) {
-    return a.name.localeCompare(b.name);
+  var keywordsSorted = [].concat(keywordsWithCount).sort(function (groupA, groupB) {
+    return groupA.name.localeCompare(groupB.name);
   });
   return {
     groups: groupsSorted,
@@ -1529,14 +1531,14 @@ var widthToRowHeight = function widthToRowHeight(width) {
 };
 var sortByService = function sortByService(serviceObj) {
   return Object.entries(serviceObj).sort(function (_ref, _ref2) {
-    var a = _ref[1];
-    var b = _ref2[1];
-    return a.serviceName.localeCompare(b == null ? void 0 : b.serviceName);
-  }).reduce(function (r, _ref3) {
+    var serviceA = _ref[1];
+    var serviceB = _ref2[1];
+    return serviceA.serviceName.localeCompare(serviceB == null ? void 0 : serviceB.serviceName);
+  }).reduce(function (result, _ref3) {
     var _Object$assign;
     var key = _ref3[0],
       value = _ref3[1];
-    return Object.assign({}, r, (_Object$assign = {}, _Object$assign[key] = value, _Object$assign));
+    return Object.assign({}, result, (_Object$assign = {}, _Object$assign[key] = value, _Object$assign));
   }, {});
 };
 
@@ -1649,8 +1651,8 @@ var LayerListRow = function LayerListRow(_ref) {
             }), ((_layer$keywords = layer.keywords) == null ? void 0 : _layer$keywords.length) > 0 && jsxs(Typography, {
               sx: layerInfoStyle,
               children: [t('keywords'), ":", ' ', jsx(SearchHighlight, {
-                text: layer.keywords.slice().sort(function (a, b) {
-                  return a.localeCompare(b);
+                text: layer.keywords.slice().sort(function (textA, textB) {
+                  return textA.localeCompare(textB);
                 }).join(', '),
                 search: searchFilter
               })]
@@ -2551,24 +2553,28 @@ var DataExplorerButtonConnect = function DataExplorerButtonConnect(_ref) {
     source = _ref$source === void 0 ? 'app' : _ref$source;
   var dispatch = useDispatch();
   var dialogType = uiTypes.DialogTypes.DataExplorer;
+  var currentActiveMapId = useSelector(function (store) {
+    return uiSelectors.getDialogMapId(store, dialogType);
+  });
   var isOpenInStore = useSelector(function (store) {
     return uiSelectors.getisDialogOpen(store, dialogType);
   });
   var openDataExplorerDialog = React.useCallback(function () {
     dispatch(uiActions.setActiveMapIdForDialog({
       type: dialogType,
-      setOpen: !isOpenInStore,
+      setOpen: currentActiveMapId !== mapId ? true : !isOpenInStore,
       source: source,
-      mapId: mapId
+      mapId: mapId,
+      origin: mapEnums.MapActionOrigin.map
     }));
-  }, [mapId, dialogType, dispatch, source, isOpenInStore]);
+  }, [dispatch, dialogType, currentActiveMapId, mapId, isOpenInStore, source]);
   return jsx(CustomTooltip, {
     title: "MeteoGate Data Explorer",
     children: jsx(CustomIconButton, {
       variant: "tool",
       "data-testid": "dataExplorerButton",
       onClick: openDataExplorerDialog,
-      isSelected: isOpenInStore,
+      isSelected: currentActiveMapId !== mapId ? false : isOpenInStore,
       children: jsx(MeteoGate, {
         sx: {}
       })
@@ -3185,4 +3191,4 @@ var LayerSelectConnect = function LayerSelectConnect(_ref) {
   });
 };
 
-export { AllChipConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, createMockStore, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };
+export { AllChipConnect, DataExplorerButtonConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, createMockStore, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "12.11.0",
+  "version": "12.12.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,15 +8,15 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "12.11.0",
-    "@opengeoweb/store": "12.11.0",
+    "@opengeoweb/shared": "12.12.0",
+    "@opengeoweb/store": "12.12.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.11.0",
-    "@opengeoweb/webmap-react": "12.11.0",
-    "@opengeoweb/webmap": "12.11.0",
+    "@opengeoweb/theme": "12.12.0",
+    "@opengeoweb/webmap-react": "12.12.0",
+    "@opengeoweb/webmap": "12.12.0",
     "react-window": "^1.8.10",
-    "@opengeoweb/snackbar": "12.11.0",
-    "@opengeoweb/form-fields": "12.11.0",
+    "@opengeoweb/snackbar": "12.12.0",
+    "@opengeoweb/form-fields": "12.12.0",
     "react-hook-form": "^7.50.1",
     "@reduxjs/toolkit": "^2.6.1",
     "lodash": "^4.17.21",

package/src/lib/components/DataExplorerButtonConnect/index.d.ts

@@ -0,0 +1 @@
+export { DataExplorerButtonConnect } from './DataExplorerButtonConnect';

package/src/lib/components/index.d.ts

@@ -7,3 +7,4 @@ export * from './ServiceList';
 export * from './ServiceOptionsButton';
 export * from './ServiceOptionsDialog';
 export * from './ServicePopup';
+export * from './DataExplorerButtonConnect';