From 83d8f2d23270d4cfce8f717d077a52fe9ca3efa7 Mon Sep 17 00:00:00 2001
From: Amit Fainholts <amit@up9.com>
Date: Wed, 26 Jan 2022 19:09:16 +0200
Subject: [PATCH] dealing with warnings

---
 .../Modals/AddUserModal/AddUserModal.sass     |  5 ---
 .../Modals/AddUserModal/AddUserModal.tsx      |  9 ++---
 .../AddWorkspaceModal/AddWorkspaceModal.tsx   | 40 +++++++++++--------
 .../components/UI/FilterableTableAction.tsx   |  2 +-
 .../UI/Modals/ConfirmationModal.sass          |  2 +-
 .../components/UserSettings/UserSettings.tsx  |  5 ---
 .../WorkspaceSettings/WorkspaceSettings.tsx   |  1 -
 7 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.sass b/ui/src/components/Modals/AddUserModal/AddUserModal.sass
index dc967b282..767a0a00e 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.sass
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.sass
@@ -1,9 +1,5 @@
 @import '../../../variables.module'
 
-<<<<<<< HEAD
-.user__role
-    width : 186px
-=======
 .user
     &__details
         display: flex;
@@ -17,4 +13,3 @@
 
         & .user__role
             width : 40%
->>>>>>> 1cfc896c105820df2713ea2c2d4e489f4c5c8731
diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
index e92900fd6..acfd95a5c 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
@@ -1,6 +1,6 @@
-import { FormControl, InputLabel, MenuItem, Select, TextField } from '@material-ui/core';
-import React, { FC, useEffect, useState } from 'react';
-import Api from '../../../helpers/api';
+import { FormControl, InputLabel, MenuItem, Select } from '@material-ui/core';
+import { FC, useEffect, useState } from 'react';
+// import Api from '../../../helpers/api';
 import { useCommonStyles } from '../../../helpers/commonStyle';
 import ConfirmationModal from '../../UI/Modals/ConfirmationModal';
 import SelectList from '../../UI/SelectList';
@@ -18,11 +18,10 @@ interface AddUserModalProps {
   userData : UserData;
 }
 
-const api = Api.getInstance();
+// const api = Api.getInstance();
 
 export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userData = {}}) => {
 
-  const [isOpenModal,setIsOpen] = useState(isOpen)
   //const [editUserData, setEditUserData] = useState(userData)
   const [searchValue, setSearchValue] = useState("");
   //const [userRole,setUserRole] = useState("")
diff --git a/ui/src/components/Modals/AddWorkspaceModal/AddWorkspaceModal.tsx b/ui/src/components/Modals/AddWorkspaceModal/AddWorkspaceModal.tsx
index c960ac7d8..66c57692a 100644
--- a/ui/src/components/Modals/AddWorkspaceModal/AddWorkspaceModal.tsx
+++ b/ui/src/components/Modals/AddWorkspaceModal/AddWorkspaceModal.tsx
@@ -1,49 +1,57 @@
-import React, { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState } from 'react';
+import Api from '../../../helpers/api';
 import { useCommonStyles } from '../../../helpers/commonStyle';
 import ConfirmationModal from '../../UI/Modals/ConfirmationModal';
 import SelectList from '../../UI/SelectList';
 import './AddWorkspaceModal.sass'
-// import './AddUserModal.sass';
 
 export type WorkspaceData = {
     name:string;
     namespaces: string[];
   }
 
-interface AddWorkspaceModal {
+interface AddWorkspaceModalProp {
   isOpen : boolean,
   onCloseModal: () => void,
   workspaceData: WorkspaceData
 }
 
-const AddWorkspaceModal: FC<AddWorkspaceModal> = ({isOpen,onCloseModal, workspaceData ={}}) => {
+const api = Api.getInstance();
+
+const AddWorkspaceModal: FC<AddWorkspaceModalProp> = ({isOpen,onCloseModal, workspaceData ={}}) => {
 
-  const [isOpenModal,setIsOpen] = useState(isOpen);
   const [workspaceDataModel, setUserData] = useState(workspaceData as WorkspaceData);
   const [searchValue, setSearchValue] = useState("");
   const classes = useCommonStyles()
-  const [namespaces, SetNamespaces] = useState({})
-
-  useEffect(() => {
-    setIsOpen(isOpen)
-  },[isOpen])
+  const [namespaces, setNamespaces] = useState({})
 
   useEffect(() => {
+    if(!isOpen) return;
     (async () => {
         try {
-            const namespacesList = {"default": false, "blabla": false, "test":true};
-            SetNamespaces(namespacesList)    
-                          
+            setSearchValue(""); 
+            const tapConfig = await api.getTapConfig();
+            console.log(tapConfig);
+            // if(isFirstLogin) {
+                const namespacesObj = {...tapConfig?.tappedNamespaces}
+                Object.keys(tapConfig?.tappedNamespaces ?? {}).forEach(namespace => {
+                    namespacesObj[namespace] = true;
+                })
+                setNamespaces(namespacesObj);
+            // } else {
+                setNamespaces(tapConfig?.tappedNamespaces);
+            // }
         } catch (e) {
             console.error(e);
+        } finally {
         }
-    })();
-},[])
+    })()
+}, [isOpen])
 
   const onConfirm = () => {}
 
   return (<>
-    <ConfirmationModal isOpen={isOpenModal} onClose={onCloseModal} onConfirm={onConfirm} title='Add Workspace'>
+    <ConfirmationModal isOpen={isOpen} onClose={onCloseModal} onConfirm={onConfirm} title='Add Workspace'>
     <h3 className='headline'>DETAILS</h3>
       <div>
         <input type="text" value={workspaceDataModel?.name ?? ""} className={classes.textField + " workspace__name"} placeholder={"Workspace Name"} 
diff --git a/ui/src/components/UI/FilterableTableAction.tsx b/ui/src/components/UI/FilterableTableAction.tsx
index b19135f1c..3369c525c 100644
--- a/ui/src/components/UI/FilterableTableAction.tsx
+++ b/ui/src/components/UI/FilterableTableAction.tsx
@@ -47,7 +47,7 @@ export const FilterableTableAction: React.FC<Props> = ({onRowDelete,onRowEdit, s
     const filteredValues = useMemo(() => {
         const searchFunc = searchConfig.filterRows(inputSearch)
         return tableRows.filter(searchFunc)
-    },[tableRows, inputSearch])
+    },[tableRows, inputSearch,searchConfig])
 
     return (<>
         <div className="filterable-table">
diff --git a/ui/src/components/UI/Modals/ConfirmationModal.sass b/ui/src/components/UI/Modals/ConfirmationModal.sass
index bde9149f3..426bb25b7 100644
--- a/ui/src/components/UI/Modals/ConfirmationModal.sass
+++ b/ui/src/components/UI/Modals/ConfirmationModal.sass
@@ -52,4 +52,4 @@
     width: 100%;
     width: -moz-available;
     width: -webkit-fill-available;
-    width: fill-available;
\ No newline at end of file
+    width: strech;
\ No newline at end of file
diff --git a/ui/src/components/UserSettings/UserSettings.tsx b/ui/src/components/UserSettings/UserSettings.tsx
index 98d73cfea..e6debaa5f 100644
--- a/ui/src/components/UserSettings/UserSettings.tsx
+++ b/ui/src/components/UserSettings/UserSettings.tsx
@@ -3,11 +3,6 @@ import {ColsType, FilterableTableAction} from "../UI/FilterableTableAction"
 // import Api from "../../helpers/api"
 import { useEffect, useState } from "react";
 import AddUserModal, { UserData } from "../Modals/AddUserModal/AddUserModal";
-import { Select } from "../UI/Select";
-import { MenuItem } from "@material-ui/core";
-import { settings } from "cluster";
-import { SettingsModal } from "../SettingsModal/SettingModal";
-import OasModal from "../Modals/OasModal/OasModal";
 
 interface Props {
 
diff --git a/ui/src/components/WorkspaceSettings/WorkspaceSettings.tsx b/ui/src/components/WorkspaceSettings/WorkspaceSettings.tsx
index 2cb8f3c1b..8e2030e02 100644
--- a/ui/src/components/WorkspaceSettings/WorkspaceSettings.tsx
+++ b/ui/src/components/WorkspaceSettings/WorkspaceSettings.tsx
@@ -3,7 +3,6 @@ import {ColsType, FilterableTableAction} from "../UI/FilterableTableAction"
 // import Api from "../../helpers/api"
 import { useEffect, useState } from "react";
 import AddWorkspaceModal, { WorkspaceData } from "../Modals/AddWorkspaceModal/AddWorkspaceModal";
-import SelectList from "../UI/SelectList";
 
 interface Props {}