update

eea · Aug 19, 2024 · af50deb · af50deb
1 parent f0a55c0
commit af50deb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/src/Arcgis/Layer/Layer.jsx b/src/Arcgis/Layer/Layer.jsx
@@ -147,7 +147,7 @@ class $Layer extends EventEmitter {
         const data = await this.#layer.queryExtent();
         if (!$map.view) return;
         $map.view.goTo(data.extent).then(() => {
-          if (!$map.view) return;
+          if (!$map.view?.ready) return;
           const homeWidget = $map.view.ui.find('Home');
           if (!homeWidget) return;
           homeWidget.viewpoint = new $map.modules.AgViewpoint({

diff --git a/src/Widgets/VisualizationWidget.jsx b/src/Widgets/VisualizationWidget.jsx
@@ -163,26 +163,29 @@ function MapEditorModal(props) {
 const VisualizationWidget = (props) => {
   const $map = useRef();
   const controller = useRef({});
+  const $value = useRef(props.value);
   const { id, title, description, value } = props;
   const [showMapEditor, setShowMapEditor] = useState(false);
 
-  const onConnect = useCallback(() => {
-    if (controller.current.multiple && !props.block) return;
+  const onConnect = () => {
+    if (controller.current.multiple && !props.block && !$map.current) return;
     props.onChange(props.id, {
-      ...value,
+      ...$value.current,
       preview: 'loading',
     });
     controller.current.agReactive = $map.current.modules.agReactiveUtils.watch(
-      () => $map.current.view.updating,
+      () => $map.current?.view?.updating,
       async (updating) => {
-        if (updating || !$map.current.view) return;
+        if (updating || !$map.current?.view) return;
         debounce(
           async () => {
+            if (!$map.current?.view) return;
             const preview = await $map.current.view.takeScreenshot({
               format: 'png',
             });
+            console.log('HERE LOADED');
             props.onChange(props.id, {
-              ...value,
+              ...$value.current,
               preview: preview.dataUrl,
             });
           },
@@ -191,15 +194,16 @@ const VisualizationWidget = (props) => {
         );
       },
     );
-  }, [props, value]);
+  };
 
-  const onDisconnect = useCallback(() => {
+  const onDisconnect = () => {
     if (!controller.current.agReactive) return;
     controller.current.agReactive.remove();
-  }, []);
+  };
 
   useEffect(() => {
     const map = $map.current;
+
     if (!map) return;
 
     const widgets = document.querySelectorAll(
@@ -218,7 +222,11 @@ const VisualizationWidget = (props) => {
       map.off('connected', onConnect);
       map.off('disconnected', onDisconnect);
     };
-  }, [onConnect, onDisconnect]);
+  }, []);
+
+  useEffect(() => {
+    $value.current = value;
+  }, [value]);
 
   if (__SERVER__ || !value) return null;
 

diff --git a/src/middlewares/preview_image.js b/src/middlewares/preview_image.js
@@ -27,8 +27,17 @@ export const preview_image = (middlewares) => [
     ) {
       return next(action);
     }
-    if (action?.request?.data?.map_visualization_data?.preview === 'loading') {
+    const preview = action?.request?.data?.map_visualization_data?.preview;
+    if (
+      preview === 'loading' &&
+      confirm('Do you want to save a preview image?')
+    ) {
       return;
+    } else if (
+      preview !== 'loading' &&
+      !confirm('Do you want to save a preview image?')
+    ) {
+      return next(action);
     }
     try {
       const previewImage = {