Merge pull request #427 from metrico/fix/default_api_url

feat: origin as datasource by default at datasources page

Author: jacovinus

Diff for: packages/main/views/DataSources/components/DataSourcesFiller.tsx

@@ -1,5 +1,5 @@
 import { Switch } from "@mui/material";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { css, cx } from "@emotion/css";
 import { useDispatch, useSelector } from "react-redux";
 import setDataSources from "../store/setDataSources";
@@ -51,9 +51,14 @@ const ForAllButton = css`
     flex: 1;
 `;
 
+// set a global url for all datasources
+
 export const urlSchema = z.string().url()
 
+const DEFAULT_URL = window.location.origin
+
 export const DataSourcesFiller = (props: any) => {
+
     const [url, setUrl] = useState("");
     const [user, setUser] = useState("");
     const [password, setPassword] = useState("");
@@ -65,34 +70,12 @@ export const DataSourcesFiller = (props: any) => {
     const submitMessage = "Save";
     const theme = useTheme();
 
-    const urlChange = (e: any) => {
-           const value = e?.target?.value || "";
-        const message = urlSchema.safeParse(value)
-       
-        setUrlValid(()=> message.success)
-
-           setUrl(() => value);
-    };
-    const userChange = (e: any) => {
-        setUser(() => e.target.value);
-    };
-    const passwordChange = (e: any) => {
-        setPassword(() => e.target.value);
-    };
-
-    const onSwitchChange = (e: any) => {
-        setOneForAll(() => e.target.checked);
-    };
-
-    const onBasicAuthChange = (e: any) => {
-        setBasicAuth(() => e.target.checked);
-    };
-
-    const onUseForAll = (e: any) => {
+    const onUseForAll = (defaultUrl="") => {
+        const changedUrl = defaultUrl === "" ? url : defaultUrl
         const prevDs = JSON.parse(JSON.stringify(dataSources));
         const newDs = prevDs?.map((m: any) => ({
             ...m,
-            url,
+            url:changedUrl,
             auth: {
                 ...m.auth,
                 basicAuth: { ...m.auth.basicAuth, value: basicAuth },
@@ -114,6 +97,47 @@ export const DataSourcesFiller = (props: any) => {
         dispatch(setDataSources(newDs));
     };
 
+    useEffect(()=>{
+        if (url === ""){
+            
+            if(dataSources[0]?.url === "" && dataSources[1]?.url === "") {
+                setUrl(DEFAULT_URL)
+                onUseForAll(DEFAULT_URL)
+            } else  {
+                setUrl(dataSources[0]?.url)
+            }
+    
+            setOneForAll(true)
+            setUrlValid(true)
+        } 
+      
+    },[url])
+
+    const urlChange = (e: any) => {
+           const value = e?.target?.value || "";
+        const message = urlSchema.safeParse(value)
+       
+        setUrlValid(()=> message.success)
+
+           setUrl(() => value);
+    };
+    const userChange = (e: any) => {
+        setUser(() => e.target.value);
+    };
+    const passwordChange = (e: any) => {
+        setPassword(() => e.target.value);
+    };
+
+    const onSwitchChange = (e: any) => {
+        setOneForAll(() => e.target.checked);
+    };
+
+    const onBasicAuthChange = (e: any) => {
+        setBasicAuth(() => e.target.checked);
+    };
+
+
+
     return (
         <div className={cx(InlineFlex(theme))}>
             <div className={cx(oneForAllStyle)}>

Diff for: packages/main/views/DataSources/store/setDataSources.ts

@@ -1,4 +1,4 @@
-const setDataSources = (dataSources: any) => (dispatch: Function) => {
+const setDataSources = (dataSources: any) => (dispatch: any) => {
     dispatch({
         type: 'SET_DATA_SOURCES',
         dataSources