Fixed issue with endpoint wrapper callbacks

stfc-aeg · Nov 23, 2023 · 93b43b5 · 93b43b5
1 parent be8e678
commit 93b43b5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/example/src/EndpointExample.jsx b/example/src/EndpointExample.jsx
@@ -92,7 +92,7 @@ function EndpointExamplePage(props) {
                                 <Col xs={5}>
                                     <TitleCard title="Button">
                                         <EndpointButton endpoint={periodicEndpoint} event_type="click" fullpath="trigger" value={42} 
-                                        pre_method={prePutMethod} pre_kwargs={["Test", 42]}>Trigger</EndpointButton>
+                                        pre_method={prePutMethod} pre_args={["Test", 42]}>Trigger</EndpointButton>
                                     </TitleCard>
                                 </Col>
                                 <Col>

diff --git a/src/services/withEndpoint.js b/src/services/withEndpoint.js
@@ -11,11 +11,11 @@ function WithEndpoint(WrappedComponent)
         const data = useRef(value);
         const timer = useRef(null);
 
-        const pre_func = useRef(pre_method);
-        const post_func = useRef(post_method);
+        // const pre_func = useRef(pre_method);
+        // const post_func = useRef(post_method);
 
-        const pre_func_kwargs = useRef(pre_kwargs);
-        const post_func_kwargs = useRef(post_kwargs);
+        const pre_func_kwargs = useRef(pre_args);
+        const post_func_kwargs = useRef(post_args);
 
         const [error, setError] = useState(null);
         const [eventProp, setEventProp] = useState(null);
@@ -108,12 +108,31 @@ function WithEndpoint(WrappedComponent)
 
         const sendRequest = useCallback((val) => {
             clearInterval(timer.current);
-            pre_func.current && pre_func.current(...pre_func_kwargs.current);
+            if(pre_method)
+            {
+                if(pre_func_kwargs.current)
+                {
+                    pre_method(...pre_func_kwargs.current);
+                }else{
+                    pre_method();
+                }
+            }
+            // pre_method && pre_method(
+            //     (pre_func_kwargs.current) ? ...pre_func_kwargs.current : null);
             const sendVal = {[valueName]: val};
             endpoint.put(sendVal, path)
                 .then((response) => {
                     endpoint.mergeData(response, path);
-                    post_func.current && post_func.current(...post_func_kwargs.current);
+                    if(post_method)
+                    {
+                        if(post_func_kwargs.current)
+                        {
+                            post_method(...post_func_kwargs.current);
+                        }else{
+                            post_method();
+                        }
+                    }
+                    post_method && post_method(...post_func_kwargs.current);
                 })
                 .catch((err) => {
                     setError(err);