Split configuration and definition, only handle configurations in res…

…ource manager level Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Jun 19, 2024 · 7f7eb62 · 7f7eb62
1 parent d452aff
commit 7f7eb62
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 144 deletions.
diff --git a/packages/dashboard/src/components/appbar.tsx b/packages/dashboard/src/components/appbar.tsx
@@ -164,6 +164,7 @@ export const AppBar = React.memo(({ extraToolbarItems }: AppBarProps): React.Rea
   const location = useLocation();
   const tabValue = React.useMemo(() => locationToTabValue(location.pathname), [location]);
   const logoResourcesContext = React.useContext(ResourcesContext)?.logos;
+  const taskResourcesContext = React.useContext(ResourcesContext)?.tasks;
   const [anchorEl, setAnchorEl] = React.useState<HTMLElement | null>(null);
   const { authenticator } = React.useContext(AppConfigContext);
   const profile = React.useContext(UserProfileContext);
@@ -617,7 +618,7 @@ export const AppBar = React.memo(({ extraToolbarItems }: AppBarProps): React.Rea
       {openCreateTaskForm && (
         <CreateTaskForm
           user={username ? username : 'unknown user'}
-          supportedTasks={resourceManager?.supportedTasks}
+          tasksToDisplay={taskResourcesContext?.tasks}
           patrolWaypoints={waypointNames}
           cleaningZones={cleaningZoneNames}
           pickupZones={resourceManager?.pickupZones}

diff --git a/packages/dashboard/src/components/tasks/task-schedule.tsx b/packages/dashboard/src/components/tasks/task-schedule.tsx
@@ -69,7 +69,7 @@ const disablingCellsWithoutEvents = (
 
 export const TaskSchedule = () => {
   const rmf = React.useContext(RmfAppContext);
-  const resourceManager = React.useContext(ResourcesContext);
+  const taskResourcesContext = React.useContext(ResourcesContext)?.tasks;
   const { showAlert } = React.useContext(AppControllerContext);
   const profile = React.useContext(UserProfileContext);
 
@@ -137,7 +137,7 @@ export const TaskSchedule = () => {
       return tasks.flatMap((t: ScheduledTask) =>
         t.schedules.flatMap<ProcessedEvent>((s: ApiSchedule) => {
           const events = scheduleToEvents(params.start, params.end, s, t, getEventId, () =>
-            getScheduledTaskTitle(t, resourceManager?.supportedTasks),
+            getScheduledTaskTitle(t, taskResourcesContext?.tasks),
           );
           events.forEach((ev) => {
             eventsMap.current[Number(ev.event_id)] = t;
@@ -147,7 +147,7 @@ export const TaskSchedule = () => {
         }),
       );
     },
-    [rmf, resourceManager],
+    [rmf, taskResourcesContext],
   );
 
   const CustomCalendarEditor = ({ scheduler, value, onChange }: CustomCalendarEditorProps) => {
@@ -320,7 +320,7 @@ export const TaskSchedule = () => {
       {openCreateTaskForm && (
         <CreateTaskForm
           user={username ? username : 'unknown user'}
-          supportedTasks={resourceManager?.supportedTasks}
+          tasksToDisplay={taskResourcesContext?.tasks}
           patrolWaypoints={waypointNames}
           cleaningZones={cleaningZoneNames}
           pickupPoints={pickupPoints}

diff --git a/packages/dashboard/src/managers/resource-manager-tasks.ts b/packages/dashboard/src/managers/resource-manager-tasks.ts
@@ -1,14 +1,29 @@
-import { TaskDefinition } from 'react-components';
+import { getTaskDefinition, TaskDefinition } from 'react-components';
+
+export interface TaskResource {
+  task_definition_id: string;
+  display_name?: string;
+}
 
 export class TaskResourceManager {
-  supportedTasks: Record<string, TaskDefinition>;
+  tasks: TaskDefinition[];
 
-  constructor(supportedTasks: TaskDefinition[] | undefined) {
-    this.supportedTasks = {};
-    if (supportedTasks) {
-      for (const t of supportedTasks) {
-        this.supportedTasks[t.taskDefinitionId] = t;
+  constructor(taskResources: TaskResource[]) {
+    this.tasks = [];
+    for (const taskResource of taskResources) {
+      const definition = getTaskDefinition(taskResource.task_definition_id);
+      if (!definition) {
+        console.error(
+          `Invalid tasks configured for dashboard: [${taskResource.task_definition_id}]`,
+        );
+        continue;
       }
+
+      if (taskResource.display_name !== undefined) {
+        definition.taskDisplayName = taskResource.display_name;
+      }
+
+      this.tasks.push(definition);
     }
   }
 }
diff --git a/packages/dashboard/src/managers/resource-manager.ts b/packages/dashboard/src/managers/resource-manager.ts
@@ -2,13 +2,7 @@ import Debug from 'debug';
 import { DispenserResourceManager, RawDispenserResource } from './resource-manager-dispensers';
 import { LogoResource, LogoResourceManager } from './resource-manager-logos';
 import { RobotResource, RobotResourceManager } from './resource-manager-robots';
-import {
-  DefaultPatrolTaskDefinition,
-  DefaultDeliveryTaskDefinition,
-  DefaultComposeCleanTaskDefinition,
-  TaskDefinition,
-  DefaultCustomComposeTaskDefinition,
-} from 'react-components';
+import { TaskResource, TaskResourceManager } from './resource-manager-tasks';
 
 const debug = Debug('ResourceManager');
 const ResourceFile = 'resources/main.json';
@@ -25,7 +19,7 @@ export interface ResourceConfigurationsType {
   attributionPrefix?: string;
   cartIds?: string[];
   loggedInDisplayLevel?: string;
-  supportedTasks?: TaskDefinition[];
+  allowedTasks?: TaskResource[];
 }
 
 export default class ResourceManager {
@@ -40,7 +34,7 @@ export default class ResourceManager {
   attributionPrefix?: string;
   cartIds?: string[];
   loggedInDisplayLevel?: string;
-  supportedTasks?: TaskDefinition[];
+  tasks: TaskResourceManager;
 
   /**
    * Gets the default resource manager using the embedded resource file (aka "assets/resources/main.json").
@@ -62,6 +56,22 @@ export default class ResourceManager {
   constructor(resources: ResourceConfigurationsType) {
     this.robots = new RobotResourceManager(resources.robots || {});
     this.logos = new LogoResourceManager(resources.logos || {});
+    this.tasks = new TaskResourceManager(
+      resources.allowedTasks || [
+        {
+          task_definition_id: 'patrol',
+          display_name: 'Patrol',
+        },
+        {
+          task_definition_id: 'delivery',
+          display_name: 'Delivery',
+        },
+        {
+          task_definition_id: 'clean',
+          display_name: 'Clean',
+        },
+      ],
+    );
     if (resources.dispensers) {
       this.dispensers = new DispenserResourceManager(resources.dispensers);
     }
@@ -80,12 +90,6 @@ export default class ResourceManager {
     this.attributionPrefix = resources.attributionPrefix || 'OSRC-SG';
     this.cartIds = resources.cartIds || [];
     this.loggedInDisplayLevel = resources.loggedInDisplayLevel;
-    this.supportedTasks = resources.supportedTasks || [
-      DefaultPatrolTaskDefinition,
-      DefaultDeliveryTaskDefinition,
-      DefaultComposeCleanTaskDefinition,
-      DefaultCustomComposeTaskDefinition,
-    ];
   }
 }