datastake-daf 0.6.509 → 0.6.511

package/dist/components/index.js

@@ -36687,6 +36687,42 @@ 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([]);
@@ -36706,21 +36742,20 @@ 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(() => {
-    if (value === "new") {
-      if (!model.find(m => m.value === "new")) {
-        setModel(model.concat({
-          label: searchValue || t("New"),
-          value: "new"
-        }));
+    // 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 (updateOptions) {
-          onOptions(model.concat({
-            label: searchValue || t("New"),
-            value: "new"
-          }));
+          onOptions(model.concat(newOption));
         }
       }
-    } else {
-      setModel(model.filter(v => v.value !== "new"));
     }
     setModelValue(value ? value : multiple ? [] : null);
     setSearchValue(value);
@@ -36819,16 +36854,18 @@ function AjaxSelectMain(_ref) {
           let {
             data
           } = _ref2;
-          //? FUTURE ILVI KEEP THIS IN MIND
           if (meta.saveAjaxOptions) {
             changeAjaxOptions(name, data);
           }
-          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"
-            }]);
+
+          // 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]);
+            }
           } else {
             updateLabel(data, undefined, true);
             setTimeout(() => {
@@ -37032,7 +37069,7 @@ function AjaxSelectMain(_ref) {
           marginTop: 4
         }
       }),
-      disabled: !searchValue || typeof searchValue === "string" && searchValue.trim() === "" || (typeof modelValue === "string" && modelValue !== "new" || modelValue === "new" && model.filter(m => m.value === "new" && m.label === searchValue)) && asOption,
+      disabled: !searchValue || typeof searchValue === "string" && searchValue.trim() === "" || model.find(m => m.value === searchValue) && asOption,
       type: "link primary",
       onClick: () => {
         const oldValue = searchValue;
@@ -37139,14 +37176,11 @@ 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] = "new";
+        repeatValues[inputName] = oldValue;
         repeatValues[onNewSetValue] = oldValue;
         if (!formsValue[name]) {
           formsValue[name] = [];
@@ -37156,10 +37190,12 @@ function AjaxSelectMain(_ref) {
         // mainForm.scrollToField([name, repeatIndex, onNewSetValue]);
       }
     }
-    const newModelInd = model.findIndex(m => m.value === "new");
+
+    // Use the actual value instead of "new"
+    const newModelInd = model.findIndex(m => m.value === oldValue);
     let newModel = {
       label: oldValue,
-      value: "new"
+      value: oldValue
     };
     if (newModelInd >= 0) {
       model[newModelInd] = newModel;
@@ -37170,17 +37206,17 @@ function AjaxSelectMain(_ref) {
     if (updateOptions) {
       onOptions(model.concat({
         label: oldValue || t("New"),
-        value: "new"
+        value: oldValue
       }));
     }
-    setModelValue("new");
+    setModelValue(oldValue);
     inst.current.blur();
     if (!onNewSetValue) {
       const otherValues = onNewSetValue ? {
         [onNewSetValue]: searchValue,
-        [name]: "new"
+        [name]: oldValue
       } : {
-        [name]: "new"
+        [name]: oldValue
       };
 
       // remove keys, because can be from prev selection
@@ -37221,7 +37257,7 @@ function AjaxSelectMain(_ref) {
       return;
     }
     setTimeout(() => {
-      onChange("new", model || []);
+      onChange(oldValue, model || []);
       addNewValueKey(searchValue);
     }, 200);
   };
@@ -37286,6 +37322,9 @@ function AjaxSelect(props) {
     getAppHeader,
     getApiBaseUrl
   } = useEditContext();
+  console.log({
+    props
+  });
   return /*#__PURE__*/jsxRuntime.jsx(AjaxSelectMain, _objectSpread2({
     changeAjaxOptions: changeAjaxOptions,
     app: app,
@@ -38562,6 +38601,35 @@ const inputTypeComponent = {
     meta,
     setFormValues
   }) => {
+    console.log("AJAX SELECT");
+    console.log({
+      call,
+      automaticallyLink,
+      name,
+      inputName,
+      props,
+      formsValue,
+      onNewSetValue,
+      multiple,
+      updateOptions,
+      repeatValues,
+      repeatIndex,
+      value,
+      unique,
+      address,
+      addressData,
+      input
+    });
+    console.log({
+      form,
+      forms,
+      setAddress,
+      changeInputMeta,
+      inputMeta,
+      meta,
+      setFormValues
+    });
+    console.log("AJAX SELECT END");
     return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect, {
       preSelected: preSelected,
       input: input,

package/package.json

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

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

@@ -1422,6 +1422,10 @@ export const inputTypeComponent = {
 		},
 		{ form, forms, setAddress, changeInputMeta, inputMeta = {}, meta, setFormValues },
 	) => {
+		console.log("AJAX SELECT")
+		console.log({call, automaticallyLink, name, inputName, props, formsValue, onNewSetValue, multiple, updateOptions, repeatValues, repeatIndex, value, unique, address, addressData, input})
+		console.log({form, forms, setAddress, changeInputMeta, inputMeta, meta, setFormValues})
+		console.log("AJAX SELECT END")
 		return (
 			<AjaxSelect
 				preSelected={preSelected}

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

@@ -50,6 +50,9 @@ 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([]);
@@ -85,15 +88,18 @@ export function AjaxSelectMain({
 		: `${url}/${queryOptionsAppEndpoints[app] || "query/options"}`;
 
 	useEffect(() => {
-		if (value === "new") {
-			if (!model.find((m) => m.value === "new")) {
-				setModel(model.concat({ label: searchValue || t("New"), value: "new" }));
+		// 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 (updateOptions) {
-					onOptions(model.concat({ label: searchValue || t("New"), value: "new" }));
+					onOptions(model.concat(newOption));
 				}
 			}
-		} else {
-			setModel(model.filter((v) => v.value !== "new"));
 		}
 		setModelValue(value ? value : multiple ? [] : null);
 		setSearchValue(value);
@@ -211,19 +217,18 @@ export function AjaxSelectMain({
 						},
 					)
 					.then(({ data }) => {
-						//? FUTURE ILVI KEEP THIS IN MIND
 						if (meta.saveAjaxOptions) {
 							changeAjaxOptions(name, data);
 						}
 
-						if (modelValue === "new") {
-							const newData = model.find((m) => m.value === "new");
-							data = data.concat([
-								newData || {
-									label: inputMeta?.name || searchValue || t("New"),
-									value: "new",
-								},
-							]);
+						// 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]);
+							}
 						} else {
 							updateLabel(data, undefined, true);
 							setTimeout(() => {
@@ -442,10 +447,7 @@ export function AjaxSelectMain({
 				disabled={
 					!searchValue ||
 					(typeof searchValue === "string" && searchValue.trim() === "") ||
-					(((typeof modelValue === "string" && modelValue !== "new") ||
-						(modelValue === "new" &&
-							model.filter((m) => m.value === "new" && m.label === searchValue))) &&
-						asOption)
+					(model.find((m) => m.value === searchValue) && asOption)
 				}
 				type="link primary"
 				onClick={() => {
@@ -572,15 +574,12 @@ 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] = "new";
+				repeatValues[inputName] = oldValue;
 				repeatValues[onNewSetValue] = oldValue;
 				if (!formsValue[name]) {
 					formsValue[name] = [];
@@ -593,8 +592,10 @@ export function AjaxSelectMain({
 				// mainForm.scrollToField(onNewSetValue);
 			}
 		}
-		const newModelInd = model.findIndex((m) => m.value === "new");
-		let newModel = { label: oldValue, value: "new" };
+		
+		// Use the actual value instead of "new"
+		const newModelInd = model.findIndex((m) => m.value === oldValue);
+		let newModel = { label: oldValue, value: oldValue };
 		if (newModelInd >= 0) {
 			model[newModelInd] = newModel;
 		} else {
@@ -603,17 +604,17 @@ export function AjaxSelectMain({
 
 		setModel([...model]);
 		if (updateOptions) {
-			onOptions(model.concat({ label: oldValue || t("New"), value: "new" }));
+			onOptions(model.concat({ label: oldValue || t("New"), value: oldValue }));
 		}
-		setModelValue("new");
+		setModelValue(oldValue);
 		inst.current.blur();
 		if (!onNewSetValue) {
 			const otherValues = onNewSetValue
 				? {
 						[onNewSetValue]: searchValue,
-						[name]: "new",
+						[name]: oldValue,
 				  }
-				: { [name]: "new" };
+				: { [name]: oldValue };
 
 			// remove keys, because can be from prev selection
 			toRemoveKeysOnNew.forEach((k) => {
@@ -661,7 +662,7 @@ export function AjaxSelectMain({
 		}
 
 		setTimeout(() => {
-			onChange("new", model || []);
+			onChange(oldValue, model || []);
 			addNewValueKey(searchValue, true);
 		}, 200);
 	};
@@ -739,6 +740,7 @@ export function AjaxSelectMain({
 
 function AjaxSelect(props) {
 	const { changeAjaxOptions, app, t, user, getAppHeader, getApiBaseUrl } = useEditContext();
+	console.log({props})
 
 	return (
 		<AjaxSelectMain