diff --git a/Dashboard/src/Pages/Dashboards/View/Settings.tsx b/Dashboard/src/Pages/Dashboards/View/Settings.tsx index 745764629d..b891cbd292 100644 --- a/Dashboard/src/Pages/Dashboards/View/Settings.tsx +++ b/Dashboard/src/Pages/Dashboards/View/Settings.tsx @@ -1,12 +1,13 @@ import PageMap from "../../../Utils/PageMap"; -import RouteMap from "../../../Utils/RouteMap"; +import RouteMap, { RouteUtil } from "../../../Utils/RouteMap"; import PageComponentProps from "../../PageComponentProps"; import Route from "Common/Types/API/Route"; import ObjectID from "Common/Types/ObjectID"; -import ModelDelete from "Common/UI/Components/ModelDelete/ModelDelete"; import Navigation from "Common/UI/Utils/Navigation"; import Dashboard from "Common/Models/DatabaseModels/Dashboard"; import React, { Fragment, FunctionComponent, ReactElement } from "react"; +import DuplicateModel from "Common/UI/Components/DuplicateModel/DuplicateModel"; +import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType"; const DashboardDelete: FunctionComponent< PageComponentProps @@ -15,13 +16,34 @@ const DashboardDelete: FunctionComponent< return ( - { - Navigation.navigate(RouteMap[PageMap.DASHBOARDS] as Route); - }} - /> +
+ +
); }; diff --git a/Dashboard/src/Pages/Dashboards/View/SideMenu.tsx b/Dashboard/src/Pages/Dashboards/View/SideMenu.tsx index eb9c02e070..a50b1415d3 100644 --- a/Dashboard/src/Pages/Dashboards/View/SideMenu.tsx +++ b/Dashboard/src/Pages/Dashboards/View/SideMenu.tsx @@ -42,7 +42,7 @@ const DashboardSideMenu: FunctionComponent = ( -