WIP - Consolidating Admin and Team task managers

boomerang-io · Jul 10, 2023 · 74ab729 · 74ab729
1 parent 4cb66f7
commit 74ab729
Show file tree

Hide file tree

Showing 30 changed files with 7 additions and 10 deletions.
diff --git a/src/Config/appConfig.ts b/src/Config/appConfig.ts
@@ -79,7 +79,7 @@ export const AppPath: Record<AppPathKey, string> = {
 
   //Manage
   ManageTaskTemplates: `/:teamId/task-templates`,
-  ManageTaskTemplateDetail: `/:teamId/task-templates/:name/:version/detail`,
+  ManageTaskTemplateDetail: `/:teamId/task-templates/:name/:version`,
   ManageTaskTemplateEditor: `/:teamId/task-templates/:name/:version/editor`,
   ManageTeamTokens: "/:teamId/tokens",
   ManageTeamProperties: `/:teamId/parameters`,
@@ -95,7 +95,7 @@ export const AppPath: Record<AppPathKey, string> = {
   Settings: "/admin/settings",
   TemplateWorkflows: "/admin/template-workflows",
   TaskTemplates: "/admin/task-templates",
-  TaskTemplateDetail: `/admin/task-templates/:name/:version/detail`,
+  TaskTemplateDetail: `/admin/task-templates/:name/:version`,
   TaskTemplateEditor: `/admin/task-templates/:name/:version/editor`,
   TeamList: "/admin/teams",
   Tokens: "/admin/tokens",
@@ -164,7 +164,7 @@ export const appLink = {
   settings: () => "/admin/settings",
   templateWorkflows: () => "/admin/template-workflows",
   taskTemplates: () => "/admin/task-templates",
-  taskTemplateDetail: ({ name, version }: AdminTaskTemplateArgs) => `/admin/task-templates/${name}/${version}/detail`,
+  taskTemplateDetail: ({ name, version }: AdminTaskTemplateArgs) => `/admin/task-templates/${name}/${version}`,
   taskTemplateEditor: ({ name, version }: AdminTaskTemplateArgs) => `/admin/task-templates/${name}/${version}/editor`,
   teamList: () => "/admin/teams",
   tokens: () => `/admin/tokens`,

diff --git a/src/Features/App/App.tsx b/src/Features/App/App.tsx
@@ -41,8 +41,8 @@ const Teams = lazy(() => import("Features/Teams"));
 const ManageTeam = lazy(() => import("Features/TeamDetailed"));
 const TeamProperties = lazy(() => import("Features/TeamProperties"));
 const TeamTokens = lazy(() => import("Features/TeamTokens"));
-const TeamTasks = lazy(() => import("Features/TeamTasks"));
-const AdminTasks = lazy(() => import("Features/TeamTasks/AdminTasks"));
+const TeamTasks = lazy(() => import("Features/TaskManager/TeamTasks"));
+const AdminTasks = lazy(() => import("Features/TaskManager/AdminTasks"));
 // const TaskTemplatesContainer = lazy(() => import("Features/ManageTeamTasks"));
 const Users = lazy(() => import("Features/Users"));
 const Workflows = lazy(() => import("Features/Workflows"));

diff --git a/...tures/TeamTasks/AdminTasks/AdminTasks.tsx → ...res/TaskManager/AdminTasks/AdminTasks.tsx b/...tures/TeamTasks/AdminTasks/AdminTasks.tsx → ...res/TaskManager/AdminTasks/AdminTasks.tsx
@@ -17,7 +17,7 @@ import { AppPath, appLink, FeatureFlag } from "Config/appConfig";
 import { serviceUrl } from "Config/servicesConfig";
 import styles from "../TaskManager.module.scss";
 
-const HELMUT_TITLE = "Global Task Manager";
+const HELMUT_TITLE = "Task Manager";
 
 function TaskTemplatesContainer() {
   const match = useRouteMatch();

diff --git a/src/Features/TeamTasks/AdminTasks/index.tsx → ...Features/TaskManager/AdminTasks/index.tsx b/src/Features/TeamTasks/AdminTasks/index.tsx → ...Features/TaskManager/AdminTasks/index.tsx
diff --git a/src/Features/TeamTasks/Header/Header.tsx → src/Features/TaskManager/Header/Header.tsx b/src/Features/TeamTasks/Header/Header.tsx → src/Features/TaskManager/Header/Header.tsx
diff --git a/...rsionSwitcher/VersionSwitcher.module.scss → ...rsionSwitcher/VersionSwitcher.module.scss b/...rsionSwitcher/VersionSwitcher.module.scss → ...rsionSwitcher/VersionSwitcher.module.scss
diff --git a/...eader/VersionSwitcher/VersionSwitcher.tsx → ...eader/VersionSwitcher/VersionSwitcher.tsx b/...eader/VersionSwitcher/VersionSwitcher.tsx → ...eader/VersionSwitcher/VersionSwitcher.tsx
diff --git a/...eamTasks/Header/VersionSwitcher/index.tsx → ...kManager/Header/VersionSwitcher/index.tsx b/...eamTasks/Header/VersionSwitcher/index.tsx → ...kManager/Header/VersionSwitcher/index.tsx
diff --git a/...tures/TeamTasks/Header/header.module.scss → ...res/TaskManager/Header/header.module.scss b/...tures/TeamTasks/Header/header.module.scss → ...res/TaskManager/Header/header.module.scss
diff --git a/src/Features/TeamTasks/Header/index.tsx → src/Features/TaskManager/Header/index.tsx b/src/Features/TeamTasks/Header/index.tsx → src/Features/TaskManager/Header/index.tsx
diff --git a/...denav/AddTaskTemplate/AddTaskTemplate.tsx → ...denav/AddTaskTemplate/AddTaskTemplate.tsx b/...denav/AddTaskTemplate/AddTaskTemplate.tsx → ...denav/AddTaskTemplate/AddTaskTemplate.tsx
diff --git a/...dTaskTemplateForm/AddTaskTemplateForm.tsx → ...dTaskTemplateForm/AddTaskTemplateForm.tsx b/...dTaskTemplateForm/AddTaskTemplateForm.tsx → ...dTaskTemplateForm/AddTaskTemplateForm.tsx
diff --git a/...plateForm/addTaskTemplateForm.module.scss → ...plateForm/addTaskTemplateForm.module.scss b/...plateForm/addTaskTemplateForm.module.scss → ...plateForm/addTaskTemplateForm.module.scss
diff --git a/...emplate/AddTaskTemplateForm/constants.tsx → ...emplate/AddTaskTemplateForm/constants.tsx b/...emplate/AddTaskTemplateForm/constants.tsx → ...emplate/AddTaskTemplateForm/constants.tsx
diff --git a/...askTemplate/AddTaskTemplateForm/index.tsx → ...askTemplate/AddTaskTemplateForm/index.tsx b/...askTemplate/AddTaskTemplateForm/index.tsx → ...askTemplate/AddTaskTemplateForm/index.tsx
diff --git a/...dTaskTemplate/addTaskTemplate.module.scss → ...dTaskTemplate/addTaskTemplate.module.scss b/...dTaskTemplate/addTaskTemplate.module.scss → ...dTaskTemplate/addTaskTemplate.module.scss
diff --git a/...amTasks/Sidenav/AddTaskTemplate/index.tsx → ...Manager/Sidenav/AddTaskTemplate/index.tsx b/...amTasks/Sidenav/AddTaskTemplate/index.tsx → ...Manager/Sidenav/AddTaskTemplate/index.tsx
diff --git a/src/Features/TeamTasks/Sidenav/Sidenav.tsx → src/Features/TaskManager/Sidenav/Sidenav.tsx b/src/Features/TeamTasks/Sidenav/Sidenav.tsx → src/Features/TaskManager/Sidenav/Sidenav.tsx
diff --git a/src/Features/TeamTasks/Sidenav/index.tsx → src/Features/TaskManager/Sidenav/index.tsx b/src/Features/TeamTasks/Sidenav/index.tsx → src/Features/TaskManager/Sidenav/index.tsx
diff --git a/...es/TeamTasks/Sidenav/sideInfo.module.scss → .../TaskManager/Sidenav/sideInfo.module.scss b/...es/TeamTasks/Sidenav/sideInfo.module.scss → .../TaskManager/Sidenav/sideInfo.module.scss
diff --git a/...eatures/TeamTasks/TaskManager.module.scss → ...tures/TaskManager/TaskManager.module.scss b/...eatures/TeamTasks/TaskManager.module.scss → ...tures/TaskManager/TaskManager.module.scss
diff --git a/...lateEditor/TaskTemplateEditor.module.scss → ...lateEditor/TaskTemplateEditor.module.scss b/...lateEditor/TaskTemplateEditor.module.scss → ...lateEditor/TaskTemplateEditor.module.scss
diff --git a/...TaskTemplateEditor/TaskTemplateEditor.tsx → ...TaskTemplateEditor/TaskTemplateEditor.tsx b/...TaskTemplateEditor/TaskTemplateEditor.tsx → ...TaskTemplateEditor/TaskTemplateEditor.tsx
@@ -1,7 +1,6 @@
 //@ts-nocheck
 import React, { useState } from "react";
 import cx from "classnames";
-import queryString from "query-string";
 import { useQuery } from "Hooks";
 import { Helmet } from "react-helmet";
 import { Formik } from "formik";

diff --git a/...es/TeamTasks/TaskTemplateEditor/index.tsx → .../TaskManager/TaskTemplateEditor/index.tsx b/...es/TeamTasks/TaskTemplateEditor/index.tsx → .../TaskManager/TaskTemplateEditor/index.tsx
diff --git a/...Overview/taskTemplateOverview.module.scss → ...Overview/TaskTemplateOverview.module.scss b/...Overview/taskTemplateOverview.module.scss → ...Overview/TaskTemplateOverview.module.scss
diff --git a/...TemplateOverview/TaskTemplateOverview.tsx → ...TemplateOverview/TaskTemplateOverview.tsx b/...TemplateOverview/TaskTemplateOverview.tsx → ...TemplateOverview/TaskTemplateOverview.tsx
@@ -215,7 +215,6 @@ export function TaskTemplateOverview({
   const [isSaving, setIsSaving] = React.useState(false);
   const cancelRequestRef = React.useRef();
   const queryClient = useQueryClient();
-
   const params = useParams();
   const history = useHistory();
 

diff --git a/.../TeamTasks/TaskTemplateOverview/index.tsx → ...askManager/TaskTemplateOverview/index.tsx b/.../TeamTasks/TaskTemplateOverview/index.tsx → ...askManager/TaskTemplateOverview/index.tsx
diff --git a/...eatures/TeamTasks/TeamTasks/TeamTasks.tsx → ...tures/TaskManager/TeamTasks/TeamTasks.tsx b/...eatures/TeamTasks/TeamTasks/TeamTasks.tsx → ...tures/TaskManager/TeamTasks/TeamTasks.tsx
@@ -25,7 +25,6 @@ function TaskTemplatesContainer() {
   const { activeTeam } = useAppContext();
   const history = useHistory();
   const match = useRouteMatch();
-  const queryClient = useQueryClient();
   const editVerifiedTasksEnabled = useFeature(FeatureFlag.EditVerifiedTasksEnabled);
   const getTaskTemplatesUrl = activeTeam
     ? serviceUrl.getTaskTemplates({
@@ -117,7 +116,7 @@ function TaskTemplatesContainer() {
             getTaskTemplatesUrl={getTaskTemplatesUrl}
           />
         </Route>
-        <Redirect to={appLink.manageTaskTemplates({ teamId: activeTeam?.id })} />
+        <Redirect to={appLink.manageTaskTemplates({ teamId: activeTeam.id })} />
       </Switch>
     </div>
   );

diff --git a/src/Features/TeamTasks/TeamTasks/index.tsx → src/Features/TaskManager/TeamTasks/index.tsx b/src/Features/TeamTasks/TeamTasks/index.tsx → src/Features/TaskManager/TeamTasks/index.tsx
diff --git a/src/Features/TeamTasks/constants.tsx → src/Features/TaskManager/constants.tsx b/src/Features/TeamTasks/constants.tsx → src/Features/TaskManager/constants.tsx