From 556885f682760669d7ad904ff6a6a5dda1d8e25c Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Sun, 6 Jun 2021 14:08:39 -0600 Subject: [PATCH] ui(admin): uncomment delete buttons --- .../admin/locations/LocationEditContainer.tsx | 12 +++++++----- .../components/admin/mounts/MountEditContainer.tsx | 12 ++++++++---- .../components/admin/nests/NestEditContainer.tsx | 12 ++++++++---- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/resources/scripts/components/admin/locations/LocationEditContainer.tsx b/resources/scripts/components/admin/locations/LocationEditContainer.tsx index 76cf5c622..98eeb061a 100644 --- a/resources/scripts/components/admin/locations/LocationEditContainer.tsx +++ b/resources/scripts/components/admin/locations/LocationEditContainer.tsx @@ -1,4 +1,5 @@ import React, { useEffect, useState } from 'react'; +import { useHistory } from 'react-router'; import tw from 'twin.macro'; import { useRouteMatch } from 'react-router-dom'; import { action, Action, Actions, createContextStore, useStoreActions } from 'easy-peasy'; @@ -15,6 +16,7 @@ import Field from '@/components/elements/Field'; import SpinnerOverlay from '@/components/elements/SpinnerOverlay'; import { Form, Formik, FormikHelpers } from 'formik'; import updateLocation from '@/api/admin/locations/updateLocation'; +import LocationDeleteButton from '@/components/admin/locations/LocationDeleteButton'; interface ctx { location: Location | undefined; @@ -35,7 +37,7 @@ interface Values { } const EditInformationContainer = () => { - // const history = useHistory(); + const history = useHistory(); const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions) => actions.flashes); @@ -99,10 +101,10 @@ const EditInformationContainer = () => {
- {/* history.push('/admin/locations')} */} - {/* /> */} + history.push('/admin/locations')} + />
diff --git a/resources/scripts/components/admin/mounts/MountEditContainer.tsx b/resources/scripts/components/admin/mounts/MountEditContainer.tsx index 07deaf83a..9c3a04800 100644 --- a/resources/scripts/components/admin/mounts/MountEditContainer.tsx +++ b/resources/scripts/components/admin/mounts/MountEditContainer.tsx @@ -1,4 +1,5 @@ import React, { useEffect, useState } from 'react'; +import { useHistory } from 'react-router'; import tw from 'twin.macro'; import { useRouteMatch } from 'react-router-dom'; import { action, Action, Actions, createContextStore, useStoreActions } from 'easy-peasy'; @@ -16,6 +17,7 @@ import Field from '@/components/elements/Field'; import SpinnerOverlay from '@/components/elements/SpinnerOverlay'; import { Field as FormikField, Form, Formik, FormikHelpers } from 'formik'; import Label from '@/components/elements/Label'; +import MountDeleteButton from '@/components/admin/mounts/MountDeleteButton'; interface ctx { mount: Mount | undefined; @@ -40,6 +42,8 @@ interface Values { } const EditInformationContainer = () => { + const history = useHistory(); + const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions) => actions.flashes); const mount = Context.useStoreState(state => state.mount); @@ -181,10 +185,10 @@ const EditInformationContainer = () => {
- {/* history.push('/admin/mounts')} */} - {/* /> */} + history.push('/admin/mounts')} + />
diff --git a/resources/scripts/components/admin/nests/NestEditContainer.tsx b/resources/scripts/components/admin/nests/NestEditContainer.tsx index 5eddeae4d..41db82b6e 100644 --- a/resources/scripts/components/admin/nests/NestEditContainer.tsx +++ b/resources/scripts/components/admin/nests/NestEditContainer.tsx @@ -1,4 +1,5 @@ import React, { useEffect, useState } from 'react'; +import { useHistory } from 'react-router'; import { NavLink, useRouteMatch } from 'react-router-dom'; import tw from 'twin.macro'; import AdminContentBlock from '@/components/admin/AdminContentBlock'; @@ -20,6 +21,7 @@ import AdminTable, { ContentWrapper, NoItems, TableBody, TableHead, TableHeader, import CopyOnClick from '@/components/elements/CopyOnClick'; import Input from '@/components/elements/Input'; import Label from '@/components/elements/Label'; +import NestDeleteButton from '@/components/admin/nests/NestDeleteButton'; interface ctx { nest: Nest | undefined; @@ -60,6 +62,8 @@ interface Values { } const EditInformationContainer = () => { + const history = useHistory(); + const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions) => actions.flashes); const nest = Context.useStoreState(state => state.nest); @@ -122,10 +126,10 @@ const EditInformationContainer = () => {
- {/* history.push('/admin/nests')} */} - {/* /> */} + history.push('/admin/nests')} + />