github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-26 13:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leon
2022-02-01 16:13:44 +02:00
parent 573121dce8 a4eb996f9f
commit 9a2ede9384
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ui/src/components/Modals/AddUserModal/AddUserModal.tsx
View File

@@ -31,7 +31,9 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
//const [editUserData, setEditUserData] = useState(userData) //const [editUserData, setEditUserData] = useState(userData)
const [searchValue, setSearchValue] = useState(""); const [searchValue, setSearchValue] = useState("");
const [workspaces, setWorkspaces] = useState([]) const [workspaces, setWorkspaces] = useState([])
//const { control, handleSubmit,register } = useForm<UserData>(); //const { control, handleSubmit,register } = useForm<UserData>();
const [disable, setDisable] = useState(true); const [disable, setDisable] = useState(true);
const [editMode, setEditMode] = useState(isEditMode); const [editMode, setEditMode] = useState(isEditMode);
@@ -49,7 +51,6 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
useEffect(() => { useEffect(() => {
(async () => { (async () => {
try { try {
<<<<<<< HEAD
// const workspacesList = [ // const workspacesList = [
// { // {
// "id": "f54b18ec-aa15-4b2c-a4d5-8eda17e44c93", // "id": "f54b18ec-aa15-4b2c-a4d5-8eda17e44c93",
@@ -64,21 +65,6 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
const list = await api.getWorkspaces() const list = await api.getWorkspaces()
const workspacesList = list.map((obj) => {return {key:obj.id, value:obj.name,isChecked:false}}) const workspacesList = list.map((obj) => {return {key:obj.id, value:obj.name,isChecked:false}})
setWorkspaces(workspacesList) setWorkspaces(workspacesList)
=======
const workspacesList = [
{
"id": "f54b18ec-aa15-4b2c-a4d5-8eda17e44c93",
"name": "sock-shop"
},
{
"id": "c7ad9158-d840-46c0-b5ce-2487c013723f",
"name": "test"
}
].map((obj) => {return {key:obj.id, value:obj.name}})
//await api.getWorkspaces()
setWorkspaces(workspacesList)
>>>>>>> origin/feature/ui/TRA-4192_workspace_management
} catch (e) { } catch (e) {
toast.error("Error finding workspaces") toast.error("Error finding workspaces")
} }
@@ -119,9 +105,8 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
const workspaceChange = (workspaces) => { const workspaceChange = (workspaces) => {
//setWorkspaces(newVal); //setWorkspaces(newVal);
const selectedWorksapce = workspaces.find(x=> x.isChecked) const data = {...userDataModel, workspaceId : workspaces.length ? workspaces[0] : ""}
const data = {...userDataModel, workspaceId : selectedWorksapce.key} setUserData((prevState) => {return data});
setUserData(data)
setGenarateDisabledState() setGenarateDisabledState()
} }
@@ -273,7 +258,7 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
onChange={(event) => setSearchValue(event.target.value)}/> onChange={(event) => setSearchValue(event.target.value)}/>
</div> </div>
<SelectList items={workspaces} tableName={''} multiSelect={false} searchValue={searchValue} <SelectList items={workspaces} tableName={''} multiSelect={false} searchValue={searchValue}
setCheckedValues={workspaceChange} tabelClassName={''} checkedValues={[]} > setCheckedValues={workspaceChange} tabelClassName={''} checkedValues={[userDataModel.workspaceId]} >
</SelectList> </SelectList>
</div> </div>

13
ui/src/components/UI/SelectList.tsx
View File

@@ -25,14 +25,21 @@ const SelectList: React.FC<Props> = ({items ,tableName,checkedValues=[],multiSel
const toggleValue = (checkedKey) => { const toggleValue = (checkedKey) => {
if (!multiSelect){ if (!multiSelect){
unToggleAll(); // unToggleAll();
const newCheckedValues = [];
newCheckedValues.push(checkedKey);
setCheckedValues(newCheckedValues);
} }
else {
const newCheckedValues = [...checkedValues]; const newCheckedValues = [...checkedValues];
let index = newCheckedValues.indexOf(checkedKey); let index = newCheckedValues.indexOf(checkedKey);
if(index > -1) newCheckedValues.splice(index,1); if(index > -1)
else newCheckedValues.push(checkedKey); newCheckedValues.splice(index,1);
else
newCheckedValues.push(checkedKey);
setCheckedValues(newCheckedValues); setCheckedValues(newCheckedValues);
} }
}
const unToggleAll = () => { const unToggleAll = () => {
setCheckedValues([]); setCheckedValues([]);