@@ -175,11 +181,13 @@ const ResultsTable = (props) => {
stateUpdateModifier(createdAt)}
width={200}
/>
stateUpdateModifier(updatedAt)}
width={200}
/>
.
+ ******************************************************************************/
+
+import React from 'react';
+import { useState } from 'react';
+import { Form, Col, Button} from 'react-bootstrap';
+import Dialog from '../../../common/dialogs/dialog';
+import { useGetScenariosQuery } from '../../../store/apiSlice';
+
+const AddScenarioMappingDialog = ({isDialogOpened, onClose, mappings}) => {
+
+ const [name, setName] = useState('');
+ const [isValid, setIsValid] = useState(false);
+ const [selectedOption, setSelectedOption] = useState('addUsersToScenario');
+ const [selectedScenarioID, setSelectedScenarioID] = useState('');
+
+ const {data: {scenarios} = {}, isLoading: isLoadingScenarios} = useGetScenariosQuery();
+
+ const handleRadioChange = (e) => {
+ setSelectedOption(e.target.value);
+ }
+
+ const handleClose = (canceled) => {
+ if(canceled) {
+ onClose(null);
+ } else {
+ onClose({scenarioID: Number(selectedScenarioID), duplicate: selectedOption === 'duplicateScenarioForUsers'});
+ }
+ }
+
+ const handleSelectChange = (e) => {
+ setSelectedScenarioID(e.target.value);
+ setIsValid(e.target.value !== '');
+ };
+
+ return ();
+}
+
+export default AddScenarioMappingDialog;
diff --git a/src/pages/usergroups/dialogs/addUserToUsergroupDialog.js b/src/pages/usergroups/dialogs/addUserToUsergroupDialog.js
new file mode 100644
index 0000000..64dab95
--- /dev/null
+++ b/src/pages/usergroups/dialogs/addUserToUsergroupDialog.js
@@ -0,0 +1,81 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see .
+ ******************************************************************************/
+
+import React from 'react';
+import { useState, useEffect } from 'react';
+import { Form, Col, Dropdown, Badge } from 'react-bootstrap';
+import Dialog from '../../../common/dialogs/dialog';
+import { useGetUsersQuery } from '../../../store/apiSlice';
+
+const AddUserToUsergroupDialog = ({isModalOpened, onClose, currentUsers}) => {
+
+ const [selectedUsers, setSelectedusers] = useState([]);
+ const [isValid, setIsValid] = useState(false);
+
+ const {data: {users} = {}, isLoading: isLoadingUsers} = useGetUsersQuery();
+
+ const toggleUser = (event, option) => {
+ event.preventDefault();
+ if (selectedUsers.includes(option)) {
+ setSelectedusers(prevState => ([...prevState.filter((item) => item !== option)]));
+ } else {
+ setSelectedusers(prevState => ([...prevState, option]));
+ }
+ }
+
+ useEffect(() => {
+ setIsValid(selectedUsers.length > 0);
+ }, [selectedUsers]);
+
+ const handleClose = (canceled) => {
+ if(!canceled){
+ onClose(selectedUsers);
+ } else {
+ onClose([]);
+ }
+ }
+
+ const handleReset = () => {
+ setSelectedusers([]);
+ }
+
+ return (
+
+ );
+}
+
+export default AddUserToUsergroupDialog;
diff --git a/src/pages/usergroups/dialogs/renameGroupDialog.js b/src/pages/usergroups/dialogs/renameGroupDialog.js
new file mode 100644
index 0000000..cfab466
--- /dev/null
+++ b/src/pages/usergroups/dialogs/renameGroupDialog.js
@@ -0,0 +1,69 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see .
+ ******************************************************************************/
+
+import React from 'react';
+import { useState, useEffect } from 'react';
+import { Form, Col, Button} from 'react-bootstrap';
+import Dialog from '../../../common/dialogs/dialog';
+
+const RenameUsergroupDialog = ({isModalOpened, onClose, oldName}) => {
+
+ const [name, setName] = useState(oldName);
+ const [isValid, setIsValid] = useState(false);
+
+ useEffect(() => {
+ if (isModalOpened && oldName) {
+ setName(oldName);
+ }
+ }, [isModalOpened, oldName]);
+
+ const handleNameChange = (e) => {
+ const newName = e.target.value;
+ setName(newName);
+ setIsValid(newName.length >= 3 && !(/^\s/.test(newName)));
+ }
+
+ const handleClose = (canceled) => {
+ if(canceled) {
+ onClose(null);
+ } else {
+ onClose(name);
+ }
+ }
+
+ const handleReset = () => {
+ setName('');
+ }
+
+ return ();
+}
+
+export default RenameUsergroupDialog;
diff --git a/src/pages/usergroups/tables/usergroup-scenarios-table.js b/src/pages/usergroups/tables/usergroup-scenarios-table.js
index b6716e2..28e270c 100644
--- a/src/pages/usergroups/tables/usergroup-scenarios-table.js
+++ b/src/pages/usergroups/tables/usergroup-scenarios-table.js
@@ -15,16 +15,60 @@
* along with VILLASweb. If not, see .
******************************************************************************/
-import { useGetUsergroupByIdQuery } from "../../../store/apiSlice";
+import { useState } from "react";
+import { useGetScenariosQuery, useGetUsergroupByIdQuery } from "../../../store/apiSlice";
import { Table, DataColumn, LinkColumn, ButtonColumn } from "../../../common/table";
import { iconStyle, buttonStyle } from "../styles";
import IconButton from "../../../common/buttons/icon-button";
+import AddScenarioMappingDialog from "../dialogs/addScenarioMappingDialog";
+import { useUpdateUsergroupMutation } from "../../../store/apiSlice";
+import DeleteDialog from "../../../common/dialogs/delete-dialog";
const UsergroupScenariosTable = ({usergroupID}) => {
- const {data: {usergroup} = {}, isLoading} = useGetUsergroupByIdQuery(usergroupID);
+ const {data: {usergroup} = {}, isLoading, refetch} = useGetUsergroupByIdQuery(usergroupID);
+ const {data: {scenarios} = {}, isLoading: isScenariosLoading } = useGetScenariosQuery();
+ const [isAddScenarioDialogOpen, setIsAddScenarioDialogOpen] = useState(false);
+ const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
+ const [mappingToDelete, setMappingToDelete] = useState({scenarioID: null});
+ const [updateUsergroup] = useUpdateUsergroupMutation();
- const handleAddScenarioMapping = () => {
+ const handleAddScenarioMapping = async (newMapping) => {
+ if(newMapping){
+ try{
+ //add new mapping while saving name and existing mappings if there are any
+ const oldMappings = usergroup.scenarioMappings.length > 0 ? [...usergroup.scenarioMappings] : [];
+ await updateUsergroup({usergroupID: usergroupID, usergroup: {name: usergroup.name, scenarioMappings: [...oldMappings, newMapping]}}).unwrap();
+ refetch();
+ } catch(error) {
+ console.log("Error updating mappings", error);
+ }
+ }
+ setIsAddScenarioDialogOpen(false);
+ }
+ const handleRemoveScenarioMapping = async (isConfirmed) => {
+ if(isConfirmed){
+ try {
+ //update usergroup with new mappings without the target
+ const newMappings = [...usergroup.scenarioMappings].filter(mapping => mapping.id !== mappingToDelete.id);
+ await updateUsergroup({usergroupID: usergroupID, usergroup: {name: usergroup.name, scenarioMappings: newMappings}}).unwrap();
+ refetch();
+ } catch (error) {
+ console.log("Error removing mapping", error);
+ }
+ }
+ setIsDeleteDialogOpen(false);
+ setMappingToDelete({scenarioID: null});
+ }
+
+ const getScenarioName = (scenarioID) => {
+ if(isScenariosLoading){
+ return Loading...
;
+ }
+
+ const scenario = scenarios.find((scenario) => scenario.id === scenarioID);
+
+ return scenario ? {scenario.name}
: unknown
;
}
const getDuplicateLabel = (duplicate) => {
@@ -40,7 +84,7 @@ const UsergroupScenariosTable = ({usergroupID}) => {
handleAddScenarioMapping()}
+ onClick={() => setIsAddScenarioDialogOpen(true)}
icon="plus"
buttonStyle={buttonStyle}
iconStyle={iconStyle}
@@ -48,14 +92,27 @@ const UsergroupScenariosTable = ({usergroupID}) => {
-
-
- getDuplicateLabel(duplicate)}/>
- {/* */}
+
+ getScenarioName(scenarioID)}/>
+ getDuplicateLabel(duplicate)}/>
+ {
+ setMappingToDelete(usergroup.scenarioMappings[index]);
+ setIsDeleteDialogOpen(true);
+ }}
+ />
+
+ handleAddScenarioMapping(newMapping)} />
+ handleRemoveScenarioMapping(isConfirmed)}
+ />
Loading...
;
@@ -36,7 +60,7 @@ const UsergroupUsersTable = ({usergroupID}) => {