Merge remote-tracking branch 'origin/feature/ui/TRA-4192_workspace_management' into origin/ui/TRA-4204_user_managment

ui/package.json

@@ -34,6 +34,7 @@
     "react-graph-vis": "^1.0.7",
     "react-lowlight": "^3.0.0",
     "react-router-dom": "^6.2.1",
+    "react-scripts": "^4.0.3",
     "react-scrollable-feed-virtualized": "^1.4.9",
     "react-syntax-highlighter": "^15.4.3",
     "react-toastify": "^8.0.3",

ui/src/components/Header/EntHeader.tsx

@@ -11,6 +11,7 @@ import Api from "../../helpers/api";
 import {toast} from "react-toastify";
 import {useSetRecoilState} from "recoil";
 import entPageAtom, {Page} from "../../recoil/entPage";
+import AdminSettings from "../Pages/SettingsPage/SettingsPage";
 import {useNavigate} from "react-router-dom";
 
 const api = Api.getInstance();
@@ -45,7 +46,8 @@ export const EntHeader: React.FC<EntHeaderProps> = ({isFirstLogin, setIsFirstLog
             <img className="headerIcon" alt="settings" src={settingImg} style={{marginRight: 25}} onClick={() => setIsSettingsModalOpen(true)}/>
             <ProfileButton/>
         </div>
-        <SettingsModal isOpen={isSettingsModalOpen} onClose={onSettingsModalClose} isFirstLogin={isFirstLogin}/>
+        {/* <SettingsModal isOpen={isSettingsModalOpen} onClose={onSettingsModalClose} isFirstLogin={isFirstLogin}/> */}
+        {/* <AdminSettings isOpen={isSettingsModalOpen} onClose={onSettingsModalClose}/> */}
     </div>;
 }
 

ui/src/components/Pages/SettingsPage/SettingsPage.tsx

@@ -0,0 +1,17 @@
+import { useState } from "react";
+import Tabs from "../../UI/Tabs"
+
+const AdminSettings: React.FC<any> = ({color}) => {
+    var TABS = [
+        {tab:"USERS"}, {tab:"WORKSPACE"}
+    ];
+    
+    const [currentTab, setCurrentTab] = useState(TABS[0].tab);
+    return (
+        <div style={{padding:" 0 1rem"}}>
+        <Tabs tabs={TABS} currentTab={currentTab} color={color} onChange={setCurrentTab} leftAligned/>
+    </div>
+    )
+  }
+
+export default AdminSettings;