From 372cf41fb1c54586ef9563c6d618b2c96ccf8fd6 Mon Sep 17 00:00:00 2001
From: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:37:32 +0530
Subject: [PATCH] Platform Release 19.2 Bugs (#10794)

* init

* slug changes
---
 .../OrganizationManager/CreateOrganization.jsx     | 14 +++++++++++++-
 frontend/src/_stores/currentStateStore.js          |  7 +++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/frontend/src/_components/OrganizationManager/CreateOrganization.jsx b/frontend/src/_components/OrganizationManager/CreateOrganization.jsx
index 6357b000bb..748fbb3f39 100644
--- a/frontend/src/_components/OrganizationManager/CreateOrganization.jsx
+++ b/frontend/src/_components/OrganizationManager/CreateOrganization.jsx
@@ -20,6 +20,7 @@ export const CreateOrganization = ({ showCreateOrg, setShowCreateOrg }) => {
   const { t } = useTranslation();
   const isSlugSet = useRef(false); // Flag to track if slug has been initially set
   const sluginput = useRef('');
+  const [isDisabled, setIsDisabled] = useState(true);
 
   const createOrganization = () => {
     let emptyError = false;
@@ -155,6 +156,7 @@ export const CreateOrganization = ({ showCreateOrg, setShowCreateOrg }) => {
             errorMsg: errResponse?.error,
           };
           setSlug({ value: defaultValue, error: error?.errorMsg });
+          sluginput.current.value = defaultValue;
         }
       };
       checkWorkspaceUniqueness();
@@ -167,7 +169,17 @@ export const CreateOrganization = ({ showCreateOrg, setShowCreateOrg }) => {
     }
   }, [name.value, slug.value, slugProgress, workspaceNameProgress, isSlugSet]);
 
-  const isDisabled = isCreating || isNameDisabled || isSlugDisabled || slugProgress || workspaceNameProgress;
+  useEffect(() => {
+    const isDisabled =
+      isCreating ||
+      isNameDisabled ||
+      isSlugDisabled ||
+      slugProgress ||
+      workspaceNameProgress ||
+      slug?.error ||
+      name?.error;
+    setIsDisabled(isDisabled);
+  }, [isCreating, isNameDisabled, isSlugDisabled, slugProgress, workspaceNameProgress, name, slug]);
 
   return (
     <AlertDialog
diff --git a/frontend/src/_stores/currentStateStore.js b/frontend/src/_stores/currentStateStore.js
index e1cc4d54f0..776f99de21 100644
--- a/frontend/src/_stores/currentStateStore.js
+++ b/frontend/src/_stores/currentStateStore.js
@@ -56,13 +56,16 @@ export const useCurrentStateStore = create(
         setEditorReady: (isEditorReady) => set({ isEditorReady }),
         initializeCurrentStateOnVersionSwitch: () => {
           //fetch user for current app
+          const currentSession = authenticationService.currentSessionValue;
           const currentUser = useAppDataStore.getState().currentUser;
           const userVars = {
             email: currentUser?.email,
             firstName: currentUser?.first_name,
             lastName: currentUser?.last_name,
-            groups: authenticationService.currentSessionValue.group_permissions?.map((group) => group.group),
-            ssoUserInfo: currentUser?.sso_user_info,
+            groups: currentSession?.group_permissions
+              ? ['all_users', ...currentSession.group_permissions.map((group) => group.name)]
+              : ['all_users'],
+            role: currentSession?.role?.name,
           };
           const newInitialState = {
             ...initialState,