From b395771d4cd276f4af78f576486677d9b9120e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=9B=BD=E7=92=87?= <ygx@Hello-word.local>
Date: Fri, 10 Jan 2025 15:13:48 +0800
Subject: [PATCH 1/2] fix: metadata map view toolbar

---
 .../metadata/components/view-toolbar/map-view-toolbar/index.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js b/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
index 58eca8719e..6c8c3e7ac1 100644
--- a/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
+++ b/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
@@ -77,7 +77,7 @@ const MapViewToolBar = ({
   return (
     <>
       <div className="sf-metadata-tool-left-operations">
-        <MapTypeSetter view={view} />
+        <MapTypeSetter view={{ view, _id: viewID }} />
         <FilterSetter
           isNeedSubmit={true}
           wrapperClass="sf-metadata-view-tool-operation-btn sf-metadata-view-tool-filter"

From 404f0b8a821bdb1321a8a8495ce9f40184153979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=9B=BD=E7=92=87?= <ygx@Hello-word.local>
Date: Fri, 10 Jan 2025 15:51:11 +0800
Subject: [PATCH 2/2] feat: optimize code

---
 .../data-process-setter/map-type-setter.js    |  8 +++-----
 .../metadata/components/view-toolbar/index.js |  2 +-
 .../view-toolbar/map-view-toolbar/index.js    | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frontend/src/metadata/components/data-process-setter/map-type-setter.js b/frontend/src/metadata/components/data-process-setter/map-type-setter.js
index 643d64c180..5dae1428d2 100644
--- a/frontend/src/metadata/components/data-process-setter/map-type-setter.js
+++ b/frontend/src/metadata/components/data-process-setter/map-type-setter.js
@@ -9,13 +9,13 @@ const MAP_TYPES = [
   { value: MAP_TYPE.SATELLITE, label: gettext('Satellite') },
 ];
 
-const MapTypeSetter = ({ view }) => {
+const MapTypeSetter = ({ viewID }) => {
   const [currentType, setCurrentType] = useState(MAP_TYPE.MAP);
 
   useEffect(() => {
     const type = window.sfMetadataContext.localStorage.getItem(STORAGE_MAP_TYPE_KEY) || MAP_TYPE.MAP;
     setCurrentType(type);
-  }, [view?._id]);
+  }, [viewID]);
 
   const onChange = useCallback((type) => {
     if (currentType === type) return;
@@ -27,9 +27,7 @@ const MapTypeSetter = ({ view }) => {
 };
 
 MapTypeSetter.propTypes = {
-  view: PropTypes.shape({
-    _id: PropTypes.string
-  })
+  viewID: PropTypes.string,
 };
 
 export default MapTypeSetter;
diff --git a/frontend/src/metadata/components/view-toolbar/index.js b/frontend/src/metadata/components/view-toolbar/index.js
index 8ced5ef287..efa6bd8386 100644
--- a/frontend/src/metadata/components/view-toolbar/index.js
+++ b/frontend/src/metadata/components/view-toolbar/index.js
@@ -115,7 +115,7 @@ const ViewToolBar = ({ viewId, isCustomPermission, onToggleDetail, onCloseDetail
         <MapViewToolBar
           readOnly={readOnly}
           isCustomPermission={isCustomPermission}
-          viewID={view._id}
+          view={view}
           collaborators={collaborators}
           modifyFilters={modifyFilters}
           onToggleDetail={onToggleDetail}
diff --git a/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js b/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
index 6c8c3e7ac1..16b82b2a36 100644
--- a/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
+++ b/frontend/src/metadata/components/view-toolbar/map-view-toolbar/index.js
@@ -7,19 +7,20 @@ import { gettext } from '../../../../utils/constants';
 const MapViewToolBar = ({
   isCustomPermission,
   readOnly,
-  viewID,
+  view: oldView,
   collaborators,
   modifyFilters,
   onToggleDetail,
 }) => {
   const [showGalleryToolbar, setShowGalleryToolbar] = useState(false);
-  const [view, setView] = useState({});
+  const [view, setView] = useState(oldView);
 
   const viewType = useMemo(() => VIEW_TYPE.MAP, []);
   const viewColumns = useMemo(() => {
-    if (!view) return [];
-    return view.columns;
-  }, [view]);
+    if (!oldView) return [];
+    return oldView.columns;
+  }, [oldView]);
+  const viewID = useMemo(() => oldView._id, [oldView]);
 
   const filterColumns = useMemo(() => {
     return viewColumns && viewColumns.filter(c => c.key !== PRIVATE_COLUMN_KEY.FILE_TYPE);
@@ -77,16 +78,16 @@ const MapViewToolBar = ({
   return (
     <>
       <div className="sf-metadata-tool-left-operations">
-        <MapTypeSetter view={{ view, _id: viewID }} />
+        <MapTypeSetter viewID={viewID} />
         <FilterSetter
           isNeedSubmit={true}
           wrapperClass="sf-metadata-view-tool-operation-btn sf-metadata-view-tool-filter"
           filtersClassName="sf-metadata-filters"
           target="sf-metadata-filter-popover"
           readOnly={readOnly}
-          filterConjunction={view.filter_conjunction}
-          basicFilters={view.basic_filters}
-          filters={view.filters}
+          filterConjunction={oldView.filter_conjunction}
+          basicFilters={oldView.basic_filters}
+          filters={oldView.filters}
           columns={filterColumns}
           modifyFilters={modifyFilters}
           collaborators={collaborators}