Removed problematic and unsused component and test

Signed-off-by: Aaron Chong <[email protected]>
open-rmf · Jun 4, 2024 · 1edb5e9 · 1edb5e9
1 parent 1069946
commit 1edb5e9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 101 deletions.
diff --git a/packages/dashboard/src/components/tasks/task-schedule.tsx b/packages/dashboard/src/components/tasks/task-schedule.tsx
@@ -320,6 +320,7 @@ export const TaskSchedule = () => {
       {openCreateTaskForm && (
         <CreateTaskForm
           user={username ? username : 'unknown user'}
+          supportedTasks={resourceManager?.supportedTasks}
           patrolWaypoints={waypointNames}
           cleaningZones={cleaningZoneNames}
           pickupPoints={pickupPoints}

diff --git a/packages/react-components/lib/index.ts b/packages/react-components/lib/index.ts
@@ -22,7 +22,6 @@ export * from './map';
 export * from './navigation-bar';
 export * from './place';
 export * from './robots';
-export * from './simple-filter';
 export * from './simple-info';
 export * from './spotlight-accordion';
 export * from './stack-navigator';

diff --git a/packages/react-components/lib/simple-filter.spec.tsx b/packages/react-components/lib/simple-filter.spec.tsx
diff --git a/packages/react-components/lib/simple-filter.stories.tsx b/packages/react-components/lib/simple-filter.stories.tsx
diff --git a/packages/react-components/lib/simple-filter.tsx b/packages/react-components/lib/simple-filter.tsx
diff --git a/packages/react-components/lib/tasks/types/utils.ts b/packages/react-components/lib/tasks/types/utils.ts
@@ -55,17 +55,6 @@ function rawStringFromJsonRequest(taskRequest: TaskRequest): string | undefined
   }
 }
 
-export const TaskDefinitionMap: Record<string, TaskDefinition> = {
-  [DefaultComposeCleanTaskDefinition.taskDefinitionId]: DefaultComposeCleanTaskDefinition,
-  [DefaultDeliveryPickupTaskDefinition.taskDefinitionId]: DefaultDeliveryPickupTaskDefinition,
-  [DefaultDeliverySequentialLotPickupTaskDefinition.taskDefinitionId]:
-    DefaultDeliverySequentialLotPickupTaskDefinition,
-  [DefaultDeliveryAreaPickupTaskDefinition.taskDefinitionId]:
-    DefaultDeliveryAreaPickupTaskDefinition,
-  [DefaultDeliveryTaskDefinition.taskDefinitionId]: DefaultDeliveryTaskDefinition,
-  [DefaultPatrolTaskDefinition.taskDefinitionId]: DefaultPatrolTaskDefinition,
-};
-
 export function getShortDescription(
   taskRequest: TaskRequest,
   taskDisplayName?: string,
@@ -118,8 +107,21 @@ export function getDefaultTaskDescription(
 }
 
 export function getTaskRequestCategory(taskDefinitionId: string): string | undefined {
-  if (taskDefinitionId in TaskDefinitionMap) {
-    return TaskDefinitionMap[taskDefinitionId].requestCategory;
+  switch (taskDefinitionId) {
+    case DefaultComposeCleanTaskDefinition.taskDefinitionId:
+      return DefaultComposeCleanTaskDefinition.requestCategory;
+    case DefaultDeliveryPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryPickupTaskDefinition.requestCategory;
+    case DefaultDeliverySequentialLotPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliverySequentialLotPickupTaskDefinition.requestCategory;
+    case DefaultDeliveryAreaPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryAreaPickupTaskDefinition.requestCategory;
+    case DefaultDeliveryTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryTaskDefinition.requestCategory;
+    case DefaultPatrolTaskDefinition.taskDefinitionId:
+      return DefaultPatrolTaskDefinition.requestCategory;
+    case DefaultCustomComposeTaskDefinition.taskDefinitionId:
+      return DefaultCustomComposeTaskDefinition.requestCategory;
   }
   return undefined;
 }