@opengeoweb/workspace 9.18.0 → 9.19.1

package/index.esm.js

@@ -4,7 +4,8 @@ import { syncGroupsTypes, syncGroupsActions, layerActions, mapStoreActions, uiAc
 import { createApiInstance, createNonAuthApiInstance, getApi, createFakeApiInstance, ApiProvider, useApiContext } from '@opengeoweb/api';
 import { getLeaves, MosaicContext, getAndAssertNodeAtPathExists, createBalancedTreeFromLeaves, MosaicWindow, Mosaic } from 'react-mosaic-component';
 import i18n from 'i18next';
-import { SHARED_NAMESPACE, sharedTranslations, isAxiosError, getAxiosErrorMessage, withEggs, ConfirmationServiceProvider, useConfirmationDialog, CustomIconButton, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, usePrevious, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
+import { SHARED_NAMESPACE, sharedTranslations, isAxiosAuthError, getAxiosErrorMessage, isAxiosError, withEggs, ConfirmationServiceProvider, useConfirmationDialog, CustomIconButton, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, usePrevious, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
+import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations } from '@opengeoweb/webmap-react';
 import { initReactI18next, useTranslation, I18nextProvider } from 'react-i18next';
 import { CORE_NAMESPACE, coreTranslations } from '@opengeoweb/core';
 import { takeLatest, takeEvery, debounce, delay, put, all, select, call as call$g, takeLeading } from 'redux-saga/effects';
@@ -589,10 +590,10 @@ var SHARED = '__core-js_shared__';
 var store$4 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
 
 (store$4.versions || (store$4.versions = [])).push({
-  version: '3.36.1',
+  version: '3.37.1',
   mode: 'global',
   copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
+  license: 'https://github.com/zloirock/core-js/blob/v3.37.1/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });
 
@@ -2858,11 +2859,16 @@ const getErrorMessage = error => {
   return suffix ? `${prefix}: ${suffix}` : prefix;
 };
 
-var ViewPresetType;
-(function (ViewPresetType) {
-  ViewPresetType["PRESET_DETAIL"] = "PRESET_DETAIL";
-  ViewPresetType["PRESET_LIST"] = "PRESET_LIST";
-})(ViewPresetType || (ViewPresetType = {}));
+var ViewPresetErrorComponent;
+(function (ViewPresetErrorComponent) {
+  ViewPresetErrorComponent["PRESET_DETAIL"] = "PRESET_DETAIL";
+  ViewPresetErrorComponent["PRESET_LIST"] = "PRESET_LIST";
+})(ViewPresetErrorComponent || (ViewPresetErrorComponent = {}));
+var ViewPresetErrorType;
+(function (ViewPresetErrorType) {
+  ViewPresetErrorType["AUTH"] = "AUTH";
+  ViewPresetErrorType["GENERIC"] = "GENERIC";
+})(ViewPresetErrorType || (ViewPresetErrorType = {}));
 var PresetAction;
 (function (PresetAction) {
   PresetAction["OPEN"] = "Open";
@@ -3186,7 +3192,8 @@ const slice$2 = createSlice({
       if (entity) {
         entity.error = {
           message: error,
-          type: ViewPresetType.PRESET_DETAIL
+          component: ViewPresetErrorComponent.PRESET_DETAIL,
+          errorType: ViewPresetErrorType.GENERIC
         };
         entity.isFetching = false;
         viewPresetsAdapter.setOne(draft, entity);
@@ -3547,22 +3554,26 @@ const initWorkspaceTestI18n = () => {
       en: {
         [WORKSPACE_NAMESPACE]: workspaceTranslations.en,
         [SHARED_NAMESPACE]: sharedTranslations.en,
-        [CORE_NAMESPACE]: coreTranslations.en
+        [CORE_NAMESPACE]: coreTranslations.en,
+        [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en
       },
       fi: {
         [WORKSPACE_NAMESPACE]: workspaceTranslations.fi,
         [SHARED_NAMESPACE]: sharedTranslations.fi,
-        [CORE_NAMESPACE]: coreTranslations.fi
+        [CORE_NAMESPACE]: coreTranslations.fi,
+        [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi
       },
       no: {
         [WORKSPACE_NAMESPACE]: workspaceTranslations.no,
         [SHARED_NAMESPACE]: sharedTranslations.no,
-        [CORE_NAMESPACE]: coreTranslations.no
+        [CORE_NAMESPACE]: coreTranslations.no,
+        [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no
       },
       nl: {
         [WORKSPACE_NAMESPACE]: workspaceTranslations.nl,
         [SHARED_NAMESPACE]: sharedTranslations.nl,
-        [CORE_NAMESPACE]: coreTranslations.nl
+        [CORE_NAMESPACE]: coreTranslations.nl,
+        [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl
       }
     }
   });
@@ -3985,13 +3996,7 @@ const getViewPresetsError = createSelector(getViewPresetById, (store, panelId) =
   return viewPreset === null || viewPreset === void 0 ? void 0 : viewPreset.error;
 }, selectorMemoizationOptions);
 const getViewPresetDetailError = createSelector(getViewPresetsError, (store, panelId) => panelId, error => {
-  if (error && error.type === 'PRESET_DETAIL') {
-    return error.message;
-  }
-  return undefined;
-}, selectorMemoizationOptions);
-const getViewPresetListError = createSelector(getViewPresetsError, (store, panelId) => panelId, error => {
-  if (error && error.type === 'PRESET_LIST') {
+  if (error && error.component === 'PRESET_DETAIL') {
     return error.message;
   }
   return undefined;
@@ -7226,6 +7231,7 @@ function* workspaceSaga() {
  * */
 var WorkspaceListErrorType;
 (function (WorkspaceListErrorType) {
+  WorkspaceListErrorType["AUTH"] = "AUTH";
   WorkspaceListErrorType["GENERIC"] = "GENERIC";
 })(WorkspaceListErrorType || (WorkspaceListErrorType = {}));
 
@@ -7298,10 +7304,13 @@ function* fetchWorkspaceListSaga({
       workspaceList: data
     }));
   } catch (error) {
+    const isAuthError = isAxiosAuthError(error);
+    const message = isAuthError ? getAxiosErrorMessage(error) : translateKeyOutsideComponents('workspace-list-error');
+    const type = isAuthError ? WorkspaceListErrorType.AUTH : WorkspaceListErrorType.GENERIC;
     yield put(workspaceListActions.errorWorkspaceList({
       error: {
-        message: translateKeyOutsideComponents('workspace-list-error'),
-        type: WorkspaceListErrorType.GENERIC
+        type,
+        message
       }
     }));
   }
@@ -7488,9 +7497,10 @@ function* submitFormWorkspaceDialogSaga({
     }
   } catch (error) {
     const message = isAxiosError(error) ? getAxiosErrorMessage(error) : error.message;
+    const type = isAxiosAuthError(error) ? WorkspaceListErrorType.AUTH : WorkspaceListErrorType.GENERIC;
     yield put(workspaceListActions.onErrorWorkspacePresetAction({
       error: {
-        type: WorkspaceListErrorType.GENERIC,
+        type,
         message
       }
     }));
@@ -7518,6 +7528,15 @@ function* rootSaga$1() {
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
+const processError = (error, component, errorMessageKey) => {
+  const message = isAxiosError(error) ? getAxiosErrorMessage(error) : translateKeyOutsideComponents(errorMessageKey);
+  const errorType = isAxiosAuthError(error) ? ViewPresetErrorType.AUTH : ViewPresetErrorType.GENERIC;
+  return {
+    message,
+    component,
+    errorType
+  };
+};
 function* fetchInitialViewPresetsSaga() {
   try {
     const presetsApi = yield call$g(getPresetsApi);
@@ -7530,10 +7549,7 @@ function* fetchInitialViewPresetsSaga() {
     }));
   } catch (error) {
     yield put(viewPresetActions.errorInitialViewPresets({
-      error: {
-        message: translateKeyOutsideComponents('workspace-mappreset-error-fetch'),
-        type: ViewPresetType.PRESET_LIST
-      }
+      error: processError(error, ViewPresetErrorComponent.PRESET_LIST, 'workspace-mappreset-error-fetch')
     }));
   }
 }
@@ -7556,10 +7572,7 @@ function* fetchViewPresetsSaga({
     }));
   } catch (error) {
     yield put(viewPresetActions.errorViewPreset({
-      error: {
-        message: translateKeyOutsideComponents('workspace-mappreset-error-fetch'),
-        type: ViewPresetType.PRESET_LIST
-      },
+      error: processError(error, ViewPresetErrorComponent.PRESET_LIST, 'workspace-mappreset-error-fetch'),
       panelId
     }));
   }
@@ -7584,10 +7597,7 @@ function* saveViewPresetSaga({
     }));
   } catch (error) {
     yield put(viewPresetActions.errorViewPreset({
-      error: {
-        message: translateKeyOutsideComponents('workspace-mappreset-error-save'),
-        type: ViewPresetType.PRESET_DETAIL
-      },
+      error: processError(error, ViewPresetErrorComponent.PRESET_DETAIL, 'workspace-mappreset-error-save'),
       panelId,
       viewPresetId
     }));
@@ -8633,7 +8643,7 @@ const ViewPresetMenuListConnect = ({
   const relatedSyncGroupIds = useSelector(store => syncGroupsSelectors.getAllTargetGroupsForSource(store, {
     sourceId: panelId
   }));
-  const errorViewPresetsList = useSelector(store => getViewPresetListError(store, panelId));
+  const error = useSelector(store => getViewPresetsError(store, panelId));
   const isViewPresetsListFetching = useSelector(store => getViewPresetsIsFetching(store, panelId));
   const {
     isLoggedIn
@@ -8757,18 +8767,21 @@ const ViewPresetMenuListConnect = ({
       width: '100%',
       top: 0
     }
-  })), !isViewPresetsListFetching && errorViewPresetsList && ( /*#__PURE__*/React.createElement(AlertBanner, {
+  })), !isViewPresetsListFetching && error && ( /*#__PURE__*/React.createElement(AlertBanner, Object.assign({
     title: t('workspace-viewpresets-error'),
+    info: error.message,
+    shouldClose: true
+  }, error.errorType === ViewPresetErrorType.GENERIC && {
     actionButtonProps: {
       title: t('workspace-retry'),
       onClick: fetchViewPresets
     }
-  })), /*#__PURE__*/React.createElement(Box, {
+  }))), /*#__PURE__*/React.createElement(Box, {
     sx: {
       padding: 1,
       height: '100%'
     }
-  }, !errorViewPresetsList && ( /*#__PURE__*/React.createElement(WorkspaceFilter, {
+  }, !error && ( /*#__PURE__*/React.createElement(WorkspaceFilter, {
     filters: viewPresetListFilters,
     onClickFilterChip: onClickFilterChip,
     isAllSelected: isAllSelectedForFilters,
@@ -10458,6 +10471,7 @@ const FetchInitialPresets = () => {
   return null;
 };
 const WorkspaceDetail = ({
+  initialWorkspaceId,
   workspaceId,
   children,
   componentsLookUp,
@@ -10493,10 +10507,11 @@ const WorkspaceDetail = ({
     navigateToUrl(routes.root);
   };
   React.useEffect(() => {
-    if (!workspaceId) {
+    const idToFetch = initialWorkspaceId || workspaceId;
+    if (!idToFetch) {
       setEmptyWorkSpace();
     } else {
-      fetchWorkspace(workspaceId);
+      fetchWorkspace(idToFetch);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/workspace",
-  "version": "9.18.0",
+  "version": "9.19.1",
   "description": "GeoWeb Workspace library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -35,6 +35,7 @@
     "@opengeoweb/taf": "*",
     "@opengeoweb/sigmet-airmet": "*",
     "@opengeoweb/warnings": "*",
+    "@opengeoweb/webmap-react": "*",
     "i18next": "^23.7.11",
     "react-i18next": "^13.5.0"
   },

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { WorkspaceLookupFunctionType } from '../../store/workspace/types';
 export interface WorkspaceTopBarProps {
+    initialWorkspaceId?: string;
     workspaceId?: string;
     componentsLookUp: WorkspaceLookupFunctionType;
     children?: React.ReactNode;

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

@@ -18,11 +18,6 @@ export declare const getViewPresetDetailError: ((state: AppStore, id: string) =>
 }> & {
     clearCache: () => void;
 };
-export declare const getViewPresetListError: ((state: AppStore, id: string) => string | undefined) & import("reselect").OutputSelectorFields<(args_0: ViewPresetError, args_1: string) => string | undefined, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
 export declare const getViewPresetHasChanges: ((state: AppStore, id: string) => boolean) & import("reselect").OutputSelectorFields<(args_0: ViewPresetEntity | undefined, args_1: string) => boolean, {
     clearCache: () => void;
 }> & {

package/src/lib/store/viewPresets/types.d.ts

@@ -10,12 +10,17 @@ export interface ViewPreset {
     initialProps?: InitialProps;
     scope?: PresetScope;
 }
-export declare enum ViewPresetType {
+export declare enum ViewPresetErrorComponent {
     PRESET_DETAIL = "PRESET_DETAIL",
     PRESET_LIST = "PRESET_LIST"
 }
+export declare enum ViewPresetErrorType {
+    AUTH = "AUTH",
+    GENERIC = "GENERIC"
+}
 export type ViewPresetError = {
-    type: ViewPresetType;
+    component: ViewPresetErrorComponent;
+    errorType: ViewPresetErrorType;
     message: string;
 } | undefined;
 export interface ViewPresetsListFilter {

package/src/lib/store/workspaceList/types.d.ts

@@ -1,6 +1,7 @@
 import { EntityState } from '@reduxjs/toolkit';
 import { WorkspacePresetListItem, WorkspacePresetAction, PresetScope, WorkspacePresetFromBE, WorkspacePreset } from '../workspace/types';
 export declare enum WorkspaceListErrorType {
+    AUTH = "AUTH",
     GENERIC = "GENERIC"
 }
 export type WorkspaceListError = {