Fix #2129 Upgrade MapStore to include the fix for Download (#2130)

* Fix #2129 Upgrade MapStore to include the fix for Download

* fix failing tests

Author: allyoucanmap

geonode_mapstore_client/client/MapStore2

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { Glyphicon } from 'react-bootstrap';
+import { loadFontAwesome } from '@mapstore/framework/utils/FontUtils';
+import useIsMounted from '@mapstore/framework/hooks/useIsMounted';
+import PropTypes from 'prop-types';
+
+function FaIcon({
+    name,
+    className,
+    style
+}) {
+    const [loading, setLoading] = useState(true);
+    const isMounted = useIsMounted();
+    useEffect(() => {
+        loadFontAwesome()
+            .then(() => {
+                isMounted(() => {
+                    setLoading(false);
+                });
+            });
+    }, []);
+    if (loading) {
+        return null;
+    }
+    return <i className={`fa fa-${name}${className ? ` ${className}` : ''}`} style={style}/>;
+}
+/**
+ * Icon component that allows to use icon from `font-awesome` and `glyphicon`
+ * @prop {string} glyph html identifier
+ * @prop {string} type one of `font-awesome` or `glyphicon`
+ */
+function Icon({
+    glyph,
+    type,
+    ...props
+}) {
+    if (type === 'font-awesome') {
+        return <FaIcon {...props} name={glyph} />;
+    }
+    if (type === 'glyphicon') {
+        return <Glyphicon {...props} glyph={glyph} />;
+    }
+    return null;
+}
+
+Icon.propTypes = {
+    glyph: PropTypes.string,
+    type: PropTypes.string
+};
+
+Icon.defaultProps = {
+    type: 'font-awesome'
+};
+
+export default Icon;

geonode_mapstore_client/client/js/components/Icon/Icon.jsx

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

geonode_mapstore_client/client/js/components/Icon/index.js

@@ -8,7 +8,7 @@
 
 import React from 'react';
 import Message from '@mapstore/framework/components/I18N/Message';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 
 function MainEventView({
     msgId,

geonode_mapstore_client/client/js/components/MainEventView/MainEventView.jsx

@@ -12,7 +12,7 @@ import { Glyphicon } from 'react-bootstrap';
 import Message from '@mapstore/framework/components/I18N/Message';
 import Button from '@mapstore/framework/components/layout/Button';
 import useInfiniteScroll from '@js/hooks/useInfiniteScroll';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import Spinner from '@mapstore/framework/components/layout/Spinner';
 import Loader from '@mapstore/framework/components/misc/Loader';
 import ResourceCard from '@mapstore/framework/plugins/ResourcesCatalog/components/ResourceCard';

geonode_mapstore_client/client/js/components/ResourcesCompactCatalog/ResourcesCompactCatalog.jsx

@@ -19,7 +19,7 @@ import {
 import { Dropdown, MenuItem, Glyphicon } from 'react-bootstrap';
 import Message from '@mapstore/framework/components/I18N/Message';
 import Button from '@mapstore/framework/components/layout/Button';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import tooltip from '@mapstore/framework/components/misc/enhancers/tooltip';
 import { openQueryBuilder } from '@mapstore/framework/actions/layerFilter';
 import { getSelectedLayer } from '@mapstore/framework/selectors/layers';

geonode_mapstore_client/client/js/plugins/ActionNavbar/buttons.jsx

@@ -23,7 +23,7 @@ import FlexBox from '@mapstore/framework/components/layout/FlexBox';
 import Spinner from '@mapstore/framework/components/layout/Spinner';
 import Button from '@mapstore/framework/components/layout/Button';
 import Menu from '@mapstore/framework/plugins/ResourcesCatalog/components/Menu';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import tooltip from '@mapstore/framework/components/misc/enhancers/tooltip';
 
 const ButtonWithTooltip = tooltip(Button);

geonode_mapstore_client/client/js/plugins/ActionNavbar/index.jsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { createPlugin } from '@mapstore/framework/utils/PluginsUtils';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import Message from '@mapstore/framework/components/I18N/Message';
 import Button from '@mapstore/framework/components/layout/Button';
 import ConfirmDialog from '@mapstore/framework/components/layout/ConfirmDialog';

geonode_mapstore_client/client/js/plugins/DeleteResource.jsx

@@ -16,7 +16,7 @@ import Message from '@mapstore/framework/components/I18N/Message';
 import Button from '@mapstore/framework/components/layout/Button';
 import tooltip from '@mapstore/framework/components/misc/enhancers/tooltip';
 import { MenuItem } from 'react-bootstrap';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import {
     getResourceData
 } from '@js/selectors/resource';

geonode_mapstore_client/client/js/plugins/DownloadResource.jsx

@@ -11,7 +11,7 @@ import { createPlugin } from '@mapstore/framework/utils/PluginsUtils';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import DetailsPanel from './ResourceDetails/containers/DetailsPanel';
-import Icon from '@mapstore/framework/plugins/ResourcesCatalog/components/Icon';
+import Icon from '@js/components/Icon';
 import controls from '@mapstore/framework/reducers/controls';
 import { setControlProperty } from '@mapstore/framework/actions/controls';
 import gnresource from '@js/reducers/gnresource';