@visns-studio/visns-components 1.0.10 → 1.0.11

package/components/cms/visns-dropzone.jsx

@@ -7,9 +7,10 @@ import { File, TrashCan } from "akar-icons";
 import "react-confirm-alert/src/react-confirm-alert.css";
 
 import CustomFetch from "../crm/visns-fetch";
+import { toast } from "react-toastify";
 
 function VisnsDropZone(props) {
-	const { alertStateChange, fetchData, files, settings } = props;
+	const { fetchData, files, settings } = props;
 	const [loadingProgress, setLoadingProgress] = useState(0);
 
 	const onDrop = useCallback((acceptedFiles) => {
@@ -36,27 +37,12 @@ function VisnsDropZone(props) {
 						if (result.error === "") {
 							fetchData();
 
-							alertStateChange({
-								show: true,
-								alertClass: "dialog success",
-								alertText: String(
-									"File has been successfully uploaded."
-								),
-							});
+							toast.success(
+								"File has been successfully uploaded."
+							);
 						} else {
-							alertStateChange({
-								show: true,
-								alertClass: "dialog error",
-								alertText: String(result.error),
-							});
+							toast.error(String(result.error));
 						}
-					},
-					function (error) {
-						alertStateChange({
-							show: true,
-							alertClass: "dialog error",
-							alertText: String(error),
-						});
 					}
 				);
 			});
@@ -71,11 +57,7 @@ function VisnsDropZone(props) {
 		if (id && id > 0) {
 			window.open(`/ajax/file/download/${id}/${settings.model}`);
 		} else {
-			alertStateChange({
-				show: true,
-				alertClass: "dialog error",
-				alertText: String("Issue with downloading the selected file."),
-			});
+			toast.warning("Issue with downloading the selected file.");
 		}
 	};
 
@@ -102,13 +84,6 @@ function VisnsDropZone(props) {
 										if (result.error === "") {
 											fetchData();
 										}
-									},
-									function (error) {
-										alertStateChange({
-											show: true,
-											alertClass: "dialog error",
-											alertText: String(error),
-										});
 									}
 								);
 							},
@@ -120,11 +95,7 @@ function VisnsDropZone(props) {
 					],
 				});
 			} else {
-				alertStateChange({
-					show: true,
-					alertClass: "dialog error",
-					alertText: String("Issue with deleting the selected file."),
-				});
+				toast.error("Issue with deleting the selected file.");
 			}
 		}
 	};

package/components/cms/visns-field.jsx

@@ -23,7 +23,6 @@ function Field(props) {
 		settings,
 		inputValue,
 		inputClass,
-		alertStateChange,
 		onChange,
 		onChangeFile,
 		onChangeRicheditor,
@@ -51,44 +50,32 @@ function Field(props) {
 					};
 				}
 
-				CustomFetch(
-					settings.url,
-					"POST",
-					filter,
-					function (result) {
-						setOptions(result.data);
+				CustomFetch(settings.url, "POST", filter, function (result) {
+					setOptions(result.data);
 
-						let dataArray = [];
+					let dataArray = [];
 
-						result.data.forEach((a) => {
-							let _tempObject = a;
-
-							if (!_.isEmpty(_tempObject)) {
-								let modifiedObject = {};
+					result.data.forEach((a) => {
+						let _tempObject = a;
 
-								Object.keys(_tempObject).forEach(function (c) {
-									if (c !== "id" && c !== "label") {
-										modifiedObject["data-" + c] =
-											_tempObject[c];
-									}
-								});
+						if (!_.isEmpty(_tempObject)) {
+							let modifiedObject = {};
 
-								dataArray.push(modifiedObject);
-							}
-						});
+							Object.keys(_tempObject).forEach(function (c) {
+								if (c !== "id" && c !== "label") {
+									modifiedObject["data-" + c] =
+										_tempObject[c];
+								}
+							});
 
-						if (dataArray.length > 0) {
-							setDataOptions(dataArray);
+							dataArray.push(modifiedObject);
 						}
-					},
-					function (error) {
-						alertStateChange({
-							show: true,
-							alertClass: "dialog error",
-							alertText: String(error),
-						});
+					});
+
+					if (dataArray.length > 0) {
+						setDataOptions(dataArray);
 					}
-				);
+				});
 				break;
 			case "multi-dropdown-ajax":
 				let multiFilter = {};
@@ -131,13 +118,6 @@ function Field(props) {
 						if (dataArray.length > 0) {
 							setDataOptions(dataArray);
 						}
-					},
-					function (error) {
-						alertStateChange({
-							show: true,
-							alertClass: "dialog error",
-							alertText: String(error),
-						});
 					}
 				);
 				break;
@@ -173,13 +153,6 @@ function Field(props) {
 							id: settings.child.id,
 							data: result.data,
 						});
-					},
-					function (error) {
-						alertStateChange({
-							show: true,
-							alertClass: "dialog error",
-							alertText: String(error),
-						});
 					}
 				);
 			}

package/components/cms/visns-form.jsx

@@ -4,13 +4,15 @@ import Field from "./visns-field";
 import slugify from "react-slugify";
 import moment from "moment";
 import Reveal from "react-reveal/Reveal";
+import parse from "html-react-parser";
 import { confirmAlert } from "react-confirm-alert";
-import { Copy, Send, TrashBin } from "akar-icons";
+import { toast } from "react-toastify";
+import { Copy, TrashBin } from "akar-icons";
 
 import "react-confirm-alert/src/react-confirm-alert.css";
 
 function Form(props) {
-	const { dataId, navigate, form, setActiveNav, alertStateChange } = props;
+	const { dataId, navigate, form, setActiveNav } = props;
 	const [data, setData] = useState({});
 	const [dataClass, setDataClass] = useState({});
 	const [audit, setAudit] = useState({
@@ -166,61 +168,37 @@ function Form(props) {
 					message = "You have successfully updated this entry.";
 				}
 
-				CustomFetch(
-					url,
-					method,
-					data,
-					function (result) {
-						if (result.error === "") {
-							let _uploadProgress = uploadProgress;
+				CustomFetch(url, method, data, function (result) {
+					if (result.error === "") {
+						let _uploadProgress = uploadProgress;
 
-							Object.keys(_uploadProgress).forEach((a, b) => {
-								setUploadProgress((prevState) => ({
-									...prevState,
-									[b]: 0,
-								}));
-							});
+						Object.keys(_uploadProgress).forEach((a, b) => {
+							setUploadProgress((prevState) => ({
+								...prevState,
+								[b]: 0,
+							}));
+						});
 
-							alertStateChange({
-								show: true,
-								alertClass: "dialog success",
-								alertText: message,
-							});
+						toast.success(message);
 
-							if (dataId === "create") {
-								navigate(
-									form.url.replace("/ajax", "") +
-										"/" +
-										result.data.id,
-									{
-										state: {
-											form: form,
-										},
-									}
-								);
-							}
-						} else {
-							alertStateChange({
-								show: true,
-								alertClass: "dialog error",
-								alertText: result.error,
-							});
+						if (dataId === "create") {
+							navigate(
+								form.url.replace("/ajax", "") +
+									"/" +
+									result.data.id,
+								{
+									state: {
+										form: form,
+									},
+								}
+							);
 						}
-					},
-					function (error) {
-						alertStateChange({
-							show: true,
-							alertClass: "dialog error",
-							alertText: String(error),
-						});
+					} else {
+						toast.error(result.error);
 					}
-				);
-			} else {
-				alertStateChange({
-					show: true,
-					alertClass: "dialog error",
-					alertText: error,
 				});
+			} else {
+				toast.error(<div>{parse(error)}</div>);
 			}
 		}
 	};
@@ -241,26 +219,12 @@ function Form(props) {
 								function (result) {
 									if (result.error === "") {
 										navigate(form.url.replace("/ajax", ""));
-										alertStateChange({
-											show: true,
-											alertClass: "dialog success",
-											alertText:
-												"You have successfully deleted this entry.",
-										});
+										toast.success(
+											"You have successfully deleted this entry."
+										);
 									} else {
-										alertStateChange({
-											show: true,
-											alertClass: "dialog error",
-											alertText: result.error,
-										});
+										toast.error(result.error);
 									}
-								},
-								function (error) {
-									alertStateChange({
-										show: true,
-										alertClass: "dialog error",
-										alertText: String(error),
-									});
 								}
 							),
 					},
@@ -328,11 +292,8 @@ function Form(props) {
 				},
 				function (error) {
 					navigate("/insights");
-					alertStateChange({
-						show: true,
-						alertClass: "dialog error",
-						alertText: String(error),
-					});
+
+					toast.error(String(error));
 				}
 			);
 		}
@@ -386,7 +347,6 @@ function Form(props) {
 						<div className="dynamicform">
 							{form.fields.map((a, b) => (
 								<Field
-									alertStateChange={alertStateChange}
 									settings={a}
 									key={
 										b +

package/package.json

@@ -15,6 +15,8 @@
 		"react-promise-tracker": "^2.1.1",
 		"react-quill": "^2.0.0",
 		"react-select": "^5.7.3",
+		"react-slugify": "^3.0.2",
+		"react-sortable-hoc": "^2.0.0",
 		"react-toastify": "^9.1.3",
 		"react-toggle": "^4.1.3",
 		"react-tooltip": "^5.14.0",
@@ -30,7 +32,7 @@
 		"react-dom": ">=18.2.0"
 	},
 	"name": "@visns-studio/visns-components",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"description": "Various packages to assist in the development of our Custom Applications.",
 	"main": "index.js",
 	"devDependencies": {},