From 40daf01c1dc3793783f40e5e2379e8ee73b4a719 Mon Sep 17 00:00:00 2001 From: Sina Blattmann Date: Thu, 6 Apr 2023 10:48:36 +0200 Subject: [PATCH] add ids to elements --- .../src/components/Groups/AddNewDialog.tsx | 12 ++++- .../src/components/Groups/FolderForm.tsx | 10 ++-- .../src/components/Groups/GroupTabs.tsx | 3 ++ .../src/components/Groups/LocationForm.tsx | 50 ------------------- .../src/components/Groups/Tree/GroupTree.tsx | 2 + .../src/components/Groups/Tree/MoveDialog.tsx | 14 +++++- .../src/components/Groups/Tree/MoveTree.tsx | 3 +- .../Installations/InstallationForm.tsx | 12 ++--- .../Installations/InstallationList.tsx | 3 ++ .../Installations/InstallationTabs.tsx | 3 ++ .../Installations/Installations.tsx | 5 +- .../src/components/Layout/LanguageSelect.tsx | 7 ++- .../src/components/Layout/LogoutButton.tsx | 1 + .../src/components/Layout/ModeButtons.tsx | 7 ++- .../components/Layout/NavigationButtons.tsx | 3 ++ .../Frontend/src/components/Layout/Search.tsx | 5 +- .../src/components/Users/UserTabs.tsx | 2 + .../Frontend/src/components/Users/Users.tsx | 2 +- 18 files changed, 70 insertions(+), 74 deletions(-) delete mode 100644 typescript/Frontend/src/components/Groups/LocationForm.tsx diff --git a/typescript/Frontend/src/components/Groups/AddNewDialog.tsx b/typescript/Frontend/src/components/Groups/AddNewDialog.tsx index 074251907..a8112e261 100644 --- a/typescript/Frontend/src/components/Groups/AddNewDialog.tsx +++ b/typescript/Frontend/src/components/Groups/AddNewDialog.tsx @@ -28,10 +28,15 @@ const AddNewDialog = (props: AddNewDialogProps) => { return ( <> - setOpen(true)}> + setOpen(true)} + > setOpen(false)} aria-labelledby="customized-dialog-title" open={open} @@ -46,6 +51,7 @@ const AddNewDialog = (props: AddNewDialogProps) => { Create new folder setOpen(false)} @@ -56,7 +62,9 @@ const AddNewDialog = (props: AddNewDialogProps) => { top: 8, }} > - + diff --git a/typescript/Frontend/src/components/Groups/FolderForm.tsx b/typescript/Frontend/src/components/Groups/FolderForm.tsx index fa69fcc17..e7b8485c7 100644 --- a/typescript/Frontend/src/components/Groups/FolderForm.tsx +++ b/typescript/Frontend/src/components/Groups/FolderForm.tsx @@ -53,7 +53,7 @@ const FolderForm = (props: I_CustomerFormProps) => { <>
{ handleChange={formik.handleChange} /> { {loading && } {additionalButtons && additionalButtons.map((button) => button)} - + diff --git a/typescript/Frontend/src/components/Groups/GroupTabs.tsx b/typescript/Frontend/src/components/Groups/GroupTabs.tsx index e826349d5..c002bf93c 100644 --- a/typescript/Frontend/src/components/Groups/GroupTabs.tsx +++ b/typescript/Frontend/src/components/Groups/GroupTabs.tsx @@ -30,6 +30,7 @@ const GroupTabs = () => { > {currentType === "Folder" ? ( { /> ) : ( { )} { - const [selectedParentId, setSelectedParentId] = useState( - props.parentId - ); - - const { fetchData, currentType } = useContext(GroupContext); - const { id } = useParams(); - - const handleMove = () => { - const route = - currentType === "Folder" ? "/MoveFolder" : "/MoveInstallation"; - const paramsProp = currentType === "Folder" ? "folderId" : "installationId"; - axiosConfig - .put(route, null, { - params: { [paramsProp]: id, parentId: selectedParentId }, - }) - .then((res) => { - fetchData(); - }); - }; - - return ( - - - - - - - - - - - - - - ); -}; - -export default LocationForm; diff --git a/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx b/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx index 12a2346f6..d6d3da743 100644 --- a/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx +++ b/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx @@ -30,6 +30,7 @@ const GroupTree = () => { return data.map((element) => { return ( { draggable={false} > { return (
- setOpen(true)} sx={{ mr: 1 }}> + setOpen(true)} + sx={{ mr: 1 }} + > setOpen(false)} aria-labelledby="customized-dialog-title" open={open} @@ -59,7 +64,12 @@ const MoveDialog = (props: MoveDialogProps) => { /> - Move + + Move +
diff --git a/typescript/Frontend/src/components/Groups/Tree/MoveTree.tsx b/typescript/Frontend/src/components/Groups/Tree/MoveTree.tsx index 04e6b4a34..db1c3d871 100644 --- a/typescript/Frontend/src/components/Groups/Tree/MoveTree.tsx +++ b/typescript/Frontend/src/components/Groups/Tree/MoveTree.tsx @@ -28,7 +28,8 @@ const MoveTree = (props: MoveTreeProps) => { .map((element) => { return ( diff --git a/typescript/Frontend/src/components/Installations/InstallationForm.tsx b/typescript/Frontend/src/components/Installations/InstallationForm.tsx index 8966918f1..fd3733355 100644 --- a/typescript/Frontend/src/components/Installations/InstallationForm.tsx +++ b/typescript/Frontend/src/components/Installations/InstallationForm.tsx @@ -49,7 +49,7 @@ const InstallationForm = (props: I_InstallationFormProps) => { return ( { handleChange={formik.handleChange} /> { handleChange={formik.handleChange} /> { handleChange={formik.handleChange} /> { handleChange={formik.handleChange} /> { /> {hasMoveButton && } - + diff --git a/typescript/Frontend/src/components/Installations/InstallationList.tsx b/typescript/Frontend/src/components/Installations/InstallationList.tsx index 983a492fd..2988f2849 100644 --- a/typescript/Frontend/src/components/Installations/InstallationList.tsx +++ b/typescript/Frontend/src/components/Installations/InstallationList.tsx @@ -75,15 +75,18 @@ const InstallationList = (props: InstallationListProps) => { return ( diff --git a/typescript/Frontend/src/components/Installations/InstallationTabs.tsx b/typescript/Frontend/src/components/Installations/InstallationTabs.tsx index 0e2cfaf62..1f20b0bd0 100644 --- a/typescript/Frontend/src/components/Installations/InstallationTabs.tsx +++ b/typescript/Frontend/src/components/Installations/InstallationTabs.tsx @@ -25,6 +25,7 @@ const InstallationTabs = () => { aria-label="installation tabs" > { to={routes.installation + id} /> { to={routes.alarms + id} /> { - + diff --git a/typescript/Frontend/src/components/Layout/LanguageSelect.tsx b/typescript/Frontend/src/components/Layout/LanguageSelect.tsx index ef466afb8..8f115eaf6 100644 --- a/typescript/Frontend/src/components/Layout/LanguageSelect.tsx +++ b/typescript/Frontend/src/components/Layout/LanguageSelect.tsx @@ -8,16 +8,15 @@ interface LanguageSelectProps { const LanguageSelect = (props: LanguageSelectProps) => { return ( diff --git a/typescript/Frontend/src/components/Layout/LogoutButton.tsx b/typescript/Frontend/src/components/Layout/LogoutButton.tsx index f6dac16d0..cc984704f 100644 --- a/typescript/Frontend/src/components/Layout/LogoutButton.tsx +++ b/typescript/Frontend/src/components/Layout/LogoutButton.tsx @@ -11,6 +11,7 @@ const LogoutButton = (props: LogoutButtonProps) => { return ( { axiosConfig.post("/Logout").then(() => { navigate("/"); diff --git a/typescript/Frontend/src/components/Layout/ModeButtons.tsx b/typescript/Frontend/src/components/Layout/ModeButtons.tsx index 01158b8ce..85d9ac788 100644 --- a/typescript/Frontend/src/components/Layout/ModeButtons.tsx +++ b/typescript/Frontend/src/components/Layout/ModeButtons.tsx @@ -31,6 +31,7 @@ const ModeButtons = () => { /> */} { size="small" > - + - + diff --git a/typescript/Frontend/src/components/Layout/NavigationButtons.tsx b/typescript/Frontend/src/components/Layout/NavigationButtons.tsx index e9033cc84..2e2ed032c 100644 --- a/typescript/Frontend/src/components/Layout/NavigationButtons.tsx +++ b/typescript/Frontend/src/components/Layout/NavigationButtons.tsx @@ -35,10 +35,12 @@ const NavigationButtons = () => { */} { } /> ; + id: string; } const SearchSidebar = (props: SearchSidebarProps) => { - const { listComponent: ListComponent } = props; + const { listComponent: ListComponent, id } = props; const [searchQuery, setSearchQuery] = useState(""); const intl = useIntl(); return ( <> { { - +