From ab1e9d66b5bd6bb9ff3b8f460c83e2b7daa9979c Mon Sep 17 00:00:00 2001
From: Sean Hatfield <seanhatfield5@gmail.com>
Date: Wed, 1 Nov 2023 18:21:30 -0700
Subject: [PATCH] Use toast in workspace settings tab (#322)
* fix white border around user avatar
* add toast into settings menu on change/error
---
.../Modals/MangeWorkspace/Settings/index.jsx | 31 ++-----------------
1 file changed, 3 insertions(+), 28 deletions(-)
diff --git a/frontend/src/components/Modals/MangeWorkspace/Settings/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Settings/index.jsx
index 286349e08..1e61df428 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Settings/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Settings/index.jsx
@@ -5,6 +5,7 @@ import { chatPrompt } from "../../../../utils/chat";
import System from "../../../../models/system";
import PreLoader from "../../../Preloader";
import { useParams } from "react-router-dom";
+import showToast from "../../../../utils/toast";
// Ensure that a type is correct before sending the body
// to the backend.
@@ -27,27 +28,9 @@ export default function WorkspaceSettings({ workspace }) {
const formEl = useRef(null);
const [saving, setSaving] = useState(false);
const [hasChanges, setHasChanges] = useState(false);
- const [error, setError] = useState(null);
- const [success, setSuccess] = useState(null);
const [totalVectors, setTotalVectors] = useState(null);
const [canDelete, setCanDelete] = useState(false);
- useEffect(() => {
- function setTimer() {
- if (success !== null) {
- setTimeout(() => {
- setSuccess(null);
- }, 3_000);
- }
-
- if (error !== null) {
- setTimeout(() => {
- setError(null);
- }, 3_000);
- }
- }
- setTimer();
- }, [success, error]);
useEffect(() => {
async function fetchKeys() {
@@ -61,8 +44,6 @@ export default function WorkspaceSettings({ workspace }) {
}, []);
const handleUpdate = async (e) => {
- setError(null);
- setSuccess(null);
setSaving(true);
e.preventDefault();
const data = {};
@@ -73,9 +54,9 @@ export default function WorkspaceSettings({ workspace }) {
data
);
if (!!updatedWorkspace) {
- setSuccess("Workspace updated!");
+ showToast("Workspace updated!", "success", { clear: true });
} else {
- setError(message);
+ showToast(`Error: ${message}`, "error", { clear: true });
}
setSaving(false);
setHasChanges(false);
@@ -257,12 +238,6 @@ export default function WorkspaceSettings({ workspace }) {
</div>
</div>
</div>
- <div className="text-center">
- {error && <p className="text-red-400 text-sm">Error: {error}</p>}
- {success && (
- <p className="text-green-400 text-sm">Success: {success}</p>
- )}
- </div>
</div>
</div>
<div className="flex items-center justify-between p-2 md:p-6 space-x-2 border-t rounded-b border-gray-600">
--
GitLab