@opengeoweb/layer-select 9.37.0 → 10.1.0

package/README.md

@@ -5,3 +5,7 @@ This library was generated with [Nx](https://nx.dev).
 ## Running unit tests
 
 Run `nx test layer-select` to execute the unit tests via [Jest](https://jestjs.io).
+
+### TypeScript Documentation
+
+- [TypeScript Docs](https://opengeoweb.gitlab.io/opengeoweb/typescript-docs/layer-select/)

package/index.esm.js

@@ -12,7 +12,7 @@ import 'i18next';
 import { useTranslation } from 'react-i18next';
 import { FixedSizeList } from 'react-window';
 import { getDimensionsList, LayerInfoButton } from '@opengeoweb/webmap-react';
-import { webmapUtils, LayerType, WMGetServiceFromStore, getCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getWMSServiceId, queryWMSServiceInfo, queryWMSLayers, invalidateWMSGetCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
 import { snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
 import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
@@ -2373,20 +2373,30 @@ var loadWMSService = /*#__PURE__*/function () {
           if (forceReload === void 0) {
             forceReload = false;
           }
-          _context.next = 3;
-          return getCapabilities.getLayersFlattenedFromService(serviceUrl, forceReload);
-        case 3:
+          if (!forceReload) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return invalidateWMSGetCapabilities(serviceUrl);
+        case 4:
+          _context.next = 6;
+          return queryWMSLayers(serviceUrl);
+        case 6:
           layers = _context.sent;
-          service = WMGetServiceFromStore(serviceUrl);
+          _context.next = 9;
+          return queryWMSServiceInfo(serviceUrl);
+        case 9:
+          service = _context.sent;
           return _context.abrupt("return", {
-            id: service.id,
+            id: service.id || getWMSServiceId(serviceUrl),
             name: service.title,
             serviceUrl: serviceUrl,
             "abstract": service["abstract"],
             layers: layers,
             scope: 'user'
           });
-        case 6:
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -2438,8 +2448,11 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
       isUpdating: true
     })));
   }, [dispatch]);
-  var setServicePopupInfo = React.useCallback(function (payload) {
-    dispatch(layerSelectActions.toggleServicePopup(Object.assign({}, payload)));
+  var setServicePopupInfo = React.useCallback(function (popupInfo) {
+    var payload = Object.assign({}, popupInfo, {
+      variant: popupInfo.variant || 'default'
+    });
+    dispatch(layerSelectActions.toggleServicePopup(payload));
   }, [dispatch]);
   var showSnackbar = React.useCallback(function (message) {
     dispatch(snackbarActions.openSnackbar(message));
@@ -2675,28 +2688,20 @@ var getTitleForVariant = function getTitleForVariant(t, variant) {
       return 'Service';
   }
 };
-var fields = {
-  serviceUrl: {
-    name: 'serviceUrl',
-    label: 'This service refers to this URL'
-  },
-  serviceName: {
-    name: 'serviceName',
-    label: 'Service name'
-  },
-  serviceAbstracts: {
-    name: 'serviceAbstracts',
-    label: 'Abstracts'
-  }
-};
+var FormFields;
+(function (FormFields) {
+  FormFields["serviceUrl"] = "serviceUrl";
+  FormFields["serviceName"] = "serviceName";
+  FormFields["serviceAbstracts"] = "serviceAbstracts";
+})(FormFields || (FormFields = {}));
 var InitialValidationsTrigger = function InitialValidationsTrigger(_ref) {
   var trigger = _ref.trigger,
     getValues = _ref.getValues,
     onValidField = _ref.onValidField;
   React.useEffect(function () {
-    var value = getValues(fields.serviceUrl.name);
+    var value = getValues(FormFields.serviceUrl);
     if (value) {
-      void trigger(fields.serviceUrl.name).then(function (isValid) {
+      void trigger(FormFields.serviceUrl).then(function (isValid) {
         return isValid && onValidField(value);
       });
     }
@@ -2746,8 +2751,8 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
             return loadWMSService(newServiceUrl, true);
           case 4:
             service = _context.sent;
-            setValue(fields.serviceName.name, service.name);
-            setValue(fields.serviceAbstracts.name, service["abstract"]);
+            setValue(FormFields.serviceName, service.name);
+            setValue(FormFields.serviceAbstracts, service["abstract"] || '');
             setIsLoading(false);
             setShouldForceReload(false);
             _context.next = 16;
@@ -2757,7 +2762,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
             _context.t0 = _context["catch"](0);
             setIsLoading(false);
             setShouldForceReload(true);
-            setError(fields.serviceUrl.name, {
+            setError(FormFields.serviceUrl, {
               message: t('validations-request-failed'),
               type: 'SYSTEM'
             });
@@ -2777,7 +2782,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            clearErrors(fields.serviceUrl.name);
+            clearErrors(FormFields.serviceUrl);
             setIsLoading(true);
             _context2.prev = 2;
             _context2.next = 5;
@@ -2801,7 +2806,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
             _context2.prev = 12;
             _context2.t0 = _context2["catch"](2);
             setIsLoading(false);
-            setError(fields.serviceUrl.name, {
+            setError(FormFields.serviceUrl, {
               message: t('validations-request-failed'),
               type: 'SYSTEM'
             });
@@ -2819,16 +2824,16 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
     return validateServiceUrl(t, value, services);
   };
   var onFocusServiceUrl = function onFocusServiceUrl() {
-    var hasValue = getValues(fields.serviceUrl.name);
-    if (!errors[fields.serviceUrl.name] && hasValue) {
-      void trigger(fields.serviceUrl.name);
+    var hasValue = getValues(FormFields.serviceUrl);
+    if (!errors[FormFields.serviceUrl] && hasValue) {
+      void trigger(FormFields.serviceUrl);
     }
   };
   var onBlurServiceUrl = function onBlurServiceUrl() {
-    void trigger(fields.serviceUrl.name).then(function () {
-      var hasValue = getValues(fields.serviceUrl.name);
-      if (!errors[fields.serviceUrl.name] && hasValue) {
-        void fetchServiceData(getValues(fields.serviceUrl.name));
+    void trigger(FormFields.serviceUrl).then(function () {
+      var hasValue = getValues(FormFields.serviceUrl);
+      if (!errors[FormFields.serviceUrl] && hasValue) {
+        void fetchServiceData(getValues(FormFields.serviceUrl));
       }
     });
   };
@@ -2841,8 +2846,8 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
     return validateServiceName(t, value, services, serviceName);
   };
   var getFormAreRequiredFieldsEmpty = function getFormAreRequiredFieldsEmpty() {
-    var serviceNameField = watch(fields.serviceName.name);
-    var serviceUrlField = watch(fields.serviceUrl.name);
+    var serviceNameField = watch(FormFields.serviceName);
+    var serviceUrlField = watch(FormFields.serviceUrl);
     return serviceNameField === '' || serviceNameField === undefined || serviceUrlField === '' || serviceUrlField === undefined;
   };
   var getFormHasformErrors = function getFormHasformErrors() {
@@ -2872,7 +2877,9 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
       }
     },
     children: jsxs("form", {
-      onSubmit: handleSubmit(addNewService),
+      onSubmit: handleSubmit(function (formValues) {
+        return addNewService(formValues);
+      }),
       children: [jsxs(DialogTitle, {
         sx: {
           alignItems: 'center',
@@ -2927,7 +2934,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
           padding: '8px 16px'
         },
         children: [jsx(ReactHookFormTextField, {
-          name: fields.serviceUrl.name,
+          name: FormFields.serviceUrl,
           label: t('service-url-label'),
           onFocus: onFocusServiceUrl,
           autoFocus: !shouldDisableAutoFocus,
@@ -2961,7 +2968,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
           },
           defaultValue: serviceUrl
         }), jsx(ReactHookFormTextField, {
-          name: fields.serviceName.name,
+          name: FormFields.serviceName,
           label: t('service-name-label'),
           rules: {
             required: true,
@@ -2979,7 +2986,7 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
         }), jsx(ReactHookFormTextField, {
           multiline: true,
           rows: 4,
-          name: fields.serviceAbstracts.name,
+          name: FormFields.serviceAbstracts,
           label: t('service-abstracts-label'),
           disabled: isShowPopup || isLoading,
           isReadOnly: isShowPopup,
@@ -3154,4 +3161,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, getServiceFailedUpdateMessage, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, layerSelectConfig, initialState as layerSelectInitialState, reducer as layerSelectReducer, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };
+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, getServiceFailedUpdateMessage, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, layerSelectConfig, initialState as layerSelectInitialState, layerSelectListener, reducer as layerSelectReducer, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.37.0",
+  "version": "10.1.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -13,7 +13,7 @@ export interface ServicePopupInfo {
     isOpen: boolean;
     serviceId?: string;
     serviceUrl?: string;
-    variant?: layerSelectTypes.PopupVariant;
+    variant: layerSelectTypes.PopupVariant;
 }
 export declare const ServiceOptionsDialog: React.FC<ServiceOptionsDialogProps>;
 export {};

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

@@ -4,3 +4,4 @@ export { useAppSelector } from './selectors';
 export * as layerSelectTypes from './types';
 export * from './config';
 export { isUserAddedService } from './utils';
+export { layerSelectListener } from './listeners';

package/src/lib/store/selectors.d.ts

@@ -82,7 +82,7 @@ export declare const isAllFiltersChecked: ((state: LayerSelectModuleState) => bo
  * @param {object} store store: object - object from which the service state will be extracted
  * @returns {array} returnType: LayerWithServiceName - an array of all filtered activelayers
  */
-export declare const getFilteredLayers: ((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => LayerWithServiceName[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: import("dist/libs/store/src/store/mapStore/types").Services, args_2: string[], args_3: boolean, args_4: string) => LayerWithServiceName[], {
+export declare const getFilteredLayers: ((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => LayerWithServiceName[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: import("dist/libs/store/src/store/map/types").Services, args_2: string[], args_3: boolean, args_4: string) => LayerWithServiceName[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

package/src/lib/utils/testUtils.d.ts

@@ -1,4 +1,4 @@
 import { Store } from '@reduxjs/toolkit';
 import { uiTypes, WebMapStateModuleState } from '@opengeoweb/store';
 import { LayerSelectModuleState } from '../store/types';
-export declare const createMockStore: (mockState: LayerSelectModuleState & uiTypes.UIModuleState & WebMapStateModuleState) => Store;
+export declare const createMockStore: (mockState?: LayerSelectModuleState & uiTypes.UIModuleState & WebMapStateModuleState) => Store;