datastake-daf 0.6.513 → 0.6.514

package/dist/components/index.js

@@ -36687,42 +36687,6 @@ function AjaxSelectMain(_ref) {
     getAppHeader,
     getApiBaseUrl
   } = _ref;
-  console.log("AJAX SELECT MAIN");
-  console.log({
-    preSelected,
-    props,
-    size,
-    input,
-    groupFormId,
-    formsValue,
-    call,
-    value,
-    repeatIndex,
-    changeInputMeta,
-    repeatValues,
-    mainForm,
-    onNewSetValue,
-    inputMeta,
-    className,
-    multiple,
-    setFormValues,
-    updateOptions,
-    unique,
-    meta,
-    name,
-    inputName,
-    getFromLinking,
-    allowClear,
-    onChange,
-    onOptions,
-    changeAjaxOptions,
-    app,
-    t,
-    user,
-    getAppHeader,
-    getApiBaseUrl
-  });
-  console.log("AJAX SELECT MAIN END");
   const inst = /*#__PURE__*/React.createRef();
   const [modelValue, setModelValue] = React.useState(value ? value : multiple ? [] : null);
   const [model, setModel] = React.useState([]);
@@ -36742,20 +36706,21 @@ function AjaxSelectMain(_ref) {
   };
   const endpoint = meta !== null && meta !== void 0 && meta.endpoint ? "".concat(url).concat(meta === null || meta === void 0 ? void 0 : meta.endpoint) : meta.application && !queryOptionsApps.includes(app) ? "".concat(url, "/query/").concat(app, "/options") : "".concat(url, "/").concat(queryOptionsAppEndpoints[app] || "query/options");
   React.useEffect(() => {
-    // Check if this is a new item (not in the fetched model from server)
-    const isNewItem = value && typeof value === 'string' && !model.find(m => m.value === value);
-    if (isNewItem && value) {
-      // Add the new item to the model with its actual value
-      if (!model.find(m => m.value === value)) {
-        const newOption = {
-          label: value,
-          value: value
-        };
-        setModel(model.concat(newOption));
+    if (value === "new") {
+      if (!model.find(m => m.value === "new")) {
+        setModel(model.concat({
+          label: searchValue || t("New"),
+          value: "new"
+        }));
         if (updateOptions) {
-          onOptions(model.concat(newOption));
+          onOptions(model.concat({
+            label: searchValue || t("New"),
+            value: "new"
+          }));
         }
       }
+    } else {
+      setModel(model.filter(v => v.value !== "new"));
     }
     setModelValue(value ? value : multiple ? [] : null);
     setSearchValue(value);
@@ -36854,18 +36819,16 @@ function AjaxSelectMain(_ref) {
           let {
             data
           } = _ref2;
+          //? FUTURE ILVI KEEP THIS IN MIND
           if (meta.saveAjaxOptions) {
             changeAjaxOptions(name, data);
           }
-
-          // Check if current value is a new item (not in fetched data)
-          const isNewItem = modelValue && !data.find(d => d.value === modelValue);
-          if (isNewItem) {
-            // Preserve the new item in the options
-            const newItem = model.find(m => m.value === modelValue);
-            if (newItem) {
-              data = data.concat([newItem]);
-            }
+          if (modelValue === "new") {
+            const newData = model.find(m => m.value === "new");
+            data = data.concat([newData || {
+              label: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.name) || searchValue || t("New"),
+              value: "new"
+            }]);
           } else {
             updateLabel(data, undefined, true);
             setTimeout(() => {
@@ -37069,7 +37032,7 @@ function AjaxSelectMain(_ref) {
           marginTop: 4
         }
       }),
-      disabled: !searchValue || typeof searchValue === "string" && searchValue.trim() === "" || model.find(m => m.value === searchValue) && asOption,
+      disabled: !searchValue || typeof searchValue === "string" && searchValue.trim() === "" || (typeof modelValue === "string" && modelValue !== "new" || modelValue === "new" && model.filter(m => m.value === "new" && m.label === searchValue)) && asOption,
       type: "link primary",
       onClick: () => {
         const oldValue = searchValue;
@@ -37176,11 +37139,14 @@ function AjaxSelectMain(_ref) {
         setModelValue(value);
       }
     }
+    if (!value) {
+      setModel([...(model || []).filter(m => m.value !== "new")]);
+    }
   };
   const addNewData = oldValue => {
     if (onNewSetValue) {
       if (repeatIndex !== null && repeatValues) {
-        repeatValues[inputName] = oldValue;
+        repeatValues[inputName] = "new";
         repeatValues[onNewSetValue] = oldValue;
         if (!formsValue[name]) {
           formsValue[name] = [];
@@ -37190,12 +37156,10 @@ function AjaxSelectMain(_ref) {
         // mainForm.scrollToField([name, repeatIndex, onNewSetValue]);
       }
     }
-
-    // Use the actual value instead of "new"
-    const newModelInd = model.findIndex(m => m.value === oldValue);
+    const newModelInd = model.findIndex(m => m.value === "new");
     let newModel = {
       label: oldValue,
-      value: oldValue
+      value: "new"
     };
     if (newModelInd >= 0) {
       model[newModelInd] = newModel;
@@ -37206,17 +37170,17 @@ function AjaxSelectMain(_ref) {
     if (updateOptions) {
       onOptions(model.concat({
         label: oldValue || t("New"),
-        value: oldValue
+        value: "new"
       }));
     }
-    setModelValue(oldValue);
+    setModelValue("new");
     inst.current.blur();
     if (!onNewSetValue) {
       const otherValues = onNewSetValue ? {
         [onNewSetValue]: searchValue,
-        [name]: oldValue
+        [name]: "new"
       } : {
-        [name]: oldValue
+        [name]: "new"
       };
 
       // remove keys, because can be from prev selection
@@ -37257,7 +37221,7 @@ function AjaxSelectMain(_ref) {
       return;
     }
     setTimeout(() => {
-      onChange(oldValue, model || []);
+      onChange("new", model || []);
       addNewValueKey(searchValue);
     }, 200);
   };
@@ -37322,9 +37286,6 @@ function AjaxSelect(props) {
     getAppHeader,
     getApiBaseUrl
   } = useEditContext();
-  console.log({
-    props
-  });
   return /*#__PURE__*/jsxRuntime.jsx(AjaxSelectMain, _objectSpread2({
     changeAjaxOptions: changeAjaxOptions,
     app: app,
@@ -37686,8 +37647,8 @@ const inputTypeComponent = {
       onChange: val => {
         formsValue[name] = val;
         setFormValues({
-          ...formsValue,
-          [name]: val
+          [name]: val,
+          ...formsValue
         });
       },
       searchValue: search

package/dist/layouts/index.js

@@ -5311,7 +5311,9 @@ const Sidenav = ({
     children: [renderModule({
       module: userModule,
       isCollapsed,
-      onClick: () => checkOnClick(() => goTo(getRedirectLink(`/app`))),
+      onClick: () => checkOnClick({
+        event: () => goTo(getRedirectLink(`/app`))
+      }),
       mod,
       user,
       userHelpers

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.513",
+	"version": "0.6.514",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/DynamicForm/helper.js

@@ -472,8 +472,8 @@ export const inputTypeComponent = {
 				onChange={(val) => {
 					formsValue[name] = val;
 					setFormValues({
-						...formsValue,
 						[name]: val,
+						...formsValue,
 					});
 				}}
 				searchValue={search}

package/src/@daf/core/components/EditForm/components/ajaxSelect.js

@@ -50,9 +50,6 @@ export function AjaxSelectMain({
 	getAppHeader,
 	getApiBaseUrl,
 }) {
-	console.log("AJAX SELECT MAIN")
-	console.log({preSelected, props, size, input, groupFormId, formsValue, call, value, repeatIndex, changeInputMeta, repeatValues, mainForm, onNewSetValue, inputMeta, className, multiple, setFormValues, updateOptions, unique, meta, name, inputName, getFromLinking, allowClear, onChange, onOptions, changeAjaxOptions, app, t, user, getAppHeader, getApiBaseUrl})
-	console.log("AJAX SELECT MAIN END")
 	const inst = createRef();
 	const [modelValue, setModelValue] = useState(value ? value : multiple ? [] : null);
 	const [model, setModel] = useState([]);
@@ -88,18 +85,15 @@ export function AjaxSelectMain({
 		: `${url}/${queryOptionsAppEndpoints[app] || "query/options"}`;
 
 	useEffect(() => {
-		// Check if this is a new item (not in the fetched model from server)
-		const isNewItem = value && typeof value === 'string' && !model.find((m) => m.value === value);
-		
-		if (isNewItem && value) {
-			// Add the new item to the model with its actual value
-			if (!model.find((m) => m.value === value)) {
-				const newOption = { label: value, value: value };
-				setModel(model.concat(newOption));
+		if (value === "new") {
+			if (!model.find((m) => m.value === "new")) {
+				setModel(model.concat({ label: searchValue || t("New"), value: "new" }));
 				if (updateOptions) {
-					onOptions(model.concat(newOption));
+					onOptions(model.concat({ label: searchValue || t("New"), value: "new" }));
 				}
 			}
+		} else {
+			setModel(model.filter((v) => v.value !== "new"));
 		}
 		setModelValue(value ? value : multiple ? [] : null);
 		setSearchValue(value);
@@ -217,18 +211,19 @@ export function AjaxSelectMain({
 						},
 					)
 					.then(({ data }) => {
+						//? FUTURE ILVI KEEP THIS IN MIND
 						if (meta.saveAjaxOptions) {
 							changeAjaxOptions(name, data);
 						}
 
-						// Check if current value is a new item (not in fetched data)
-						const isNewItem = modelValue && !data.find((d) => d.value === modelValue);
-						if (isNewItem) {
-							// Preserve the new item in the options
-							const newItem = model.find((m) => m.value === modelValue);
-							if (newItem) {
-								data = data.concat([newItem]);
-							}
+						if (modelValue === "new") {
+							const newData = model.find((m) => m.value === "new");
+							data = data.concat([
+								newData || {
+									label: inputMeta?.name || searchValue || t("New"),
+									value: "new",
+								},
+							]);
 						} else {
 							updateLabel(data, undefined, true);
 							setTimeout(() => {
@@ -447,7 +442,10 @@ export function AjaxSelectMain({
 				disabled={
 					!searchValue ||
 					(typeof searchValue === "string" && searchValue.trim() === "") ||
-					(model.find((m) => m.value === searchValue) && asOption)
+					(((typeof modelValue === "string" && modelValue !== "new") ||
+						(modelValue === "new" &&
+							model.filter((m) => m.value === "new" && m.label === searchValue))) &&
+						asOption)
 				}
 				type="link primary"
 				onClick={() => {
@@ -574,12 +572,15 @@ export function AjaxSelectMain({
 				setModelValue(value);
 			}
 		}
+		if (!value) {
+			setModel([...(model || []).filter((m) => m.value !== "new")]);
+		}
 	};
 
 	const addNewData = (oldValue) => {
 		if (onNewSetValue) {
 			if (repeatIndex !== null && repeatValues) {
-				repeatValues[inputName] = oldValue;
+				repeatValues[inputName] = "new";
 				repeatValues[onNewSetValue] = oldValue;
 				if (!formsValue[name]) {
 					formsValue[name] = [];
@@ -592,10 +593,8 @@ export function AjaxSelectMain({
 				// mainForm.scrollToField(onNewSetValue);
 			}
 		}
-		
-		// Use the actual value instead of "new"
-		const newModelInd = model.findIndex((m) => m.value === oldValue);
-		let newModel = { label: oldValue, value: oldValue };
+		const newModelInd = model.findIndex((m) => m.value === "new");
+		let newModel = { label: oldValue, value: "new" };
 		if (newModelInd >= 0) {
 			model[newModelInd] = newModel;
 		} else {
@@ -604,17 +603,17 @@ export function AjaxSelectMain({
 
 		setModel([...model]);
 		if (updateOptions) {
-			onOptions(model.concat({ label: oldValue || t("New"), value: oldValue }));
+			onOptions(model.concat({ label: oldValue || t("New"), value: "new" }));
 		}
-		setModelValue(oldValue);
+		setModelValue("new");
 		inst.current.blur();
 		if (!onNewSetValue) {
 			const otherValues = onNewSetValue
 				? {
 						[onNewSetValue]: searchValue,
-						[name]: oldValue,
+						[name]: "new",
 				  }
-				: { [name]: oldValue };
+				: { [name]: "new" };
 
 			// remove keys, because can be from prev selection
 			toRemoveKeysOnNew.forEach((k) => {
@@ -662,7 +661,7 @@ export function AjaxSelectMain({
 		}
 
 		setTimeout(() => {
-			onChange(oldValue, model || []);
+			onChange("new", model || []);
 			addNewValueKey(searchValue, true);
 		}, 200);
 	};
@@ -740,7 +739,6 @@ export function AjaxSelectMain({
 
 function AjaxSelect(props) {
 	const { changeAjaxOptions, app, t, user, getAppHeader, getApiBaseUrl } = useEditContext();
-	console.log({props})
 
 	return (
 		<AjaxSelectMain

package/src/@daf/layouts/AppLayout/components/Sidenav/index.js

@@ -241,7 +241,9 @@ const Sidenav = ({
       {renderModule({
         module: userModule,
         isCollapsed,
-        onClick: () => checkOnClick(() => goTo(getRedirectLink(`/app`))),
+        onClick: () => checkOnClick({
+          event: () => goTo(getRedirectLink(`/app`))
+        }),
         mod,
         user,
         userHelpers