+
-
+
);
}
diff --git a/packages/dashboard/src/components/admin/manage-roles-dialog.test.tsx b/packages/dashboard/src/components/admin/manage-roles-dialog.test.tsx
index c99567e81..ded944bc6 100644
--- a/packages/dashboard/src/components/admin/manage-roles-dialog.test.tsx
+++ b/packages/dashboard/src/components/admin/manage-roles-dialog.test.tsx
@@ -1,9 +1,14 @@
-import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import { render as render_, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it, vi } from 'vitest';
+import { AppControllerProvider } from '../../hooks/use-app-controller';
+import { makeMockAppController } from '../../utils/test-utils.test';
import { ManageRolesCard, ManageRolesDialog } from './manage-roles-dialog';
+const render = (ui: React.ReactNode) =>
+ render_({ui} );
+
describe('ManageRolesCard', () => {
it('shows dialog when add/remove is clicked', async () => {
const root = render(
diff --git a/packages/dashboard/src/components/admin/manage-roles-dialog.tsx b/packages/dashboard/src/components/admin/manage-roles-dialog.tsx
index 6de457a5b..984b4e0f5 100644
--- a/packages/dashboard/src/components/admin/manage-roles-dialog.tsx
+++ b/packages/dashboard/src/components/admin/manage-roles-dialog.tsx
@@ -18,7 +18,7 @@ import {
import React from 'react';
import { Loading, TransferList, useAsync } from 'react-components';
-import { AppControllerContext } from '../app-contexts';
+import { useAppController } from '../../hooks/use-app-controller';
const prefix = 'manage-roles-dialog';
const classes = {
@@ -63,7 +63,7 @@ export function ManageRolesDialog({
const [assignedRoles, setAssignedRoles] = React.useState([]);
const [loading, setLoading] = React.useState(false);
const [saving, setSaving] = React.useState(false);
- const { showAlert } = React.useContext(AppControllerContext);
+ const { showAlert } = useAppController();
React.useEffect(() => {
if (!open || !getAllRoles) return;
diff --git a/packages/dashboard/src/components/admin/permissions-card.test.tsx b/packages/dashboard/src/components/admin/permissions-card.test.tsx
index af1b32e67..6bd4ccc5f 100644
--- a/packages/dashboard/src/components/admin/permissions-card.test.tsx
+++ b/packages/dashboard/src/components/admin/permissions-card.test.tsx
@@ -1,10 +1,15 @@
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, render as render_, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { AppControllerProvider } from '../../hooks/use-app-controller';
import { getActionText, RmfAction } from '../../services/permissions';
+import { makeMockAppController } from '../../utils/test-utils.test';
import { PermissionsCard } from './permissions-card';
+const render = (ui: React.ReactNode) =>
+ render_({ui} );
+
// TODO(AA): To remove after
// https://github.com/testing-library/react-testing-library/issues/1216
// has been resolved.
diff --git a/packages/dashboard/src/components/admin/permissions-card.tsx b/packages/dashboard/src/components/admin/permissions-card.tsx
index c6265007b..a996143ba 100644
--- a/packages/dashboard/src/components/admin/permissions-card.tsx
+++ b/packages/dashboard/src/components/admin/permissions-card.tsx
@@ -19,8 +19,8 @@ import { Permission } from 'api-client';
import React from 'react';
import { Loading, useAsync } from 'react-components';
+import { useAppController } from '../../hooks/use-app-controller';
import { getActionText } from '../../services/permissions';
-import { AppControllerContext } from '../app-contexts';
import { AddPermissionDialog, AddPermissionDialogProps } from './add-permission-dialog';
const prefix = 'permissions-card';
@@ -60,7 +60,7 @@ export function PermissionsCard({
const [loading, setLoading] = React.useState(false);
const [permissions, setPermissions] = React.useState([]);
const [openDialog, setOpenDialog] = React.useState(false);
- const { showAlert } = React.useContext(AppControllerContext);
+ const { showAlert } = useAppController();
const refresh = React.useCallback(async () => {
if (!getPermissions) return;
diff --git a/packages/dashboard/src/components/admin/role-list-card.test.tsx b/packages/dashboard/src/components/admin/role-list-card.test.tsx
index 90099709b..5dd417803 100644
--- a/packages/dashboard/src/components/admin/role-list-card.test.tsx
+++ b/packages/dashboard/src/components/admin/role-list-card.test.tsx
@@ -1,9 +1,14 @@
-import { render, waitFor } from '@testing-library/react';
+import { render as render_, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it } from 'vitest';
+import { AppControllerProvider } from '../../hooks/use-app-controller';
+import { makeMockAppController } from '../../utils/test-utils.test';
import { RoleListCard } from './role-list-card';
+const render = (ui: React.ReactNode) =>
+ render_({ui} );
+
describe('Role List', () => {
it('renders list of roles', async () => {
const root = render( ['role1', 'role2']} />);
diff --git a/packages/dashboard/src/components/admin/role-list-card.tsx b/packages/dashboard/src/components/admin/role-list-card.tsx
index 25e66fa0a..21a282082 100644
--- a/packages/dashboard/src/components/admin/role-list-card.tsx
+++ b/packages/dashboard/src/components/admin/role-list-card.tsx
@@ -20,7 +20,7 @@ import { Permission } from 'api-client';
import React from 'react';
import { ConfirmationDialog, Loading, useAsync } from 'react-components';
-import { AppControllerContext } from '../app-contexts';
+import { useAppController } from '../../hooks/use-app-controller';
import { CreateRoleDialog, CreateRoleDialogProps } from './create-role-dialog';
import { PermissionsCard, PermissionsCardProps } from './permissions-card';
@@ -105,7 +105,7 @@ export function RoleListCard({
const [openDialog, setOpenDialog] = React.useState(false);
const [selectedDeleteRole, setSelectedDeleteRole] = React.useState(null);
const [deleting, setDeleting] = React.useState(false);
- const { showAlert } = React.useContext(AppControllerContext);
+ const { showAlert } = useAppController();
const refresh = React.useCallback(async () => {
if (!getRoles) return;
diff --git a/packages/dashboard/src/components/admin/role-list-page.tsx b/packages/dashboard/src/components/admin/role-list-page.tsx
index 3334090c8..b4ba154ac 100644
--- a/packages/dashboard/src/components/admin/role-list-page.tsx
+++ b/packages/dashboard/src/components/admin/role-list-page.tsx
@@ -1,13 +1,11 @@
-import React from 'react';
-
+import { useRmfApi } from '../../hooks/use-rmf-api';
import { getApiErrorMessage } from '../../utils/api';
-import { RmfAppContext } from '../rmf-app';
import { adminPageClasses, AdminPageContainer } from './page-css';
import { RoleListCard } from './role-list-card';
export function RoleListPage(): JSX.Element | null {
- const rmfIngress = React.useContext(RmfAppContext);
- const adminApi = rmfIngress?.adminApi;
+ const rmfApi = useRmfApi();
+ const adminApi = rmfApi.adminApi;
if (!adminApi) return null;
diff --git a/packages/dashboard/src/components/admin/router.tsx b/packages/dashboard/src/components/admin/router.tsx
index f749f3242..8bfb538f8 100644
--- a/packages/dashboard/src/components/admin/router.tsx
+++ b/packages/dashboard/src/components/admin/router.tsx
@@ -1,22 +1,14 @@
-import { Navigate, Outlet, Route, Routes } from 'react-router-dom';
+import { Route } from 'react-router-dom';
import { AdminDrawer } from './drawer';
import { RoleListPage } from './role-list-page';
import { UserListPage } from './user-list-page';
import { UserProfilePage } from './user-profile-page';
-export function AdminRouter(): JSX.Element {
- return (
- <>
-
-
- {ui} );
+
describe('UserListCard', () => {
it('opens delete dialog when button is clicked', async () => {
const root = render(
diff --git a/packages/dashboard/src/components/admin/user-list-card.tsx b/packages/dashboard/src/components/admin/user-list-card.tsx
index cf18b62bc..bca044b52 100644
--- a/packages/dashboard/src/components/admin/user-list-card.tsx
+++ b/packages/dashboard/src/components/admin/user-list-card.tsx
@@ -24,7 +24,7 @@ import React from 'react';
import { ConfirmationDialog, Loading, useAsync } from 'react-components';
import { useNavigate } from 'react-router';
-import { AppControllerContext } from '../app-contexts';
+import { useAppController } from '../../hooks/use-app-controller';
import { CreateUserDialog, CreateUserDialogProps } from './create-user-dialog';
const ItemsPerPage = 20;
@@ -69,7 +69,7 @@ export function UserListCard({
const [openDeleteDialog, setOpenDeleteDialog] = React.useState(false);
const [deleting, setDeleting] = React.useState(false);
const [openCreateDialog, setOpenCreateDialog] = React.useState(false);
- const { showAlert } = React.useContext(AppControllerContext);
+ const { showAlert } = useAppController();
const refresh = React.useCallback(async () => {
if (!searchUsers) return;
@@ -159,7 +159,6 @@ export function UserListCard({
{users.length === 0 && searching && }
(undefined);
const [notFound, setNotFound] = React.useState(false);
diff --git a/packages/dashboard/src/components/admin/user-profile.test.tsx b/packages/dashboard/src/components/admin/user-profile.test.tsx
index 9c4a5919e..2c6e4ef1b 100644
--- a/packages/dashboard/src/components/admin/user-profile.test.tsx
+++ b/packages/dashboard/src/components/admin/user-profile.test.tsx
@@ -1,9 +1,15 @@
-import { render, waitFor } from '@testing-library/react';
+import { render as render_, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import React from 'react';
import { describe, expect, it, vi } from 'vitest';
+import { AppControllerProvider } from '../../hooks/use-app-controller';
+import { makeMockAppController } from '../../utils/test-utils.test';
import { UserProfileCard } from './user-profile';
+const render = (ui: React.ReactNode) =>
+ render_({ui} );
+
describe('UserProfileCard', () => {
it('renders username', () => {
const root = render(
diff --git a/packages/dashboard/src/components/admin/user-profile.tsx b/packages/dashboard/src/components/admin/user-profile.tsx
index 8d5dba9df..510788884 100644
--- a/packages/dashboard/src/components/admin/user-profile.tsx
+++ b/packages/dashboard/src/components/admin/user-profile.tsx
@@ -15,7 +15,7 @@ import { User } from 'api-client';
import React from 'react';
import { useAsync } from 'react-components';
-import { AppControllerContext } from '../app-contexts';
+import { useAppController } from '../../hooks/use-app-controller';
const classes = {
avatar: 'user-profile-action',
@@ -36,7 +36,7 @@ export function UserProfileCard({ user, makeAdmin }: UserProfileCardProps): JSX.
const safeAsync = useAsync();
const [anchorEl, setAnchorEl] = React.useState(null);
const [disableAdminCheckbox, setDisableAdminCheckbox] = React.useState(false);
- const { showAlert } = React.useContext(AppControllerContext);
+ const { showAlert } = useAppController();
return (
@@ -46,7 +46,10 @@ export function UserProfileCard({ user, makeAdmin }: UserProfileCardProps): JSX.
subheader={user.is_admin ? 'Admin' : 'User'}
avatar={ setAnchorEl(ev.currentTarget)} aria-label="more actions">
+ setAnchorEl(ev.currentTarget as HTMLElement)}
+ aria-label="more actions"
+ >
}
diff --git a/packages/dashboard/src/components/alert-manager.tsx b/packages/dashboard/src/components/alert-manager.tsx
index 1a37c09e8..a6b930890 100644
--- a/packages/dashboard/src/components/alert-manager.tsx
+++ b/packages/dashboard/src/components/alert-manager.tsx
@@ -20,10 +20,9 @@ import React from 'react';
import { base } from 'react-components';
import { Subscription } from 'rxjs';
-import { AppConfigContext } from '../app-config';
-import { AppControllerContext } from './app-contexts';
+import { useAppController } from '../hooks/use-app-controller';
+import { useRmfApi } from '../hooks/use-rmf-api';
import { AppEvents } from './app-events';
-import { RmfAppContext } from './rmf-app';
import { TaskCancelButton } from './tasks/task-cancellation';
interface AlertDialogProps {
@@ -34,19 +33,15 @@ interface AlertDialogProps {
const AlertDialog = React.memo((props: AlertDialogProps) => {
const { alertRequest, onDismiss } = props;
const [isOpen, setIsOpen] = React.useState(true);
- const { showAlert } = React.useContext(AppControllerContext);
- const rmf = React.useContext(RmfAppContext);
+ const { showAlert } = useAppController();
+ const rmfApi = useRmfApi();
const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
const [additionalAlertMessage, setAdditionalAlertMessage] = React.useState(null);
const respondToAlert = async (alert_id: string, response: string) => {
- if (!rmf) {
- return;
- }
-
try {
const resp = (
- await rmf.alertsApi.respondToAlertAlertsRequestAlertIdRespondPost(alert_id, response)
+ await rmfApi.alertsApi.respondToAlertAlertsRequestAlertIdRespondPost(alert_id, response)
).data;
console.log(
`Alert [${alertRequest.id}]: responded with [${resp.response}] at ${resp.unix_millis_response_time}`,
@@ -90,9 +85,6 @@ const AlertDialog = React.memo((props: AlertDialogProps) => {
if (alertRequest.tier === ApiServerModelsAlertsAlertRequestTier.Info || !alertRequest.task_id) {
return;
}
- if (!rmf) {
- return;
- }
(async () => {
if (!alertRequest.task_id) {
@@ -102,7 +94,7 @@ const AlertDialog = React.memo((props: AlertDialogProps) => {
let logs: TaskEventLog | null = null;
try {
logs = (
- await rmf.tasksApi.getTaskLogTasksTaskIdLogGet(
+ await rmfApi.tasksApi.getTaskLogTasksTaskIdLogGet(
alertRequest.task_id,
`0,${Number.MAX_SAFE_INTEGER}`,
)
@@ -124,7 +116,7 @@ const AlertDialog = React.memo((props: AlertDialogProps) => {
setAdditionalAlertMessage(consolidatedErrorMessages);
}
})();
- }, [rmf, alertRequest.id, alertRequest.task_id, alertRequest.tier]);
+ }, [rmfApi, alertRequest.id, alertRequest.task_id, alertRequest.tier]);
const theme = useTheme();
@@ -254,25 +246,20 @@ const AlertDialog = React.memo((props: AlertDialogProps) => {
);
});
-export const AlertManager = React.memo(() => {
- const rmf = React.useContext(RmfAppContext);
+export interface AlertManagerProps {
+ alertAudioPath?: string;
+}
+
+export const AlertManager = React.memo(({ alertAudioPath }: AlertManagerProps) => {
+ const rmfApi = useRmfApi();
const [openAlerts, setOpenAlerts] = React.useState>({});
- const appConfig = React.useContext(AppConfigContext);
const alertAudio: HTMLAudioElement | undefined = React.useMemo(
- () => (appConfig.alertAudioPath ? new Audio(appConfig.alertAudioPath) : undefined),
- [appConfig.alertAudioPath],
+ () => (alertAudioPath ? new Audio(alertAudioPath) : undefined),
+ [alertAudioPath],
);
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
const pushAlertsToBeDisplayed = async (alertRequest: AlertRequest) => {
- if (!rmf) {
- console.error('Alerts API not available');
- return;
- }
if (!alertRequest.display) {
setOpenAlerts((prev) => {
const filteredAlerts = Object.fromEntries(
@@ -285,7 +272,7 @@ export const AlertManager = React.memo(() => {
try {
const resp = (
- await rmf.alertsApi.getAlertResponseAlertsRequestAlertIdResponseGet(alertRequest.id)
+ await rmfApi.alertsApi.getAlertResponseAlertsRequestAlertIdResponseGet(alertRequest.id)
).data;
console.log(
`Alert [${alertRequest.id}]: was responded with [${resp.response}] at ${resp.unix_millis_response_time}`,
@@ -312,7 +299,7 @@ export const AlertManager = React.memo(() => {
const subs: Subscription[] = [];
subs.push(
- rmf.alertRequestsObsStore.subscribe((alertRequest) => {
+ rmfApi.alertRequestsObsStore.subscribe((alertRequest) => {
if (!alertRequest.display) {
setOpenAlerts((prev) => {
const filteredAlerts = Object.fromEntries(
@@ -327,7 +314,7 @@ export const AlertManager = React.memo(() => {
);
subs.push(
- rmf.alertResponsesObsStore.subscribe((alertResponse) => {
+ rmfApi.alertResponsesObsStore.subscribe((alertResponse) => {
setOpenAlerts((prev) => {
return Object.fromEntries(
Object.entries(prev).filter(([key]) => key !== alertResponse.id),
@@ -350,7 +337,7 @@ export const AlertManager = React.memo(() => {
sub.unsubscribe();
}
};
- }, [rmf, alertAudio]);
+ }, [rmfApi, alertAudio]);
const removeOpenAlert = (id: string) => {
const filteredAlerts = Object.fromEntries(
diff --git a/packages/dashboard/src/components/app-base.tsx b/packages/dashboard/src/components/app-base.tsx
deleted file mode 100644
index 76ff446cc..000000000
--- a/packages/dashboard/src/components/app-base.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import {
- Alert,
- AlertProps,
- Backdrop,
- CircularProgress,
- createTheme,
- CssBaseline,
- Grid,
- Snackbar,
-} from '@mui/material';
-import { ThemeProvider } from '@mui/material/styles';
-import React from 'react';
-
-import { loadSettings, saveSettings, Settings } from '../services/settings';
-import { AlertManager } from './alert-manager';
-import { AppController, AppControllerContext, SettingsContext } from './app-contexts';
-import { AppEvents } from './app-events';
-import AppBar from './appbar';
-import { DeliveryAlertStore } from './delivery-alert-store';
-
-const DefaultAlertDuration = 2000;
-const defaultTheme = createTheme({
- typography: {
- fontSize: 16,
- },
-});
-
-/**
- * Contains various components that are essential to the app and provides contexts to control them.
- * Components include:
- *
- * - Settings
- * - Alerts
- *
- * Also provides `AppControllerContext` to allow children components to control them.
- */
-export function AppBase({ children }: React.PropsWithChildren<{}>): JSX.Element | null {
- const [settings, setSettings] = React.useState(() => loadSettings());
- const [showAlert, setShowAlert] = React.useState(false);
- const [alertSeverity, setAlertSeverity] = React.useState('error');
- const [alertMessage, setAlertMessage] = React.useState('');
- const [alertDuration, setAlertDuration] = React.useState(DefaultAlertDuration);
- const [extraAppbarIcons, setExtraAppbarIcons] = React.useState(null);
- const [openLoadingBackdrop, setOpenLoadingBackdrop] = React.useState(false);
-
- const theme = React.useMemo(() => {
- switch (settings.themeMode) {
- default:
- return defaultTheme;
- }
- }, [settings.themeMode]);
-
- const updateSettings = React.useCallback((newSettings: Settings) => {
- saveSettings(newSettings);
- setSettings(newSettings);
- }, []);
-
- const appController = React.useMemo(
- () => ({
- updateSettings,
- showAlert: (severity, message, autoHideDuration) => {
- setAlertSeverity(severity);
- setAlertMessage(message);
- setShowAlert(true);
- setAlertDuration(autoHideDuration || DefaultAlertDuration);
- },
- setExtraAppbarIcons,
- }),
- [updateSettings],
- );
-
- React.useEffect(() => {
- const sub = AppEvents.loadingBackdrop.subscribe((value) => {
- setOpenLoadingBackdrop(value);
- });
- return () => sub.unsubscribe();
- }, []);
-
- return (
-
- theme.zIndex.drawer + 1 }}
- open={openLoadingBackdrop}
- >
-
- )}
-
-
-
- setShowAlert(false)}
- autoHideDuration={alertDuration}
- >
- setShowAlert(false)}
- severity={alertSeverity}
- sx={{ width: '100%' }}
- >
- {alertMessage}
-
-
-
-
-
-
- );
-}
diff --git a/packages/dashboard/src/components/app-contexts.tsx b/packages/dashboard/src/components/app-contexts.tsx
deleted file mode 100644
index c48a7df99..000000000
--- a/packages/dashboard/src/components/app-contexts.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { AlertProps } from '@mui/material';
-import React from 'react';
-
-import { defaultSettings, Settings } from '../services/settings';
-
-export const SettingsContext = React.createContext(defaultSettings());
-
-export interface AppController {
- updateSettings: (settings: Settings) => void;
- showAlert: (severity: AlertProps['severity'], message: string, autoHideDuration?: number) => void;
- setExtraAppbarIcons: (node: React.ReactNode) => void;
-}
-
-export interface Tooltips {
- showTooltips: boolean;
-}
-
-export const TooltipsContext = React.createContext({
- showTooltips: true,
-});
-
-export const AppControllerContext = React.createContext({
- updateSettings: () => {},
- showAlert: () => {},
- setExtraAppbarIcons: () => {},
-});
diff --git a/packages/dashboard/src/components/app-registry.ts b/packages/dashboard/src/components/app-registry.ts
deleted file mode 100644
index 172895efb..000000000
--- a/packages/dashboard/src/components/app-registry.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { BeaconsApp } from './beacons-app';
-import { DoorsApp } from './doors-app';
-import { LiftsApp } from './lifts-app';
-import { MapApp } from './map-app';
-import { RobotInfoApp } from './robots/robot-info-app';
-import { MutexGroupsApp } from './robots/robot-mutex-group-app';
-import { RobotsApp } from './robots/robots-app';
-import { TaskDetailsApp } from './tasks/task-details-app';
-import { TaskLogsApp } from './tasks/task-logs-app';
-import { TasksApp } from './tasks/tasks-app';
-
-export const AppRegistry = {
- Beacons: BeaconsApp,
- Doors: DoorsApp,
- Lifts: LiftsApp,
- Map: MapApp,
- 'Mutex Groups': MutexGroupsApp,
- Tasks: TasksApp,
- 'Task Details': TaskDetailsApp,
- 'Task Logs': TaskLogsApp,
- Robots: RobotsApp,
- 'Robot Info': RobotInfoApp,
-};
diff --git a/packages/dashboard/src/components/appbar.test.tsx b/packages/dashboard/src/components/appbar.test.tsx
index 6f4e546d6..ab5212a91 100644
--- a/packages/dashboard/src/components/appbar.test.tsx
+++ b/packages/dashboard/src/components/appbar.test.tsx
@@ -1,57 +1,58 @@
+import { Tab } from '@mui/material';
import { waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React from 'react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
-import { AuthenticatorContext, Resources, ResourcesContext } from '../app-config';
-import { UserProfile } from '../services/authenticator';
+import { AuthenticatorProvider } from '../hooks/use-authenticator';
+import { RmfApiProvider } from '../hooks/use-rmf-api';
+import { RmfApi } from '../services/rmf-api';
import { StubAuthenticator } from '../services/stub-authenticator';
-import { render } from '../utils/test-utils.test';
-import { AppController, AppControllerContext } from './app-contexts';
+import { MockRmfApi, render, TestProviders } from '../utils/test-utils.test';
import AppBar from './appbar';
-import { UserProfileContext } from './user-profile-provider';
-
-function makeMockAppController(): AppController {
- return {
- updateSettings: vi.fn(),
- showAlert: vi.fn(),
- setExtraAppbarIcons: vi.fn(),
- };
-}
describe('AppBar', () => {
- let appController: AppController;
const Base = (props: React.PropsWithChildren<{}>) => {
+ const rmfApi = React.useMemo(() => {
+ const mockRmfApi = new MockRmfApi();
+ // mock out some api calls so they never resolves
+ mockRmfApi.tasksApi.getFavoritesTasksFavoriteTasksGet = () => new Promise(() => {});
+ mockRmfApi.alertsApi.getUnrespondedAlertsAlertsUnrespondedRequestsGet = () =>
+ new Promise(() => {});
+ mockRmfApi.buildingApi.getPreviousFireAlarmTriggerBuildingMapPreviousFireAlarmTriggerGet =
+ () => new Promise(() => {});
+ return mockRmfApi;
+ }, []);
return (
-
- {props.children}
-
+
+ {props.children}
+
);
};
- beforeEach(() => {
- appController = makeMockAppController();
- });
-
it('renders with navigation bar', () => {
const root = render(
-
+
-
-
-
- ,
+
+
+ ,
);
userEvent.click(root.getByLabelText('user-btn'));
await expect(waitFor(() => root.getByText('Logout'))).resolves.not.toThrow();
@@ -80,19 +80,15 @@ describe('AppBar', () => {
});
it('uses headerLogo from logo resources manager', async () => {
- const resources: Resources = {
- fleets: {},
- logos: {
- header: '/test-logo.png',
- },
- };
-
const root = render(
-
- ,
+
+>((props, ref) =>
Theme
@@ -111,555 +85,494 @@ function AppSettings() {
}
export interface AppBarProps {
+ tabs: React.ReactElement>[];
+ tabValue: string;
+ themes?: DashboardThemes;
+ helpLink: string;
+ reportIssueLink: string;
extraToolbarItems?: React.ReactNode;
-
- // TODO: change the alarm status to required when we have an alarm
- // service working properly in the backend
- alarmState?: boolean | null;
}
-export const AppBar = React.memo(({ extraToolbarItems }: AppBarProps): React.ReactElement => {
- const appConfig = React.useContext(AppConfigContext);
- const authenticator = React.useContext(AuthenticatorContext);
- const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
-
- const [largerResolution, setLargerResolution] = React.useState(false);
-
- const StyledAppBarTab = styled(AppBarTab)(({ theme }) => ({
- fontSize: theme.spacing(largerResolution ? 2 : 4),
- }));
-
- const StyledAppBarButton = styled(Button)(({ theme }) => ({
- fontSize: theme.spacing(largerResolution ? 1.5 : 4), // spacing = 8
- paddingTop: 0,
- paddingBottom: 0,
- }));
-
- React.useEffect(() => {
- setLargerResolution(isScreenHeightLessThan800);
- }, [isScreenHeightLessThan800]);
-
- const rmf = React.useContext(RmfAppContext);
- const resources = React.useContext(ResourcesContext);
- const { showAlert } = React.useContext(AppControllerContext);
- const navigate = useNavigate();
- const location = useLocation();
- const tabValue = React.useMemo(() => locationToTabValue(location.pathname), [location]);
- const [anchorEl, setAnchorEl] = React.useState(null);
- const profile = React.useContext(UserProfileContext);
- const [settingsAnchor, setSettingsAnchor] = React.useState(null);
- const [openCreateTaskForm, setOpenCreateTaskForm] = React.useState(false);
- const [favoritesTasks, setFavoritesTasks] = React.useState([]);
- const [alertListAnchor, setAlertListAnchor] = React.useState(null);
- const [unacknowledgedAlertList, setUnacknowledgedAlertList] = React.useState([]);
- const [openAdminActionsDialog, setOpenAdminActionsDialog] = React.useState(false);
- const [openFireAlarmTriggerResetDialog, setOpenFireAlarmTriggerResetDialog] =
- React.useState(false);
- const [fireAlarmPreviousTrigger, setFireAlarmPreviousTrigger] = React.useState<
- FireAlarmTriggerState | undefined
- >(undefined);
-
- const { waypointNames, pickupPoints, dropoffPoints, cleaningZoneNames } =
- useCreateTaskFormData(rmf);
- const username = useGetUsername(rmf);
-
- async function handleLogout(): Promise {
- try {
- await authenticator.logout();
- } catch (e) {
- console.error(`error logging out: ${(e as Error).message}`);
- }
- }
-
- React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
- const updateUnrespondedAlerts = async () => {
- const { data: alerts } =
- await rmf.alertsApi.getUnrespondedAlertsAlertsUnrespondedRequestsGet();
- // alert.display is checked to verify that the dashboard should display it
- // in the first place
- const alertsToBeDisplayed = alerts.filter((alert) => alert.display);
- setUnacknowledgedAlertList(alertsToBeDisplayed.reverse());
- };
-
- const subs: Subscription[] = [];
- subs.push(rmf.alertRequestsObsStore.subscribe(updateUnrespondedAlerts));
- subs.push(rmf.alertResponsesObsStore.subscribe(updateUnrespondedAlerts));
-
- // Get the initial number of unacknowledged alerts
- updateUnrespondedAlerts();
- return () => subs.forEach((s) => s.unsubscribe());
- }, [rmf]);
-
- const submitTasks = React.useCallback['submitTasks']>(
- async (taskRequests, schedule) => {
- if (!rmf) {
- throw new Error('tasks api not available');
- }
- if (!schedule) {
- await Promise.all(
- taskRequests.map((request) => {
- console.debug('submitTask:');
- console.debug(request);
- return rmf.tasksApi.postDispatchTaskTasksDispatchTaskPost({
- type: 'dispatch_task_request',
- request,
- });
- }),
- );
- } else {
- const scheduleRequests = taskRequests.map((req) => {
- console.debug('schedule task:');
- console.debug(req);
- console.debug(schedule);
- return toApiSchedule(req, schedule);
- });
- await Promise.all(
- scheduleRequests.map((req) => rmf.tasksApi.postScheduledTaskScheduledTasksPost(req)),
- );
+export const AppBar = React.memo(
+ ({ tabs, tabValue, themes, helpLink, reportIssueLink, extraToolbarItems }: AppBarProps) => {
+ const authenticator = useAuthenticator();
+ const rmfApi = useRmfApi();
+ const resources = useResources();
+ const taskRegistry = useTaskRegistry();
+ const { showAlert } = useAppController();
+ const [anchorEl, setAnchorEl] = React.useState(null);
+ const profile = useUserProfile();
+ const [settingsAnchor, setSettingsAnchor] = React.useState(null);
+ const [openCreateTaskForm, setOpenCreateTaskForm] = React.useState(false);
+ const [favoritesTasks, setFavoritesTasks] = React.useState([]);
+ const [alertListAnchor, setAlertListAnchor] = React.useState(null);
+ const [unacknowledgedAlertList, setUnacknowledgedAlertList] = React.useState(
+ [],
+ );
+ const [openAdminActionsDialog, setOpenAdminActionsDialog] = React.useState(false);
+ const [openFireAlarmTriggerResetDialog, setOpenFireAlarmTriggerResetDialog] =
+ React.useState(false);
+ const [fireAlarmPreviousTrigger, setFireAlarmPreviousTrigger] = React.useState<
+ FireAlarmTriggerState | undefined
+ >(undefined);
+
+ const { waypointNames, pickupPoints, dropoffPoints, cleaningZoneNames } =
+ useCreateTaskFormData(rmfApi);
+ const username = profile.user.username;
+
+ async function handleLogout(): Promise {
+ try {
+ await authenticator.logout();
+ } catch (e) {
+ console.error(`error logging out: ${(e as Error).message}`);
}
- AppEvents.refreshTaskApp.next();
- },
- [rmf],
- );
-
- //#region 'Favorite Task'
- React.useEffect(() => {
- if (!rmf) {
- return;
}
- const getFavoriteTasks = async () => {
- const resp = await rmf.tasksApi.getFavoritesTasksFavoriteTasksGet();
- const results = resp.data as TaskFavorite[];
- setFavoritesTasks(results);
+ React.useEffect(() => {
+ const updateUnrespondedAlerts = async () => {
+ const { data: alerts } =
+ await rmfApi.alertsApi.getUnrespondedAlertsAlertsUnrespondedRequestsGet();
+ // alert.display is checked to verify that the dashboard should display it
+ // in the first place
+ const alertsToBeDisplayed = alerts.filter((alert) => alert.display);
+ setUnacknowledgedAlertList(alertsToBeDisplayed.reverse());
+ };
+
+ const subs: Subscription[] = [];
+ subs.push(rmfApi.alertRequestsObsStore.subscribe(updateUnrespondedAlerts));
+ subs.push(rmfApi.alertResponsesObsStore.subscribe(updateUnrespondedAlerts));
+
+ // Get the initial number of unacknowledged alerts
+ updateUnrespondedAlerts();
+ return () => subs.forEach((s) => s.unsubscribe());
+ }, [rmfApi]);
+
+ const submitTasks = React.useCallback['submitTasks']>(
+ async (taskRequests, schedule) => {
+ if (!schedule) {
+ await Promise.all(
+ taskRequests.map((request) => {
+ console.debug('submitTask:');
+ console.debug(request);
+ return rmfApi.tasksApi.postDispatchTaskTasksDispatchTaskPost({
+ type: 'dispatch_task_request',
+ request,
+ });
+ }),
+ );
+ } else {
+ const scheduleRequests = taskRequests.map((req) => {
+ console.debug('schedule task:');
+ console.debug(req);
+ console.debug(schedule);
+ return toApiSchedule(req, schedule);
+ });
+ await Promise.all(
+ scheduleRequests.map((req) => rmfApi.tasksApi.postScheduledTaskScheduledTasksPost(req)),
+ );
+ }
+ AppEvents.refreshTaskApp.next();
+ },
+ [rmfApi],
+ );
+
+ //#region 'Favorite Task'
+ React.useEffect(() => {
+ const getFavoriteTasks = async () => {
+ const resp = await rmfApi.tasksApi.getFavoritesTasksFavoriteTasksGet();
+ const results = resp.data as TaskFavorite[];
+ setFavoritesTasks(results);
+ };
+ getFavoriteTasks();
+
+ const sub = AppEvents.refreshFavoriteTasks.subscribe({ next: getFavoriteTasks });
+ return () => sub.unsubscribe();
+ }, [rmfApi]);
+
+ const submitFavoriteTask = React.useCallback<
+ Required['submitFavoriteTask']
+ >(
+ async (taskFavoriteRequest) => {
+ await rmfApi.tasksApi.postFavoriteTaskFavoriteTasksPost(taskFavoriteRequest);
+ AppEvents.refreshFavoriteTasks.next();
+ },
+ [rmfApi],
+ );
+
+ const deleteFavoriteTask = React.useCallback<
+ Required['deleteFavoriteTask']
+ >(
+ async (favoriteTask) => {
+ if (!favoriteTask.id) {
+ throw new Error('Id is needed');
+ }
+
+ await rmfApi.tasksApi.deleteFavoriteTaskFavoriteTasksFavoriteTaskIdDelete(favoriteTask.id);
+ AppEvents.refreshFavoriteTasks.next();
+ },
+ [rmfApi],
+ );
+ //#endregion 'Favorite Task'
+
+ const handleOpenAlertList = (event: React.MouseEvent) => {
+ setAlertListAnchor(event.currentTarget);
};
- getFavoriteTasks();
-
- const sub = AppEvents.refreshFavoriteTasks.subscribe({ next: getFavoriteTasks });
- return () => sub.unsubscribe();
- }, [rmf]);
-
- const submitFavoriteTask = React.useCallback['submitFavoriteTask']>(
- async (taskFavoriteRequest) => {
- if (!rmf) {
- throw new Error('tasks api not available');
- }
- await rmf.tasksApi.postFavoriteTaskFavoriteTasksPost(taskFavoriteRequest);
- AppEvents.refreshFavoriteTasks.next();
- },
- [rmf],
- );
-
- const deleteFavoriteTask = React.useCallback['deleteFavoriteTask']>(
- async (favoriteTask) => {
- if (!rmf) {
- throw new Error('tasks api not available');
- }
- if (!favoriteTask.id) {
- throw new Error('Id is needed');
- }
-
- await rmf.tasksApi.deleteFavoriteTaskFavoriteTasksFavoriteTaskIdDelete(favoriteTask.id);
- AppEvents.refreshFavoriteTasks.next();
- },
- [rmf],
- );
- //#endregion 'Favorite Task'
-
- const handleOpenAlertList = (event: React.MouseEvent) => {
- if (!rmf) {
- return;
- }
- setAlertListAnchor(event.currentTarget);
- };
- const openAlertDialog = (alert: AlertRequest) => {
- AppEvents.pushAlert.next(alert);
- };
+ const openAlertDialog = (alert: AlertRequest) => {
+ AppEvents.pushAlert.next(alert);
+ };
- const timeDistance = (time: number) => {
- return formatDistance(new Date(), new Date(time));
- };
+ const timeDistance = (time: number) => {
+ return formatDistance(new Date(), new Date(time));
+ };
- React.useEffect(() => {
- if (!rmf) {
- return;
- }
- (async () => {
+ React.useEffect(() => {
+ (async () => {
+ try {
+ const resp =
+ await rmfApi.buildingApi.getPreviousFireAlarmTriggerBuildingMapPreviousFireAlarmTriggerGet();
+ setFireAlarmPreviousTrigger(resp.data);
+ } catch (e) {
+ console.error(`Failed to get previous fire alarm trigger: ${(e as Error).message}`);
+ }
+ })();
+ }, [rmfApi, openAdminActionsDialog]);
+
+ const handleResetFireAlarmTrigger = React.useCallback(async () => {
try {
const resp =
- await rmf.buildingApi.getPreviousFireAlarmTriggerBuildingMapPreviousFireAlarmTriggerGet();
- setFireAlarmPreviousTrigger(resp.data);
+ await rmfApi.buildingApi.resetFireAlarmTriggerBuildingMapResetFireAlarmTriggerPost();
+ if (!resp.data.trigger) {
+ showAlert('success', 'Requested to reset fire alarm trigger');
+ } else {
+ showAlert('error', 'Failed to reset fire alarm trigger');
+ }
} catch (e) {
- console.error(`Failed to get previous fire alarm trigger: ${(e as Error).message}`);
- }
- })();
- }, [rmf, openAdminActionsDialog]);
-
- const handleResetFireAlarmTrigger = React.useCallback(async () => {
- try {
- if (!rmf) {
- throw new Error('building map api not available');
- }
-
- const resp =
- await rmf.buildingApi.resetFireAlarmTriggerBuildingMapResetFireAlarmTriggerPost();
- if (!resp.data.trigger) {
- showAlert('success', 'Requested to reset fire alarm trigger');
- } else {
- showAlert('error', 'Failed to reset fire alarm trigger');
+ showAlert('error', `Failed to reset fire alarm trigger: ${(e as Error).message}`);
}
- } catch (e) {
- showAlert('error', `Failed to reset fire alarm trigger: ${(e as Error).message}`);
- }
-
- setOpenFireAlarmTriggerResetDialog(false);
- setOpenAdminActionsDialog(false);
- }, [rmf, showAlert]);
- return (
- <>
-
-
- navigate(DashboardRoute)}
- />
- navigate(RobotsRoute)}
- />
- navigate(TasksRoute)}
- />
- {APP_CONFIG_ENABLE_CUSTOM_TABS && (
- <>
- navigate(CustomRoute1)}
- />
- navigate(CustomRoute2)}
- />
-
- )}
- {APP_CONFIG_ENABLE_ADMIN_TAB && profile?.user.is_admin && (
- navigate(AdminRoute)}
- />
- )}
-
-
- setOpenCreateTaskForm(true)}
- >
-
-
-
+
+
+ 
+
-
-
-
-
-
-
- Powered by Open-RMF
- */}
- {extraToolbarItems}
- {/*
- setSettingsAnchor(ev.currentTarget)}
- >
-
- */}
-
- window.open(appConfig.helpLink, '_blank')}
- >
-
-
-
- window.open(appConfig.reportIssue, '_blank')}
+
+ window.open(helpLink, '_blank')}
+ >
+
+
+
+ window.open(reportIssueLink, '_blank')}
+ >
+
+
+
+ setAnchorEl(event.currentTarget)}
+ >
+
+
+
-
- {profile && (
- <>
-
- setAnchorEl(event.currentTarget)}
- >
-
-
-
-
- )}
-
-
-
- {openCreateTaskForm && (
- setOpenCreateTaskForm(false)}
- submitTasks={submitTasks}
- submitFavoriteTask={submitFavoriteTask}
- deleteFavoriteTask={deleteFavoriteTask}
- onSuccess={() => {
- console.log('Dispatch task requested');
- setOpenCreateTaskForm(false);
- showAlert('success', 'Dispatch task requested');
- }}
- onFail={(e) => {
- console.error(`Failed to dispatch task: ${e.message}`);
- showAlert('error', `Failed to dispatch task: ${e.message}`);
- }}
- onSuccessFavoriteTask={(message) => {
- console.log(`Created favorite task: ${message}`);
- showAlert('success', message);
- }}
- onFailFavoriteTask={(e) => {
- console.error(`Failed to create favorite task: ${e.message}`);
- showAlert('error', `Failed to create or delete favorite task: ${e.message}`);
- }}
- onSuccessScheduling={() => {
- console.log('Create schedule requested');
- setOpenCreateTaskForm(false);
- showAlert('success', 'Create schedule requested');
- }}
- onFailScheduling={(e) => {
- console.error(`Failed to create schedule: ${e.message}`);
- showAlert('error', `Failed to submit schedule: ${e.message}`);
- }}
- />
- )}
- {openAdminActionsDialog && (
-
- )}
- {openFireAlarmTriggerResetDialog && (
- setOpenFireAlarmTriggerResetDialog(false)}
- onSubmit={handleResetFireAlarmTrigger}
+
+
+ Admin actions
+
+
- )}
-
- );
-});
+
+
+
+
+ {openCreateTaskForm && (
+ setOpenCreateTaskForm(false)}
+ submitTasks={submitTasks}
+ submitFavoriteTask={submitFavoriteTask}
+ deleteFavoriteTask={deleteFavoriteTask}
+ onSuccess={() => {
+ console.log('Dispatch task requested');
+ setOpenCreateTaskForm(false);
+ showAlert('success', 'Dispatch task requested');
+ }}
+ onFail={(e) => {
+ console.error(`Failed to dispatch task: ${e.message}`);
+ showAlert('error', `Failed to dispatch task: ${e.message}`);
+ }}
+ onSuccessFavoriteTask={(message) => {
+ console.log(`Created favorite task: ${message}`);
+ showAlert('success', message);
+ }}
+ onFailFavoriteTask={(e) => {
+ console.error(`Failed to create favorite task: ${e.message}`);
+ showAlert('error', `Failed to create or delete favorite task: ${e.message}`);
+ }}
+ onSuccessScheduling={() => {
+ console.log('Create schedule requested');
+ setOpenCreateTaskForm(false);
+ showAlert('success', 'Create schedule requested');
+ }}
+ onFailScheduling={(e) => {
+ console.error(`Failed to create schedule: ${e.message}`);
+ showAlert('error', `Failed to submit schedule: ${e.message}`);
+ }}
+ />
+ )}
+
+ {openAdminActionsDialog && (
+
+ )}
+ {openFireAlarmTriggerResetDialog && (
+ setOpenFireAlarmTriggerResetDialog(false)}
+ onSubmit={handleResetFireAlarmTrigger}
+ >
+
+ Warning: Please ensure that all other systems are back online and that it is safe to
+ resume robot operations.
+
+
+ )}
+
+ );
+ },
+);
export default AppBar;
diff --git a/packages/dashboard/src/components/beacons-app.tsx b/packages/dashboard/src/components/beacons-table.tsx
similarity index 63%
rename from packages/dashboard/src/components/beacons-app.tsx
rename to packages/dashboard/src/components/beacons-table.tsx
index 470f9f426..b0ea68a1b 100644
--- a/packages/dashboard/src/components/beacons-app.tsx
+++ b/packages/dashboard/src/components/beacons-table.tsx
@@ -2,20 +2,15 @@ import { BeaconState } from 'api-client';
import React from 'react';
import { BeaconDataGridTable } from 'react-components';
-import { createMicroApp } from './micro-app';
-import { RmfAppContext } from './rmf-app';
+import { useRmfApi } from '../hooks/use-rmf-api';
-export const BeaconsApp = createMicroApp('Beacons', () => {
- const rmf = React.useContext(RmfAppContext);
+export const BeaconsTable = () => {
+ const rmfApi = useRmfApi();
const [beacons, setBeacons] = React.useState>({});
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
(async () => {
- const { data } = await rmf.beaconsApi.getBeaconsBeaconsGet();
+ const { data } = await rmfApi.beaconsApi.getBeaconsBeaconsGet();
for (const state of data) {
setBeacons((prev) => {
return {
@@ -26,7 +21,7 @@ export const BeaconsApp = createMicroApp('Beacons', () => {
}
})();
- const sub = rmf.beaconsObsStore.subscribe(async (beaconState) => {
+ const sub = rmfApi.beaconsObsStore.subscribe(async (beaconState) => {
setBeacons((prev) => {
return {
...prev,
@@ -35,7 +30,9 @@ export const BeaconsApp = createMicroApp('Beacons', () => {
});
});
return () => sub.unsubscribe();
- }, [rmf]);
+ }, [rmfApi]);
return (null);
const [openTaskInspector, setOpenTaskInspector] = React.useState(false);
- const appController = React.useContext(AppControllerContext);
- const rmf = React.useContext(RmfAppContext);
+ const appController = useAppController();
+ const rmfApi = useRmfApi();
const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
React.useEffect(() => {
@@ -63,16 +63,11 @@ const DeliveryWarningDialog = React.memo((props: DeliveryWarningDialogProps) =>
}, [deliveryAlert]);
React.useEffect(() => {
- if (!rmf) {
- console.error('Tasks api not available.');
- setNewTaskState(null);
- return;
- }
if (!taskState) {
setNewTaskState(null);
return;
}
- const sub = rmf.getTaskStateObs(taskState.booking.id).subscribe((taskStateUpdate) => {
+ const sub = rmfApi.getTaskStateObs(taskState.booking.id).subscribe((taskStateUpdate) => {
setNewTaskState(taskStateUpdate);
if (
deliveryAlert.action === DeliveryAlertAction.Waiting &&
@@ -81,7 +76,7 @@ const DeliveryWarningDialog = React.memo((props: DeliveryWarningDialogProps) =>
) {
(async () => {
try {
- await rmf.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
+ await rmfApi.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
deliveryAlert.id,
deliveryAlert.category,
deliveryAlert.tier,
@@ -100,7 +95,7 @@ const DeliveryWarningDialog = React.memo((props: DeliveryWarningDialogProps) =>
}
});
return () => sub.unsubscribe();
- }, [rmf, deliveryAlert, taskState, appController]);
+ }, [rmfApi, deliveryAlert, taskState, appController]);
const titleUpdateText = (action: DeliveryAlertAction) => {
switch (action) {
@@ -457,9 +452,9 @@ interface DeliveryAlertData {
}
export const DeliveryAlertStore = React.memo(() => {
- const rmf = React.useContext(RmfAppContext);
+ const rmfApi = useRmfApi();
const [alerts, setAlerts] = React.useState>({});
- const appController = React.useContext(AppControllerContext);
+ const appController = useAppController();
const filterAndPushDeliveryAlert = (deliveryAlert: DeliveryAlert, taskState?: TaskState) => {
// Check if a delivery alert for a task is already open, if so, replace it
@@ -493,10 +488,7 @@ export const DeliveryAlertStore = React.memo(() => {
};
React.useEffect(() => {
- if (!rmf) {
- return;
- }
- const sub = rmf.deliveryAlertObsStore.subscribe(async (deliveryAlert) => {
+ const sub = rmfApi.deliveryAlertObsStore.subscribe(async (deliveryAlert) => {
// DEBUG
console.log(
`Got a delivery alert [${deliveryAlert.id}] with action [${deliveryAlert.action}]`,
@@ -505,7 +497,8 @@ export const DeliveryAlertStore = React.memo(() => {
let state: TaskState | undefined = undefined;
if (deliveryAlert.task_id) {
try {
- state = (await rmf.tasksApi.getTaskStateTasksTaskIdStateGet(deliveryAlert.task_id)).data;
+ state = (await rmfApi.tasksApi.getTaskStateTasksTaskIdStateGet(deliveryAlert.task_id))
+ .data;
} catch {
console.error(`Failed to fetch task state for ${deliveryAlert.task_id}`);
}
@@ -513,15 +506,12 @@ export const DeliveryAlertStore = React.memo(() => {
filterAndPushDeliveryAlert(deliveryAlert, state);
});
return () => sub.unsubscribe();
- }, [rmf]);
+ }, [rmfApi]);
const onOverride = React.useCallback['onOverride']>(
async (delivery_alert) => {
try {
- if (!rmf) {
- throw new Error('delivery alert api not available');
- }
- await rmf.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
+ await rmfApi.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
delivery_alert.id,
delivery_alert.category,
delivery_alert.tier,
@@ -549,7 +539,7 @@ export const DeliveryAlertStore = React.memo(() => {
);
}
},
- [rmf, appController],
+ [rmfApi, appController],
);
const removeDeliveryAlertDialog = (id: string) => {
@@ -559,10 +549,7 @@ export const DeliveryAlertStore = React.memo(() => {
const onResume = React.useCallback['onResume']>(
async (delivery_alert) => {
try {
- if (!rmf) {
- throw new Error('delivery alert api not available');
- }
- await rmf.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
+ await rmfApi.deliveryAlertsApi.respondToDeliveryAlertDeliveryAlertsDeliveryAlertIdResponsePost(
delivery_alert.id,
delivery_alert.category,
delivery_alert.tier,
@@ -586,7 +573,7 @@ export const DeliveryAlertStore = React.memo(() => {
);
}
},
- [rmf, appController],
+ [rmfApi, appController],
);
return (
diff --git a/packages/dashboard/src/components/door-summary.tsx b/packages/dashboard/src/components/door-summary.tsx
index a4d40d651..cd9c177fd 100644
--- a/packages/dashboard/src/components/door-summary.tsx
+++ b/packages/dashboard/src/components/door-summary.tsx
@@ -5,8 +5,8 @@ import { doorModeToOpModeString } from 'react-components';
import { base, doorModeToString, DoorTableData, doorTypeToString } from 'react-components';
import { Door as DoorModel } from 'rmf-models/ros/rmf_building_map_msgs/msg';
+import { useRmfApi } from '../hooks/use-rmf-api';
import { getApiErrorMessage } from '../utils/api';
-import { RmfAppContext } from './rmf-app';
interface DoorSummaryProps {
onClose: () => void;
@@ -15,7 +15,7 @@ interface DoorSummaryProps {
}
export const DoorSummary = ({ onClose, door, level }: DoorSummaryProps): JSX.Element => {
- const rmf = React.useContext(RmfAppContext);
+ const rmfApi = useRmfApi();
const [doorData, setDoorData] = React.useState({
index: 0,
doorName: '',
@@ -25,13 +25,9 @@ export const DoorSummary = ({ onClose, door, level }: DoorSummaryProps): JSX.Ele
});
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
const fetchDataForDoor = async () => {
try {
- const sub = rmf.getDoorStateObs(door.name).subscribe((doorState) => {
+ const sub = rmfApi.getDoorStateObs(door.name).subscribe((doorState) => {
setDoorData({
index: 0,
doorName: door.name,
@@ -47,7 +43,7 @@ export const DoorSummary = ({ onClose, door, level }: DoorSummaryProps): JSX.Ele
};
fetchDataForDoor();
- }, [rmf, level, door]);
+ }, [rmfApi, level, door]);
const [isOpen, setIsOpen] = React.useState(true);
diff --git a/packages/dashboard/src/components/doors-app.tsx b/packages/dashboard/src/components/doors-table.tsx
similarity index 62%
rename from packages/dashboard/src/components/doors-app.tsx
rename to packages/dashboard/src/components/doors-table.tsx
index 320cbfdf8..8a50b847e 100644
--- a/packages/dashboard/src/components/doors-app.tsx
+++ b/packages/dashboard/src/components/doors-table.tsx
@@ -1,37 +1,30 @@
+import { TableContainer } from '@mui/material';
import { BuildingMap } from 'api-client';
import React from 'react';
import { DoorDataGridTable, DoorTableData } from 'react-components';
import { DoorMode as RmfDoorMode } from 'rmf-models/ros/rmf_door_msgs/msg/DoorMode';
import { throttleTime } from 'rxjs';
+import { useRmfApi } from '../hooks/use-rmf-api';
import { getApiErrorMessage } from '../utils/api';
import { AppEvents } from './app-events';
-import { createMicroApp } from './micro-app';
-import { RmfAppContext } from './rmf-app';
-export const DoorsApp = createMicroApp('Doors', () => {
- const rmf = React.useContext(RmfAppContext);
+export const DoorsTable = () => {
+ const rmfApi = useRmfApi();
const [buildingMap, setBuildingMap] = React.useState(null);
const [doorTableData, setDoorTableData] = React.useState>({});
React.useEffect(() => {
- if (!rmf) {
- return;
- }
- const sub = rmf.buildingMapObs.subscribe(setBuildingMap);
+ const sub = rmfApi.buildingMapObs.subscribe(setBuildingMap);
return () => sub.unsubscribe();
- }, [rmf]);
+ }, [rmfApi]);
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
let doorIndex = 0;
buildingMap?.levels.map((level) =>
level.doors.map(async (door) => {
try {
- const sub = rmf
+ const sub = rmfApi
.getDoorStateObs(door.name)
.pipe(throttleTime(3000, undefined, { leading: true, trailing: true }))
.subscribe((doorState) => {
@@ -45,11 +38,11 @@ export const DoorsApp = createMicroApp('Doors', () => {
doorType: door.door_type,
doorState: doorState,
onClickOpen: () =>
- rmf?.doorsApi.postDoorRequestDoorsDoorNameRequestPost(door.name, {
+ rmfApi?.doorsApi.postDoorRequestDoorsDoorNameRequestPost(door.name, {
mode: RmfDoorMode.MODE_OPEN,
}),
onClickClose: () =>
- rmf?.doorsApi.postDoorRequestDoorsDoorNameRequestPost(door.name, {
+ rmfApi?.doorsApi.postDoorRequestDoorsDoorNameRequestPost(door.name, {
mode: RmfDoorMode.MODE_CLOSED,
}),
},
@@ -62,26 +55,30 @@ export const DoorsApp = createMicroApp('Doors', () => {
}
}),
);
- }, [rmf, buildingMap]);
+ }, [rmfApi, buildingMap]);
return (
- {
- if (!buildingMap) {
- AppEvents.doorSelect.next(null);
- return;
- }
+
+ {
+ if (!buildingMap) {
+ AppEvents.doorSelect.next(null);
+ return;
+ }
- for (const level of buildingMap.levels) {
- for (const door of level.doors) {
- if (door.name === doorData.doorName) {
- AppEvents.doorSelect.next([level.name, door]);
- return;
+ for (const level of buildingMap.levels) {
+ for (const door of level.doors) {
+ if (door.name === doorData.doorName) {
+ AppEvents.doorSelect.next([level.name, door]);
+ return;
+ }
}
}
- }
- }}
- />
+ }}
+ />
+
);
-});
+};
+
+export default DoorsTable;
diff --git a/packages/dashboard/src/components/index.ts b/packages/dashboard/src/components/index.ts
index 26bcfb24b..cf5662be4 100644
--- a/packages/dashboard/src/components/index.ts
+++ b/packages/dashboard/src/components/index.ts
@@ -1,8 +1,6 @@
-export * from './admin';
-export * from './app-base';
-export * from './app-contexts';
+export * from '../micro-apps/map-app';
export * from './app-events';
export * from './login-card';
-export * from './private-route';
-export * from './rmf-app';
+export * from './rmf-dashboard';
+export * from './theme';
export * from './workspace';
diff --git a/packages/dashboard/src/components/lift-summary.tsx b/packages/dashboard/src/components/lift-summary.tsx
index b7bbc2e5f..42f04180c 100644
--- a/packages/dashboard/src/components/lift-summary.tsx
+++ b/packages/dashboard/src/components/lift-summary.tsx
@@ -11,8 +11,8 @@ import { Lift } from 'api-client';
import React from 'react';
import { base, doorStateToString, liftModeToString, LiftTableData } from 'react-components';
+import { useRmfApi } from '../hooks/use-rmf-api';
import { getApiErrorMessage } from '../utils/api';
-import { RmfAppContext } from './rmf-app';
interface LiftSummaryProps {
onClose: () => void;
@@ -21,7 +21,7 @@ interface LiftSummaryProps {
export const LiftSummary = ({ onClose, lift }: LiftSummaryProps): JSX.Element => {
const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
- const rmf = React.useContext(RmfAppContext);
+ const rmfApi = useRmfApi();
const [liftData, setLiftData] = React.useState({
index: 0,
name: '',
@@ -35,13 +35,9 @@ export const LiftSummary = ({ onClose, lift }: LiftSummaryProps): JSX.Element =>
});
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
const fetchDataForLift = async () => {
try {
- const sub = rmf.getLiftStateObs(lift.name).subscribe((liftState) => {
+ const sub = rmfApi.getLiftStateObs(lift.name).subscribe((liftState) => {
setLiftData({
index: -1,
name: lift.name,
@@ -60,7 +56,7 @@ export const LiftSummary = ({ onClose, lift }: LiftSummaryProps): JSX.Element =>
};
fetchDataForLift();
- }, [rmf, lift]);
+ }, [rmfApi, lift]);
const [isOpen, setIsOpen] = React.useState(true);
diff --git a/packages/dashboard/src/components/lifts-app.tsx b/packages/dashboard/src/components/lifts-table.tsx
similarity index 82%
rename from packages/dashboard/src/components/lifts-app.tsx
rename to packages/dashboard/src/components/lifts-table.tsx
index 3aa0d4dfd..c9970c36a 100644
--- a/packages/dashboard/src/components/lifts-app.tsx
+++ b/packages/dashboard/src/components/lifts-table.tsx
@@ -5,38 +5,29 @@ import { LiftDataGridTable, LiftTableData } from 'react-components';
import { LiftRequest as RmfLiftRequest } from 'rmf-models/ros/rmf_lift_msgs/msg';
import { throttleTime } from 'rxjs';
+import { useRmfApi } from '../hooks/use-rmf-api';
import { getApiErrorMessage } from '../utils/api';
import { AppEvents } from './app-events';
import { LiftSummary } from './lift-summary';
-import { createMicroApp } from './micro-app';
-import { RmfAppContext } from './rmf-app';
-export const LiftsApp = createMicroApp('Lifts', () => {
- const rmf = React.useContext(RmfAppContext);
+export const LiftsTable = () => {
+ const rmfApi = useRmfApi();
const [buildingMap, setBuildingMap] = React.useState(null);
const [liftTableData, setLiftTableData] = React.useState>({});
const [openLiftSummary, setOpenLiftSummary] = React.useState(false);
const [selectedLift, setSelectedLift] = React.useState(null);
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
- const sub = rmf.buildingMapObs.subscribe((newMap) => {
+ const sub = rmfApi.buildingMapObs.subscribe((newMap) => {
setBuildingMap(newMap);
});
return () => sub.unsubscribe();
- }, [rmf]);
+ }, [rmfApi]);
React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
buildingMap?.lifts.map(async (lift, i) => {
try {
- const sub = rmf
+ const sub = rmfApi
.getLiftStateObs(lift.name)
.pipe(throttleTime(3000, undefined, { leading: true, trailing: true }))
.subscribe((liftState) => {
@@ -56,13 +47,9 @@ export const LiftsApp = createMicroApp('Lifts', () => {
lift: lift,
liftState: liftState,
onRequestSubmit: async (_ev, doorState, requestType, destination) => {
- if (!rmf) {
- console.error('rmf ingress is undefined');
- return;
- }
const fleet_session_ids: string[] = [];
if (requestType === RmfLiftRequest.REQUEST_END_SESSION) {
- const fleets = (await rmf.fleetsApi.getFleetsFleetsGet()).data;
+ const fleets = (await rmfApi.fleetsApi.getFleetsFleetsGet()).data;
for (const fleet of fleets) {
if (!fleet.robots) {
continue;
@@ -73,7 +60,7 @@ export const LiftsApp = createMicroApp('Lifts', () => {
}
}
- return rmf?.liftsApi.postLiftRequestLiftsLiftNameRequestPost(lift.name, {
+ return rmfApi?.liftsApi.postLiftRequestLiftsLiftNameRequestPost(lift.name, {
destination,
door_mode: doorState,
request_type: requestType,
@@ -90,10 +77,10 @@ export const LiftsApp = createMicroApp('Lifts', () => {
console.error(`Failed to get lift state: ${getApiErrorMessage(error)}`);
}
});
- }, [rmf, buildingMap]);
+ }, [rmfApi, buildingMap]);
return (
-
+
l)}
onLiftClick={(_ev, liftData) => {
@@ -117,4 +104,6 @@ export const LiftsApp = createMicroApp('Lifts', () => {
)}
);
-});
+};
+
+export default LiftsTable;
diff --git a/packages/dashboard/src/components/map-app.tsx b/packages/dashboard/src/components/map-app.tsx
deleted file mode 100644
index a3ef33ebf..000000000
--- a/packages/dashboard/src/components/map-app.tsx
+++ /dev/null
@@ -1,736 +0,0 @@
-import type { StyledComponent } from '@emotion/styled';
-import { Box, styled, Typography, useMediaQuery } from '@mui/material';
-import type { Theme } from '@mui/material/styles';
-import type { MUIStyledCommonProps } from '@mui/system';
-import { Line } from '@react-three/drei';
-import { Canvas, useLoader } from '@react-three/fiber';
-import { BuildingMap, FleetState, Level, Lift } from 'api-client';
-import Debug from 'debug';
-import React, { ChangeEvent, Suspense } from 'react';
-import {
- ColorManager,
- findSceneBoundingBoxFromThreeFiber,
- getPlaces,
- Place,
- ReactThreeFiberImageMaker,
- RobotData,
- RobotTableData,
- ShapeThreeRendering,
- TextThreeRendering,
-} from 'react-components';
-import { ErrorBoundary } from 'react-error-boundary';
-import { Door as DoorModel } from 'rmf-models/ros/rmf_building_map_msgs/msg';
-import { EMPTY, merge, scan, Subscription, switchMap, throttleTime } from 'rxjs';
-import { Box3, TextureLoader, Vector3 } from 'three';
-
-import {
- AppConfigContext,
- AuthenticatorContext,
- FleetResource,
- ResourcesContext,
-} from '../app-config';
-import { TrajectoryData } from '../services/robot-trajectory-manager';
-import { AppControllerContext } from './app-contexts';
-import { AppEvents } from './app-events';
-import { DoorSummary } from './door-summary';
-import { LiftSummary } from './lift-summary';
-import { createMicroApp, MicroAppProps } from './micro-app';
-import { RmfAppContext } from './rmf-app';
-import { RobotSummary } from './robots/robot-summary';
-import { CameraControl, Door, LayersController, Lifts, RobotThree } from './three-fiber';
-
-const debug = Debug('MapApp');
-
-const TrajectoryUpdateInterval = 2000;
-// schedule visualizer manages it's own settings so that it doesn't cause a re-render
-// of the whole app when it changes.
-const colorManager = new ColorManager();
-
-const DEFAULT_ROBOT_SCALE = 0.003;
-
-function getRobotId(fleetName: string, robotName: string): string {
- return `${fleetName}/${robotName}`;
-}
-
-export const MapApp: StyledComponent, {}, {}> = styled(
- createMicroApp('Map', () => {
- const appConfig = React.useContext(AppConfigContext);
- const authenticator = React.useContext(AuthenticatorContext);
- const resources = React.useContext(ResourcesContext);
- const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
- const rmf = React.useContext(RmfAppContext);
- const resourceManager = React.useContext(ResourcesContext);
- const { showAlert } = React.useContext(AppControllerContext);
- const [currentLevel, setCurrentLevel] = React.useState(undefined);
- const [disabledLayers, setDisabledLayers] = React.useState>({
- 'Pickup & Dropoff waypoints': false,
- 'Pickup & Dropoff labels': true,
- Waypoints: true,
- 'Waypoint labels': true,
- 'Doors & Lifts': false,
- 'Doors labels': true,
- Robots: false,
- 'Robots labels': true,
- Trajectories: false,
- });
- const [openRobotSummary, setOpenRobotSummary] = React.useState(false);
- const [openDoorSummary, setOpenDoorSummary] = React.useState(false);
- const [openLiftSummary, setOpenLiftSummary] = React.useState(false);
- const [selectedRobot, setSelectedRobot] = React.useState();
- const [selectedDoor, setSelectedDoor] = React.useState();
- const [selectedLift, setSelectedLift] = React.useState();
-
- const [buildingMap, setBuildingMap] = React.useState(null);
-
- const [fleets, setFleets] = React.useState([]);
-
- const [waypoints, setWaypoints] = React.useState([]);
- const [currentLevelOfRobots, setCurrentLevelOfRobots] = React.useState<{
- [key: string]: string;
- }>({});
-
- const [trajectories, setTrajectories] = React.useState([]);
- const trajectoryTime = 300000;
- const trajectoryAnimScale = trajectoryTime / (0.9 * TrajectoryUpdateInterval);
- const trajManager = rmf?.trajectoryManager;
- React.useEffect(() => {
- if (!currentLevel) {
- return;
- }
-
- let cancel = false;
-
- const updateTrajectory = async () => {
- debug('updating trajectories');
-
- if (cancel || !trajManager) return;
-
- const resp = await trajManager.latestTrajectory({
- request: 'trajectory',
- param: {
- map_name: currentLevel.name,
- duration: trajectoryTime,
- trim: true,
- },
- token: authenticator.token,
- });
- const flatConflicts = resp.conflicts.flatMap((c) => c);
-
- debug('set trajectories');
- const trajectories = resp.values.map((v) => ({
- trajectory: v,
- color: 'green',
- conflict: flatConflicts.includes(v.id),
- animationScale: trajectoryAnimScale,
- loopAnimation: false,
- }));
-
- // Filter trajectory due to https://github.com/open-rmf/rmf_visualization/issues/65
- for (const t of trajectories) {
- if (t.trajectory.segments.length === 0) {
- continue;
- }
-
- const knot = t.trajectory.segments[0];
- if ((knot.x[0] < 1e-9 && knot.x[0] > -1e-9) || (knot.x[1] < 1e-9 && knot.x[1] > -1e-9)) {
- t.trajectory.segments.shift();
- }
- }
- setTrajectories(trajectories);
- };
-
- updateTrajectory();
- const interval = window.setInterval(updateTrajectory, TrajectoryUpdateInterval);
- debug(`created trajectory update interval ${interval}`);
-
- return () => {
- cancel = true;
- clearInterval(interval);
- debug(`cleared interval ${interval}`);
- };
- }, [trajManager, currentLevel, trajectoryTime, trajectoryAnimScale, authenticator.token]);
-
- React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
- const levelByName = (map: BuildingMap, levelName?: string) => {
- if (!levelName) {
- return null;
- }
- for (const l of map.levels) {
- if (l.name === levelName) {
- return l;
- }
- }
- return null;
- };
-
- const handleBuildingMap = (newMap: BuildingMap) => {
- setBuildingMap(newMap);
- const loggedInDisplayLevel = AppEvents.justLoggedIn.value
- ? levelByName(newMap, appConfig.defaultMapLevel)
- : undefined;
- const currentLevel =
- loggedInDisplayLevel || AppEvents.levelSelect.value || newMap.levels[0];
- AppEvents.levelSelect.next(currentLevel);
- setWaypoints(
- getPlaces(newMap).filter(
- (p) => p.level === currentLevel.name && p.vertex.name.length > 0,
- ),
- );
- AppEvents.justLoggedIn.next(false);
- };
-
- (async () => {
- try {
- const newMap = (await rmf.buildingApi.getBuildingMapBuildingMapGet()).data;
- handleBuildingMap(newMap);
- } catch (e) {
- console.log(`failed to get building map: ${(e as Error).message}`);
- }
- })();
-
- const subs: Subscription[] = [];
- subs.push(rmf.buildingMapObs.subscribe((newMap) => handleBuildingMap(newMap)));
- subs.push(rmf.fleetsObs.subscribe(setFleets));
-
- return () => {
- for (const sub of subs) {
- sub.unsubscribe();
- }
- };
- }, [rmf, resourceManager, appConfig.defaultMapLevel]);
-
- const [imageUrl, setImageUrl] = React.useState(null);
- // Since the configurable zoom level is for supporting the lowest resolution
- // settings, we will double it for anything that is operating within modern
- // resolution settings.
- const defaultZoom = isScreenHeightLessThan800
- ? appConfig.defaultZoom
- : appConfig.defaultZoom * 2;
- const [zoom, setZoom] = React.useState(defaultZoom);
- const [sceneBoundingBox, setSceneBoundingBox] = React.useState(undefined);
- const [distance, setDistance] = React.useState(0);
-
- React.useEffect(() => {
- const subs: Subscription[] = [];
- subs.push(
- AppEvents.zoom.subscribe((currentValue) => {
- setZoom(currentValue || defaultZoom);
- }),
- );
- subs.push(
- AppEvents.levelSelect.subscribe((currentValue) => {
- const newSceneBoundingBox = currentValue
- ? findSceneBoundingBoxFromThreeFiber(currentValue)
- : undefined;
- if (newSceneBoundingBox) {
- const center = newSceneBoundingBox.getCenter(new Vector3());
- const size = newSceneBoundingBox.getSize(new Vector3());
- const distance = Math.max(size.x, size.y, size.z) * 0.7;
- const newZoom = defaultZoom;
- AppEvents.resetCamera.next([center.x, center.y, center.z + distance, newZoom]);
- }
- setCurrentLevel(currentValue ?? undefined);
- setSceneBoundingBox(newSceneBoundingBox);
- }),
- );
- return () => {
- for (const sub of subs) {
- sub.unsubscribe();
- }
- };
- }, [defaultZoom]);
-
- React.useEffect(() => {
- if (!currentLevel?.images[0]) {
- setImageUrl(null);
- return;
- }
-
- (async () => {
- useLoader.preload(TextureLoader, currentLevel.images[0].data);
- setImageUrl(currentLevel.images[0].data);
- })();
-
- buildingMap &&
- setWaypoints(
- getPlaces(buildingMap).filter(
- (p) => p.level === currentLevel.name && p.vertex.name.length > 0,
- ),
- );
- }, [buildingMap, currentLevel]);
-
- const [robots, setRobots] = React.useState([]);
- const { current: robotsStore } = React.useRef>({});
- React.useEffect(() => {
- (async () => {
- if (!currentLevel) {
- return;
- }
- const promises = Object.values(fleets).flatMap((fleetState) => {
- if (!fleetState.name || !fleetState.robots) {
- return null;
- }
- const robotKey = Object.keys(fleetState.robots);
- const fleetName = fleetState.name;
- return robotKey.map(async (r) => {
- const robotId = getRobotId(fleetName, r);
- const fleetResource: FleetResource | undefined = resources.fleets[fleetName];
- if (robotId in robotsStore) return;
- robotsStore[robotId] = {
- fleet: fleetName,
- name: r,
- // no model name
- model: '',
- scale: fleetResource?.default.scale || DEFAULT_ROBOT_SCALE,
- footprint: 0.5,
- color: await colorManager.robotPrimaryColor(fleetName, r, ''),
- iconPath: fleetResource?.default.icon || undefined,
- };
- });
- });
- await Promise.all(promises);
- const newRobots = Object.values(fleets).flatMap((fleetState) => {
- const robotKey = fleetState.robots ? Object.keys(fleetState.robots) : [];
- return robotKey
- ?.filter(
- (r) =>
- fleetState.robots &&
- r in currentLevelOfRobots &&
- currentLevelOfRobots[r] === currentLevel.name &&
- `${fleetState.name}/${r}` in robotsStore,
- )
- .map((r) => robotsStore[`${fleetState.name}/${r}`]);
- });
- setRobots(newRobots);
- })();
- }, [
- fleets,
- robotsStore,
- resourceManager,
- currentLevel,
- currentLevelOfRobots,
- resources.fleets,
- ]);
-
- const { current: robotLocations } = React.useRef<
- Record
- >({});
- // updates the robot location
- React.useEffect(() => {
- if (!rmf) {
- return;
- }
- const sub = rmf.fleetsObs
- .pipe(
- switchMap((fleets) =>
- merge(
- ...fleets.map((f) =>
- f.name
- ? rmf
- .getFleetStateObs(f.name)
- .pipe(throttleTime(500, undefined, { leading: true, trailing: true }))
- : EMPTY,
- ),
- ),
- ),
- )
- .subscribe((fleetState) => {
- const fleetName = fleetState.name;
- if (!fleetName || !fleetState.robots) {
- console.warn('Map: Fail to update robot location (missing fleet name or robots)');
- return;
- }
- Object.entries(fleetState.robots).forEach(([robotName, robotState]) => {
- const robotId = getRobotId(fleetName, robotName);
- if (!robotState.location) {
- console.warn(`Map: Fail to update robot location for ${robotId} (missing location)`);
- return;
- }
- robotLocations[robotId] = [
- robotState.location.x,
- robotState.location.y,
- robotState.location.yaw,
- robotState.location.map,
- ];
-
- setCurrentLevelOfRobots((prevState) => {
- if (!robotState.location?.map && prevState.robotName) {
- console.warn(`Map: Fail to update robot level for ${robotId} (missing map)`);
- const updatedState = { ...prevState };
- delete updatedState[robotName];
- return updatedState;
- }
-
- return {
- ...prevState,
- [robotName]: robotState.location?.map || '',
- };
- });
- });
- });
- return () => sub.unsubscribe();
- }, [rmf, robotLocations]);
-
- //Accumulate values over time to persist between tabs
- React.useEffect(() => {
- const sub = AppEvents.disabledLayers
- .pipe(scan((acc, value) => ({ ...acc, ...value }), {}))
- .subscribe((layers) => {
- setDisabledLayers(layers);
- });
- return () => sub.unsubscribe();
- }, []);
-
- // zoom to robot on select
- React.useEffect(() => {
- const subs: Subscription[] = [];
-
- // Centering on robot
- subs.push(
- AppEvents.robotSelect.subscribe((data) => {
- if (!data || !sceneBoundingBox) {
- return;
- }
- const [fleetName, robotName] = data;
- const robotId = getRobotId(fleetName, robotName);
- const robotLocation = robotLocations[robotId];
- if (!robotLocation) {
- console.warn(`Map: Failed to zoom to robot ${robotId} (robot location was not found)`);
- return;
- }
-
- const mapName = robotLocation[3];
- let newSceneBoundingBox = sceneBoundingBox;
- if (
- AppEvents.levelSelect.value &&
- AppEvents.levelSelect.value.name !== mapName &&
- buildingMap
- ) {
- const robotLevel =
- buildingMap.levels.find((l: Level) => l.name === mapName) || buildingMap.levels[0];
- AppEvents.levelSelect.next(robotLevel);
-
- const robotLevelSceneBoundingBox = findSceneBoundingBoxFromThreeFiber(robotLevel);
- if (!robotLevelSceneBoundingBox) {
- return;
- }
- newSceneBoundingBox = robotLevelSceneBoundingBox;
- setSceneBoundingBox(newSceneBoundingBox);
- }
-
- const size = newSceneBoundingBox.getSize(new Vector3());
- const distance = Math.max(size.x, size.y, size.z) * 0.7;
- const newZoom = appConfig.defaultRobotZoom;
- AppEvents.resetCamera.next([
- robotLocation[0],
- robotLocation[1],
- robotLocation[2] + distance,
- newZoom,
- ]);
- }),
- );
-
- // Centering on door
- subs.push(
- AppEvents.doorSelect.subscribe((door) => {
- if (!door || !sceneBoundingBox) {
- return;
- }
-
- const [mapName, doorInfo] = door;
-
- let newSceneBoundingBox = sceneBoundingBox;
- if (
- AppEvents.levelSelect.value &&
- AppEvents.levelSelect.value.name !== mapName &&
- buildingMap
- ) {
- const doorLevel =
- buildingMap.levels.find((l: Level) => l.name === mapName) || buildingMap.levels[0];
- AppEvents.levelSelect.next(doorLevel);
-
- const doorLevelSceneBoundingBox = findSceneBoundingBoxFromThreeFiber(doorLevel);
- if (!doorLevelSceneBoundingBox) {
- return;
- }
- newSceneBoundingBox = doorLevelSceneBoundingBox;
- setSceneBoundingBox(newSceneBoundingBox);
- }
-
- const size = newSceneBoundingBox.getSize(new Vector3());
- const distance = Math.max(size.x, size.y, size.z) * 0.7;
- const newZoom = appConfig.defaultRobotZoom;
- AppEvents.resetCamera.next([
- (doorInfo.v1_x + doorInfo.v2_x) / 2,
- (doorInfo.v1_y + doorInfo.v2_y) / 2,
- distance,
- newZoom,
- ]);
- }),
- );
-
- // Centering on lift
- subs.push(
- AppEvents.liftSelect.subscribe((lift) => {
- if (!lift || !sceneBoundingBox) {
- return;
- }
-
- const size = sceneBoundingBox.getSize(new Vector3());
- const distance = Math.max(size.x, size.y, size.z) * 0.7;
- const newZoom = appConfig.defaultRobotZoom;
- AppEvents.resetCamera.next([lift.ref_x, lift.ref_y, distance, newZoom]);
- }),
- );
-
- return () => {
- for (const sub of subs) {
- sub.unsubscribe();
- }
- };
- }, [robotLocations, sceneBoundingBox, buildingMap, appConfig.defaultRobotZoom]);
-
- React.useEffect(() => {
- if (!sceneBoundingBox) {
- return;
- }
-
- const size = sceneBoundingBox.getSize(new Vector3());
- setDistance(Math.max(size.x, size.y, size.z) * 0.7);
- }, [sceneBoundingBox]);
-
- return buildingMap && currentLevel && robotLocations ? (
-
- , value: string) => {
- AppEvents.levelSelect.next(
- buildingMap.levels.find((l: Level) => l.name === value) || buildingMap.levels[0],
- );
- }}
- handleFullView={() => {
- if (!sceneBoundingBox) {
- return;
- }
- const center = sceneBoundingBox.getCenter(new Vector3());
- const size = sceneBoundingBox.getSize(new Vector3());
- const distance = Math.max(size.x, size.y, size.z) * 0.7;
- const newZoom = defaultZoom;
- AppEvents.resetCamera.next([center.x, center.y, center.z + distance, newZoom]);
- }}
- handleZoomIn={() => AppEvents.zoomIn.next()}
- handleZoomOut={() => AppEvents.zoomOut.next()}
- />
-
-
- {appConfig.attributionPrefix}
-
-
-
- {openRobotSummary && selectedRobot && (
- setOpenRobotSummary(false)} />
- )}
- {openDoorSummary && selectedDoor && (
- setOpenDoorSummary(false)}
- door={selectedDoor}
- level={currentLevel}
- />
- )}
-
- {openLiftSummary && selectedLift && (
- setOpenLiftSummary(false)} lift={selectedLift} />
- )}
-
- ) : null;
- }),
-)({
- // This ensures that the resize handle is above the map.
- '& > .react-resizable-handle': {
- zIndex: 1001,
- },
-});
diff --git a/packages/dashboard/src/components/map.tsx b/packages/dashboard/src/components/map.tsx
new file mode 100644
index 000000000..2198c2b15
--- /dev/null
+++ b/packages/dashboard/src/components/map.tsx
@@ -0,0 +1,712 @@
+import { Box, styled, Typography, useMediaQuery } from '@mui/material';
+import { Line } from '@react-three/drei';
+import { Canvas, useLoader } from '@react-three/fiber';
+import { BuildingMap, FleetState, Level, Lift } from 'api-client';
+import Debug from 'debug';
+import React, { ChangeEvent, Suspense } from 'react';
+import {
+ ColorManager,
+ findSceneBoundingBoxFromThreeFiber,
+ getPlaces,
+ Place,
+ ReactThreeFiberImageMaker,
+ RobotData,
+ RobotTableData,
+ ShapeThreeRendering,
+ TextThreeRendering,
+} from 'react-components';
+import { ErrorBoundary } from 'react-error-boundary';
+import { Door as DoorModel } from 'rmf-models/ros/rmf_building_map_msgs/msg';
+import { EMPTY, merge, scan, Subscription, switchMap, throttleTime } from 'rxjs';
+import { Box3, TextureLoader, Vector3 } from 'three';
+
+import { useAppController } from '../hooks/use-app-controller';
+import { useAuthenticator } from '../hooks/use-authenticator';
+import { FleetResource, useResources } from '../hooks/use-resources';
+import { useRmfApi } from '../hooks/use-rmf-api';
+import { TrajectoryData } from '../services/robot-trajectory-manager';
+import { AppEvents } from './app-events';
+import { DoorSummary } from './door-summary';
+import { LiftSummary } from './lift-summary';
+import { RobotSummary } from './robots/robot-summary';
+import { CameraControl, Door, LayersController, Lifts, RobotThree } from './three-fiber';
+
+const debug = Debug('MapApp');
+
+const TrajectoryUpdateInterval = 2000;
+// schedule visualizer manages it's own settings so that it doesn't cause a re-render
+// of the whole app when it changes.
+const colorManager = new ColorManager();
+
+const DEFAULT_ROBOT_SCALE = 0.003;
+
+function getRobotId(fleetName: string, robotName: string): string {
+ return `${fleetName}/${robotName}`;
+}
+
+export interface MapProps {
+ defaultMapLevel: string;
+ defaultZoom: number;
+ defaultRobotZoom: number;
+ attributionPrefix: string;
+}
+
+export const Map = styled((props: MapProps) => {
+ const authenticator = useAuthenticator();
+ const { fleets: fleetResources } = useResources();
+ const isScreenHeightLessThan800 = useMediaQuery('(max-height:800px)');
+ const rmfApi = useRmfApi();
+ const { showAlert } = useAppController();
+ const [currentLevel, setCurrentLevel] = React.useState(undefined);
+ const [disabledLayers, setDisabledLayers] = React.useState>({
+ 'Pickup & Dropoff waypoints': false,
+ 'Pickup & Dropoff labels': true,
+ Waypoints: true,
+ 'Waypoint labels': true,
+ 'Doors & Lifts': false,
+ 'Doors labels': true,
+ Robots: false,
+ 'Robots labels': true,
+ Trajectories: false,
+ });
+ const [openRobotSummary, setOpenRobotSummary] = React.useState(false);
+ const [openDoorSummary, setOpenDoorSummary] = React.useState(false);
+ const [openLiftSummary, setOpenLiftSummary] = React.useState(false);
+ const [selectedRobot, setSelectedRobot] = React.useState();
+ const [selectedDoor, setSelectedDoor] = React.useState();
+ const [selectedLift, setSelectedLift] = React.useState();
+
+ const [buildingMap, setBuildingMap] = React.useState(null);
+
+ const [fleets, setFleets] = React.useState([]);
+
+ const [waypoints, setWaypoints] = React.useState([]);
+ const [currentLevelOfRobots, setCurrentLevelOfRobots] = React.useState<{
+ [key: string]: string;
+ }>({});
+
+ const [trajectories, setTrajectories] = React.useState([]);
+ const trajectoryTime = 300000;
+ const trajectoryAnimScale = trajectoryTime / (0.9 * TrajectoryUpdateInterval);
+ const trajManager = rmfApi?.trajectoryManager;
+ React.useEffect(() => {
+ if (!currentLevel) {
+ return;
+ }
+
+ let cancel = false;
+
+ const updateTrajectory = async () => {
+ debug('updating trajectories');
+
+ if (cancel || !trajManager) return;
+
+ const resp = await trajManager.latestTrajectory({
+ request: 'trajectory',
+ param: {
+ map_name: currentLevel.name,
+ duration: trajectoryTime,
+ trim: true,
+ },
+ token: authenticator.token,
+ });
+ const flatConflicts = resp.conflicts.flatMap((c) => c);
+
+ debug('set trajectories');
+ const trajectories = resp.values.map((v) => ({
+ trajectory: v,
+ color: 'green',
+ conflict: flatConflicts.includes(v.id),
+ animationScale: trajectoryAnimScale,
+ loopAnimation: false,
+ }));
+
+ // Filter trajectory due to https://github.com/open-rmf/rmf_visualization/issues/65
+ for (const t of trajectories) {
+ if (t.trajectory.segments.length === 0) {
+ continue;
+ }
+
+ const knot = t.trajectory.segments[0];
+ if ((knot.x[0] < 1e-9 && knot.x[0] > -1e-9) || (knot.x[1] < 1e-9 && knot.x[1] > -1e-9)) {
+ t.trajectory.segments.shift();
+ }
+ }
+ setTrajectories(trajectories);
+ };
+
+ updateTrajectory();
+ const interval = window.setInterval(updateTrajectory, TrajectoryUpdateInterval);
+ debug(`created trajectory update interval ${interval}`);
+
+ return () => {
+ cancel = true;
+ clearInterval(interval);
+ debug(`cleared interval ${interval}`);
+ };
+ }, [trajManager, currentLevel, trajectoryTime, trajectoryAnimScale, authenticator.token]);
+
+ React.useEffect(() => {
+ const levelByName = (map: BuildingMap, levelName?: string) => {
+ if (!levelName) {
+ return null;
+ }
+ for (const l of map.levels) {
+ if (l.name === levelName) {
+ return l;
+ }
+ }
+ return null;
+ };
+
+ const handleBuildingMap = (newMap: BuildingMap) => {
+ setBuildingMap(newMap);
+ const loggedInDisplayLevel = AppEvents.justLoggedIn.value
+ ? levelByName(newMap, props.defaultMapLevel)
+ : undefined;
+ const currentLevel = loggedInDisplayLevel || AppEvents.levelSelect.value || newMap.levels[0];
+ AppEvents.levelSelect.next(currentLevel);
+ setWaypoints(
+ getPlaces(newMap).filter((p) => p.level === currentLevel.name && p.vertex.name.length > 0),
+ );
+ AppEvents.justLoggedIn.next(false);
+ };
+
+ (async () => {
+ try {
+ const newMap = (await rmfApi.buildingApi.getBuildingMapBuildingMapGet()).data;
+ handleBuildingMap(newMap);
+ } catch (e) {
+ console.log(`failed to get building map: ${(e as Error).message}`);
+ }
+ })();
+
+ const subs: Subscription[] = [];
+ subs.push(rmfApi.buildingMapObs.subscribe((newMap) => handleBuildingMap(newMap)));
+ subs.push(rmfApi.fleetsObs.subscribe(setFleets));
+
+ return () => {
+ for (const sub of subs) {
+ sub.unsubscribe();
+ }
+ };
+ }, [rmfApi, props.defaultMapLevel]);
+
+ const [imageUrl, setImageUrl] = React.useState(null);
+ // Since the configurable zoom level is for supporting the lowest resolution
+ // settings, we will double it for anything that is operating within modern
+ // resolution settings.
+ const defaultZoom = isScreenHeightLessThan800 ? props.defaultZoom : props.defaultZoom * 2;
+ const [zoom, setZoom] = React.useState(defaultZoom);
+ const [sceneBoundingBox, setSceneBoundingBox] = React.useState(undefined);
+ const [distance, setDistance] = React.useState(0);
+
+ React.useEffect(() => {
+ const subs: Subscription[] = [];
+ subs.push(
+ AppEvents.zoom.subscribe((currentValue) => {
+ setZoom(currentValue || defaultZoom);
+ }),
+ );
+ subs.push(
+ AppEvents.levelSelect.subscribe((currentValue) => {
+ const newSceneBoundingBox = currentValue
+ ? findSceneBoundingBoxFromThreeFiber(currentValue)
+ : undefined;
+ if (newSceneBoundingBox) {
+ const center = newSceneBoundingBox.getCenter(new Vector3());
+ const size = newSceneBoundingBox.getSize(new Vector3());
+ const distance = Math.max(size.x, size.y, size.z) * 0.7;
+ const newZoom = defaultZoom;
+ AppEvents.resetCamera.next([center.x, center.y, center.z + distance, newZoom]);
+ }
+ setCurrentLevel(currentValue ?? undefined);
+ setSceneBoundingBox(newSceneBoundingBox);
+ }),
+ );
+ return () => {
+ for (const sub of subs) {
+ sub.unsubscribe();
+ }
+ };
+ }, [defaultZoom]);
+
+ React.useEffect(() => {
+ if (!currentLevel?.images[0]) {
+ setImageUrl(null);
+ return;
+ }
+
+ (async () => {
+ useLoader.preload(TextureLoader, currentLevel.images[0].data);
+ setImageUrl(currentLevel.images[0].data);
+ })();
+
+ buildingMap &&
+ setWaypoints(
+ getPlaces(buildingMap).filter(
+ (p) => p.level === currentLevel.name && p.vertex.name.length > 0,
+ ),
+ );
+ }, [buildingMap, currentLevel]);
+
+ const [robots, setRobots] = React.useState([]);
+ const { current: robotsStore } = React.useRef>({});
+ React.useEffect(() => {
+ (async () => {
+ if (!currentLevel) {
+ return;
+ }
+ const promises = Object.values(fleets).flatMap((fleetState) => {
+ if (!fleetState.name || !fleetState.robots) {
+ return null;
+ }
+ const robotKey = Object.keys(fleetState.robots);
+ const fleetName = fleetState.name;
+ return robotKey.map(async (r) => {
+ const robotId = getRobotId(fleetName, r);
+ const fleetResource: FleetResource | undefined = fleetResources[fleetName];
+ if (robotId in robotsStore) return;
+ robotsStore[robotId] = {
+ fleet: fleetName,
+ name: r,
+ // no model name
+ model: '',
+ scale: fleetResource?.default.scale || DEFAULT_ROBOT_SCALE,
+ footprint: 0.5,
+ color: await colorManager.robotPrimaryColor(fleetName, r, ''),
+ iconPath: fleetResource?.default.icon || undefined,
+ };
+ });
+ });
+ await Promise.all(promises);
+ const newRobots = Object.values(fleets).flatMap((fleetState) => {
+ const robotKey = fleetState.robots ? Object.keys(fleetState.robots) : [];
+ return robotKey
+ ?.filter(
+ (r) =>
+ fleetState.robots &&
+ r in currentLevelOfRobots &&
+ currentLevelOfRobots[r] === currentLevel.name &&
+ `${fleetState.name}/${r}` in robotsStore,
+ )
+ .map((r) => robotsStore[`${fleetState.name}/${r}`]);
+ });
+ setRobots(newRobots);
+ })();
+ }, [fleets, fleetResources, robotsStore, currentLevel, currentLevelOfRobots]);
+
+ const { current: robotLocations } = React.useRef<
+ Record
+ >({});
+ // updates the robot location
+ React.useEffect(() => {
+ const sub = rmfApi.fleetsObs
+ .pipe(
+ switchMap((fleets) =>
+ merge(
+ ...fleets.map((f) =>
+ f.name
+ ? rmfApi
+ .getFleetStateObs(f.name)
+ .pipe(throttleTime(500, undefined, { leading: true, trailing: true }))
+ : EMPTY,
+ ),
+ ),
+ ),
+ )
+ .subscribe((fleetState) => {
+ const fleetName = fleetState.name;
+ if (!fleetName || !fleetState.robots) {
+ console.warn('Map: Fail to update robot location (missing fleet name or robots)');
+ return;
+ }
+ Object.entries(fleetState.robots).forEach(([robotName, robotState]) => {
+ const robotId = getRobotId(fleetName, robotName);
+ if (!robotState.location) {
+ console.warn(`Map: Fail to update robot location for ${robotId} (missing location)`);
+ return;
+ }
+ robotLocations[robotId] = [
+ robotState.location.x,
+ robotState.location.y,
+ robotState.location.yaw,
+ robotState.location.map,
+ ];
+
+ setCurrentLevelOfRobots((prevState) => {
+ if (!robotState.location?.map && prevState.robotName) {
+ console.warn(`Map: Fail to update robot level for ${robotId} (missing map)`);
+ const updatedState = { ...prevState };
+ delete updatedState[robotName];
+ return updatedState;
+ }
+
+ return {
+ ...prevState,
+ [robotName]: robotState.location?.map || '',
+ };
+ });
+ });
+ });
+ return () => sub.unsubscribe();
+ }, [rmfApi, robotLocations]);
+
+ //Accumulate values over time to persist between tabs
+ React.useEffect(() => {
+ const sub = AppEvents.disabledLayers
+ .pipe(scan((acc, value) => ({ ...acc, ...value }), {}))
+ .subscribe((layers) => {
+ setDisabledLayers(layers);
+ });
+ return () => sub.unsubscribe();
+ }, []);
+
+ // zoom to robot on select
+ React.useEffect(() => {
+ const subs: Subscription[] = [];
+
+ // Centering on robot
+ subs.push(
+ AppEvents.robotSelect.subscribe((data) => {
+ if (!data || !sceneBoundingBox) {
+ return;
+ }
+ const [fleetName, robotName] = data;
+ const robotId = getRobotId(fleetName, robotName);
+ const robotLocation = robotLocations[robotId];
+ if (!robotLocation) {
+ console.warn(`Map: Failed to zoom to robot ${robotId} (robot location was not found)`);
+ return;
+ }
+
+ const mapName = robotLocation[3];
+ let newSceneBoundingBox = sceneBoundingBox;
+ if (
+ AppEvents.levelSelect.value &&
+ AppEvents.levelSelect.value.name !== mapName &&
+ buildingMap
+ ) {
+ const robotLevel =
+ buildingMap.levels.find((l: Level) => l.name === mapName) || buildingMap.levels[0];
+ AppEvents.levelSelect.next(robotLevel);
+
+ const robotLevelSceneBoundingBox = findSceneBoundingBoxFromThreeFiber(robotLevel);
+ if (!robotLevelSceneBoundingBox) {
+ return;
+ }
+ newSceneBoundingBox = robotLevelSceneBoundingBox;
+ setSceneBoundingBox(newSceneBoundingBox);
+ }
+
+ const size = newSceneBoundingBox.getSize(new Vector3());
+ const distance = Math.max(size.x, size.y, size.z) * 0.7;
+ const newZoom = props.defaultRobotZoom;
+ AppEvents.resetCamera.next([
+ robotLocation[0],
+ robotLocation[1],
+ robotLocation[2] + distance,
+ newZoom,
+ ]);
+ }),
+ );
+
+ // Centering on door
+ subs.push(
+ AppEvents.doorSelect.subscribe((door) => {
+ if (!door || !sceneBoundingBox) {
+ return;
+ }
+
+ const [mapName, doorInfo] = door;
+
+ let newSceneBoundingBox = sceneBoundingBox;
+ if (
+ AppEvents.levelSelect.value &&
+ AppEvents.levelSelect.value.name !== mapName &&
+ buildingMap
+ ) {
+ const doorLevel =
+ buildingMap.levels.find((l: Level) => l.name === mapName) || buildingMap.levels[0];
+ AppEvents.levelSelect.next(doorLevel);
+
+ const doorLevelSceneBoundingBox = findSceneBoundingBoxFromThreeFiber(doorLevel);
+ if (!doorLevelSceneBoundingBox) {
+ return;
+ }
+ newSceneBoundingBox = doorLevelSceneBoundingBox;
+ setSceneBoundingBox(newSceneBoundingBox);
+ }
+
+ const size = newSceneBoundingBox.getSize(new Vector3());
+ const distance = Math.max(size.x, size.y, size.z) * 0.7;
+ const newZoom = props.defaultRobotZoom;
+ AppEvents.resetCamera.next([
+ (doorInfo.v1_x + doorInfo.v2_x) / 2,
+ (doorInfo.v1_y + doorInfo.v2_y) / 2,
+ distance,
+ newZoom,
+ ]);
+ }),
+ );
+
+ // Centering on lift
+ subs.push(
+ AppEvents.liftSelect.subscribe((lift) => {
+ if (!lift || !sceneBoundingBox) {
+ return;
+ }
+
+ const size = sceneBoundingBox.getSize(new Vector3());
+ const distance = Math.max(size.x, size.y, size.z) * 0.7;
+ const newZoom = props.defaultRobotZoom;
+ AppEvents.resetCamera.next([lift.ref_x, lift.ref_y, distance, newZoom]);
+ }),
+ );
+
+ return () => {
+ for (const sub of subs) {
+ sub.unsubscribe();
+ }
+ };
+ }, [robotLocations, sceneBoundingBox, buildingMap, props.defaultRobotZoom]);
+
+ React.useEffect(() => {
+ if (!sceneBoundingBox) {
+ return;
+ }
+
+ const size = sceneBoundingBox.getSize(new Vector3());
+ setDistance(Math.max(size.x, size.y, size.z) * 0.7);
+ }, [sceneBoundingBox]);
+
+ return buildingMap && currentLevel && robotLocations ? (
+
+ , value: string) => {
+ AppEvents.levelSelect.next(
+ buildingMap.levels.find((l: Level) => l.name === value) || buildingMap.levels[0],
+ );
+ }}
+ handleFullView={() => {
+ if (!sceneBoundingBox) {
+ return;
+ }
+ const center = sceneBoundingBox.getCenter(new Vector3());
+ const size = sceneBoundingBox.getSize(new Vector3());
+ const distance = Math.max(size.x, size.y, size.z) * 0.7;
+ const newZoom = defaultZoom;
+ AppEvents.resetCamera.next([center.x, center.y, center.z + distance, newZoom]);
+ }}
+ handleZoomIn={() => AppEvents.zoomIn.next()}
+ handleZoomOut={() => AppEvents.zoomOut.next()}
+ />
+
+
+ {props.attributionPrefix}
+
+
+
+ {openRobotSummary && selectedRobot && (
+ setOpenRobotSummary(false)} />
+ )}
+ {openDoorSummary && selectedDoor && (
+ setOpenDoorSummary(false)}
+ door={selectedDoor}
+ level={currentLevel}
+ />
+ )}
+
+ {openLiftSummary && selectedLift && (
+ setOpenLiftSummary(false)} lift={selectedLift} />
+ )}
+
+ ) : null;
+})({
+ // This ensures that the resize handle is above the map.
+ '& > .react-resizable-handle': {
+ zIndex: 1001,
+ },
+});
+
+export default Map;
diff --git a/packages/dashboard/src/components/micro-app.tsx b/packages/dashboard/src/components/micro-app.tsx
index 245edc3ec..8dd68d855 100644
--- a/packages/dashboard/src/components/micro-app.tsx
+++ b/packages/dashboard/src/components/micro-app.tsx
@@ -1,26 +1,49 @@
-import React from 'react';
-import { Window } from 'react-components';
+import React, { Suspense } from 'react';
+import { Window, WindowProps } from 'react-components';
-export interface MicroAppProps {
- key: string;
- onClose?: () => void;
+import { useSettings } from '../hooks/use-settings';
+import { Settings } from '../services/settings';
+
+export type MicroAppProps = Omit;
+
+export interface MicroAppManifest {
+ appId: string;
+ displayName: string;
+ Component: React.ComponentType;
}
-export function createMicroApp(
- title: string,
- Component: React.ComponentType<{}>,
-): React.ComponentType {
- return React.memo(
- React.forwardRef(
- (
- { children, ...otherProps }: React.PropsWithChildren,
- ref: React.Ref,
- ) => (
-
-
- ),
- ),
- );
+/**
+ * Creates a micro app from a component. The component must be loaded using dynamic import.
+ * Note that the map should be created in a different module than the component.
+ *
+ * Example:
+ * ```ts
+ * createMicroApp('Map', 'Map', () => import('./map'), config);
+ * ```
+ */
+export function createMicroApp ,
+ );
+ return () => appController.setExtraAppbarItems(null);
+ }, [allowDesignMode, appController, designMode, theme]);
+
+ return (
+ <>
+ {
+ onLayoutChange &&
+ onLayoutChange(
+ newLayout.map((l) => ({ layout: l, microApp: windowApps.current[l.i] })),
+ );
+ setLayout(newLayout);
+ }}
+ designMode={designMode}
+ >
+ {layout.map((l) => {
+ const microApp: MicroAppManifest | undefined = windowApps.current[l.i];
+ if (!microApp) {
+ return null;
+ }
+ return (
+ {
+ const newLayout = layout.filter((l2) => l2.i !== l.i);
+ console.log(layout, newLayout);
+ onLayoutChange &&
+ onLayoutChange(
+ newLayout.map((l) => ({ layout: l, microApp: windowApps.current[l.i] })),
+ );
+ setLayout(newLayout);
+ delete windowApps.current[l.i];
+ }}
+ />
+ );
+ })}
+
+ {layout.length === 0 && allowDesignMode && (
+
- {appName}
-
- ))}
-
-
- );
+
+ Click
+
+ )}
+ {designMode && (
+ <>
+ setAddMenuAnchor(e.currentTarget)}
+ >
+
+
+
+ )}
+
+ );
+ },
+);
+
+interface SavedWorkspaceLayout {
+ layout: WindowLayout;
+ appId: string;
}
-export interface ManagedWorkspaceProps {
- workspaceId: string;
+/**
+ * A workspace that saves the state into `localStorage`.
+ */
+export interface LocallyPersistentWorkspaceProps
+ extends Omit {
+ /**
+ * Default list of windows when there is nothing saved yet.
+ */
+ defaultWindows: InitialWindow[];
+ storageKey: string;
}
-export function ManagedWorkspace({ workspaceId }: ManagedWorkspaceProps) {
- const theme = useTheme();
- const appController = React.useContext(AppControllerContext);
- const [workspaceState, setWorkspaceState] = React.useState(() => {
- const json = localStorage.getItem(`workspace-${workspaceId}`);
- return json ? JSON.parse(json) : { layout: [], windows: [] };
- });
- const [designMode, setDesignMode] = React.useState(false);
-
- React.useEffect(() => {
- appController.setExtraAppbarIcons(
- setDesignMode((prev) => !prev)}
- >
- ,
- );
- return () => appController.setExtraAppbarIcons(null);
- }, [appController, designMode, theme]);
+export const LocallyPersistentWorkspace = ({
+ defaultWindows,
+ storageKey,
+ appRegistry = [],
+ ...otherProps
+}: LocallyPersistentWorkspaceProps) => {
+ const initialWindows = React.useMemo(() => {
+ const json = localStorage.getItem(storageKey);
+ if (!json) {
+ return defaultWindows;
+ }
+ const saved: SavedWorkspaceLayout[] = JSON.parse(json);
+ const loadedLayout: InitialWindow[] = [];
+ for (const s of saved) {
+ const microApp = appRegistry.find((app) => app.appId === s.appId);
+ if (!microApp) {
+ console.warn(`fail to load micro app [${s.appId}]`);
+ continue;
+ }
+ loadedLayout.push({ layout: s.layout, microApp });
+ }
+ return loadedLayout;
+ }, [defaultWindows, storageKey, appRegistry]);
return (
-
- {
- setWorkspaceState(newState);
- localStorage.setItem(`workspace-${workspaceId}`, JSON.stringify(newState));
- }}
- designMode={designMode}
- />
- {workspaceState.windows.length === 0 && (
-
-
- Click
-
- )}
-
+ {
+ localStorage.setItem(
+ storageKey,
+ JSON.stringify(
+ newLayout.map((l) => ({
+ layout: l.layout,
+ appId: l.microApp.appId,
+ })),
+ ),
+ );
+ }}
+ {...otherProps}
+ />
);
-}
+};
diff --git a/packages/dashboard/src/hooks/deferred-context.ts b/packages/dashboard/src/hooks/deferred-context.ts
new file mode 100644
index 000000000..9df111df6
--- /dev/null
+++ b/packages/dashboard/src/hooks/deferred-context.ts
@@ -0,0 +1,27 @@
+import React from 'react';
+
+/**
+ * Creates a context that is initially `null` but is non-nullable when using the value.
+ * A value MUST be provided before any consumer uses it.
+ *
+ * The use of this is to avoid non-null assertions when you know the context is always
+ * available but a default value cannot be provided statically.
+ */
+export function createDeferredContext>(): [
+ () => T,
+ React.Provider,
+] {
+ const context = React.createContext(null!);
+
+ function useContext() {
+ const c = React.useContext(context);
+ if (c == null) {
+ throw Error(
+ 'No value provided in deferred context, ensure that a value is provided before any consumer uses the context',
+ );
+ }
+ return c;
+ }
+
+ return [useContext, context.Provider];
+}
diff --git a/packages/dashboard/src/hooks/use-app-controller.ts b/packages/dashboard/src/hooks/use-app-controller.ts
new file mode 100644
index 000000000..28d3b1d27
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-app-controller.ts
@@ -0,0 +1,12 @@
+import { AlertProps } from '@mui/material';
+
+import { Settings } from '../services/settings';
+import { createDeferredContext } from './deferred-context';
+
+export interface AppController {
+ updateSettings: (settings: Settings) => void;
+ showAlert: (severity: AlertProps['severity'], message: string, autoHideDuration?: number) => void;
+ setExtraAppbarItems: (node: React.ReactNode) => void;
+}
+
+export const [useAppController, AppControllerProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/use-authenticator.ts b/packages/dashboard/src/hooks/use-authenticator.ts
new file mode 100644
index 000000000..d0fd61775
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-authenticator.ts
@@ -0,0 +1,4 @@
+import { Authenticator } from '../services/authenticator';
+import { createDeferredContext } from './deferred-context';
+
+export const [useAuthenticator, AuthenticatorProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/useCreateTaskForm.tsx b/packages/dashboard/src/hooks/use-create-task-form.tsx
similarity index 89%
rename from packages/dashboard/src/hooks/useCreateTaskForm.tsx
rename to packages/dashboard/src/hooks/use-create-task-form.tsx
index 0acbfbe3a..3bb5c66d5 100644
--- a/packages/dashboard/src/hooks/useCreateTaskForm.tsx
+++ b/packages/dashboard/src/hooks/use-create-task-form.tsx
@@ -2,22 +2,22 @@ import React from 'react';
import { getPlaces } from 'react-components';
import { Subscription } from 'rxjs';
-import { RmfIngress } from '../components/rmf-app';
+import { RmfApi } from '../services/rmf-api';
-export const useCreateTaskFormData = (rmf: RmfIngress | undefined) => {
+export const useCreateTaskFormData = (rmfApi: RmfApi | undefined) => {
const [waypointNames, setWaypointNames] = React.useState([]);
const [cleaningZoneNames, setCleaningZoneNames] = React.useState([]);
const [pickupPoints, setPickupPoints] = React.useState>({});
const [dropoffPoints, setDropoffPoints] = React.useState>({});
React.useEffect(() => {
- if (!rmf) {
+ if (!rmfApi) {
return;
}
const subs: Subscription[] = [];
subs.push(
- rmf.buildingMapObs.subscribe((map) => {
+ rmfApi.buildingMapObs.subscribe((map) => {
const places = getPlaces(map);
const waypointNames: string[] = [];
const pickupPoints: Record = {};
@@ -44,7 +44,7 @@ export const useCreateTaskFormData = (rmf: RmfIngress | undefined) => {
);
return () => subs.forEach((s) => s.unsubscribe());
- }, [rmf]);
+ }, [rmfApi]);
return { waypointNames, pickupPoints, dropoffPoints, cleaningZoneNames };
};
diff --git a/packages/dashboard/src/hooks/use-resources.ts b/packages/dashboard/src/hooks/use-resources.ts
new file mode 100644
index 000000000..7e8ad0f87
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-resources.ts
@@ -0,0 +1,33 @@
+import { createDeferredContext } from './deferred-context';
+
+export interface RobotResource {
+ /**
+ * Path to an image to be used as the robot's icon.
+ */
+ icon?: string;
+
+ /**
+ * Scale of the image to match the robot's dimensions.
+ */
+ scale?: number;
+}
+
+export interface FleetResource {
+ // TODO(koonpeng): configure robot resources based on robot model, this will require https://github.com/open-rmf/rmf_api_msgs/blob/main/rmf_api_msgs/schemas/robot_state.json to expose the robot model.
+ // [robotModel: string]: RobotResource;
+ default: RobotResource;
+}
+
+export interface LogoResource {
+ /**
+ * Path to an image to be used as the logo on the app bar.
+ */
+ header: string;
+}
+
+export interface Resources {
+ fleets: { [fleetName: string]: FleetResource };
+ logos: LogoResource;
+}
+
+export const [useResources, ResourcesProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/use-rmf-api.ts b/packages/dashboard/src/hooks/use-rmf-api.ts
new file mode 100644
index 000000000..40ff6e546
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-rmf-api.ts
@@ -0,0 +1,4 @@
+import { RmfApi } from '../services/rmf-api';
+import { createDeferredContext } from './deferred-context';
+
+export const [useRmfApi, RmfApiProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/use-settings.ts b/packages/dashboard/src/hooks/use-settings.ts
new file mode 100644
index 000000000..c1ea65b55
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-settings.ts
@@ -0,0 +1,4 @@
+import { Settings } from '../services/settings';
+import { createDeferredContext } from './deferred-context';
+
+export const [useSettings, SettingsProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/use-task-registry.ts b/packages/dashboard/src/hooks/use-task-registry.ts
new file mode 100644
index 000000000..a65e7451a
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-task-registry.ts
@@ -0,0 +1,21 @@
+import { TaskDefinition } from 'react-components';
+
+import { createDeferredContext } from './deferred-context';
+
+export interface TaskRegistry {
+ /**
+ * List of tasks that can be submitted.
+ */
+ taskDefinitions: TaskDefinition[];
+
+ /**
+ * List of available pickup zones used for delivery tasks.
+ */
+ pickupZones: string[];
+
+ // FIXME(koonpeng): this is used for very specific tasks, should be removed when mission
+ // system is implemented.
+ cartIds: string[];
+}
+
+export const [useTaskRegistry, TaskRegistryProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/use-user-profile.tsx b/packages/dashboard/src/hooks/use-user-profile.tsx
new file mode 100644
index 000000000..bca58a758
--- /dev/null
+++ b/packages/dashboard/src/hooks/use-user-profile.tsx
@@ -0,0 +1,4 @@
+import { UserProfile } from '../services/authenticator';
+import { createDeferredContext } from './deferred-context';
+
+export const [useUserProfile, UserProfileProvider] = createDeferredContext();
diff --git a/packages/dashboard/src/hooks/useFetchUser.tsx b/packages/dashboard/src/hooks/useFetchUser.tsx
deleted file mode 100644
index be4e00570..000000000
--- a/packages/dashboard/src/hooks/useFetchUser.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { RmfIngress } from '../components/rmf-app';
-
-const useGetUsername = (rmf: RmfIngress | undefined) => {
- const [username, setUsername] = React.useState(null);
-
- React.useEffect(() => {
- if (!rmf) {
- return;
- }
-
- const fetchUsername = async () => {
- try {
- const user = (await rmf.defaultApi.getUserUserGet()).data;
- setUsername(user.username);
- } catch (e) {
- console.log(`error getting username: ${(e as Error).message}`);
- }
- };
-
- fetchUsername();
- }, [rmf]);
-
- return username;
-};
-
-export default useGetUsername;
diff --git a/packages/dashboard/src/index.tsx b/packages/dashboard/src/index.tsx
index 62c8c7d2f..41cf0a62e 100644
--- a/packages/dashboard/src/index.tsx
+++ b/packages/dashboard/src/index.tsx
@@ -1,14 +1,6 @@
-import { LocalizationProvider } from 'react-components';
import ReactDOM from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
import App from './app';
const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
-root.render(
-
-
-
- ,
-);
+root.render(;
export const Default: Story = {
storyName: 'LoginPage',
- render: (args) => {
/**
* Note: This redirects to external login page so it will never return.
- * @param successRedirectUri The uri to redirect to after a successful login
+ * @param successRedirectUri The uri to redirect to after a successful login, if not provided, defaults to the current url.
*/
- login(successRedirectUri: string): Promise;
+ login(successRedirectUri?: string): Promise;
/**
* Note: This redirects to external logout page so it will never return.
diff --git a/packages/dashboard/src/services/keycloak.ts b/packages/dashboard/src/services/keycloak.ts
index 32cbfe7ae..399aaf15c 100644
--- a/packages/dashboard/src/services/keycloak.ts
+++ b/packages/dashboard/src/services/keycloak.ts
@@ -45,7 +45,6 @@ export class KeycloakAuthenticator
return false;
}
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
const roles: string[] | undefined = (this._inst.idTokenParsed as any).realm_access?.roles;
if (roles && roles.includes('superuser')) {
return true;
@@ -105,7 +104,7 @@ export class KeycloakAuthenticator
return;
}
- async login(successRedirectUri: string): Promise {
+ async login(successRedirectUri?: string): Promise {
await this._inst.login({
redirectUri: successRedirectUri,
});
diff --git a/packages/dashboard/src/services/rmf-api.ts b/packages/dashboard/src/services/rmf-api.ts
new file mode 100644
index 000000000..fce9028a3
--- /dev/null
+++ b/packages/dashboard/src/services/rmf-api.ts
@@ -0,0 +1,331 @@
+import {
+ AdminApi,
+ AlertRequest,
+ AlertResponse,
+ AlertsApi,
+ BeaconsApi,
+ BeaconState,
+ BuildingApi,
+ BuildingMap,
+ Configuration,
+ DefaultApi,
+ DeliveryAlert,
+ DeliveryAlertsApi,
+ Dispenser,
+ DispensersApi,
+ DispenserState,
+ Door,
+ DoorsApi,
+ DoorState,
+ FleetsApi,
+ FleetState,
+ Ingestor,
+ IngestorsApi,
+ IngestorState,
+ Lift,
+ LiftsApi,
+ LiftState,
+ SioClient,
+ Subscription as SioSubscription,
+ TasksApi,
+ TaskStateOutput as TaskState,
+} from 'api-client';
+import axios from 'axios';
+import { EMPTY, map, Observable, of, shareReplay, switchAll, switchMap } from 'rxjs';
+
+import { Authenticator } from './authenticator';
+import { NegotiationStatusManager } from './negotiation-status-manager';
+import { DefaultTrajectoryManager, RobotTrajectoryManager } from './robot-trajectory-manager';
+
+export interface RmfApi {
+ beaconsApi: BeaconsApi;
+ buildingApi: BuildingApi;
+ defaultApi: DefaultApi;
+ doorsApi: DoorsApi;
+ liftsApi: LiftsApi;
+ dispensersApi: DispensersApi;
+ ingestorsApi: IngestorsApi;
+ fleetsApi: FleetsApi;
+ tasksApi: TasksApi;
+ alertsApi: AlertsApi;
+ adminApi: AdminApi;
+ deliveryAlertsApi: DeliveryAlertsApi;
+ negotiationStatusManager?: NegotiationStatusManager;
+ trajectoryManager?: RobotTrajectoryManager;
+
+ buildingMapObs: Observable;
+ beaconsObsStore: Observable;
+ doorsObs: Observable;
+ getDoorStateObs(name: string): Observable;
+ liftsObs: Observable;
+ getLiftStateObs(name: string): Observable;
+ dispensersObs: Observable;
+ getDispenserStateObs(guid: string): Observable;
+ ingestorsObs: Observable;
+ getIngestorStateObs(guid: string): Observable;
+ fleetsObs: Observable;
+ getFleetStateObs(name: string): Observable;
+ getTaskStateObs(taskId: string): Observable;
+ alertRequestsObsStore: Observable;
+ alertResponsesObsStore: Observable;
+ deliveryAlertObsStore: Observable;
+}
+
+export class DefaultRmfApi implements RmfApi {
+ private _sioClient: Observable;
+
+ beaconsApi: BeaconsApi;
+ buildingApi: BuildingApi;
+ defaultApi: DefaultApi;
+ doorsApi: DoorsApi;
+ liftsApi: LiftsApi;
+ dispensersApi: DispensersApi;
+ ingestorsApi: IngestorsApi;
+ fleetsApi: FleetsApi;
+ tasksApi: TasksApi;
+ alertsApi: AlertsApi;
+ adminApi: AdminApi;
+ deliveryAlertsApi: DeliveryAlertsApi;
+ negotiationStatusManager?: NegotiationStatusManager;
+ trajectoryManager?: RobotTrajectoryManager;
+
+ constructor(
+ private apiServerUrl: string,
+ trajectoryServerUrl: string,
+ private authenticator: Authenticator,
+ ) {
+ // This ensures that old connections are disconnected. `this._makeSioClient` returns an
+ // observable of `SioClient` that disconnects when it is unsubscribed. `switchAll` will
+ // unsubscribe and switch to the new observable when the user changes.
+ this._sioClient = new Observable>((subscriber) => {
+ subscriber.next(this._makeSioClient());
+ this.authenticator.on('userChanged', () => subscriber.next(this._makeSioClient()));
+ }).pipe(switchAll(), shareReplay(1));
+
+ // the axios swagger generator is bugged, it does not properly attach the token so we have
+ // to manually add them.
+ const axiosInst = axios.create();
+ axiosInst.interceptors.request.use(
+ async (req) => {
+ await authenticator.refreshToken();
+ const token = authenticator.token;
+ if (!token) {
+ return req;
+ }
+ req.headers['Authorization'] = `Bearer ${token}`;
+ return req;
+ },
+ (error) => {
+ console.error(`Axios request error: ${error}`);
+ },
+ );
+ axiosInst.interceptors.response.use(
+ (response) => response,
+ (error) => {
+ console.error(`Axios response error: ${error}`);
+ if (error.response.status === 401) {
+ window.location.href = '/';
+ }
+ },
+ );
+ const apiConfig = new Configuration({
+ accessToken: authenticator.token,
+ basePath: apiServerUrl,
+ });
+
+ this.beaconsApi = new BeaconsApi(apiConfig, undefined, axiosInst);
+ this.buildingApi = new BuildingApi(apiConfig, undefined, axiosInst);
+ this.defaultApi = new DefaultApi(apiConfig, undefined, axiosInst);
+ this.doorsApi = new DoorsApi(apiConfig, undefined, axiosInst);
+ this.liftsApi = new LiftsApi(apiConfig, undefined, axiosInst);
+ this.dispensersApi = new DispensersApi(apiConfig, undefined, axiosInst);
+ this.ingestorsApi = new IngestorsApi(apiConfig, undefined, axiosInst);
+ this.fleetsApi = new FleetsApi(apiConfig, undefined, axiosInst);
+ this.tasksApi = new TasksApi(apiConfig, undefined, axiosInst);
+ this.alertsApi = new AlertsApi(apiConfig, undefined, axiosInst);
+ this.adminApi = new AdminApi(apiConfig, undefined, axiosInst);
+ this.deliveryAlertsApi = new DeliveryAlertsApi(apiConfig, undefined, axiosInst);
+
+ this.buildingMapObs = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeBuildingMap(handler),
+ );
+
+ this.beaconsObsStore = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeBeaconState(handler),
+ );
+
+ this.doorsObs = this.buildingMapObs.pipe(
+ map((buildingMap) => buildingMap.levels.flatMap((level) => level.doors)),
+ );
+
+ this.liftsObs = this.buildingMapObs.pipe(map((buildingMap) => buildingMap.lifts));
+
+ this.dispensersObs = new Observable((subscriber) => {
+ (async () => {
+ const dispensers = (await this.dispensersApi.getDispensersDispensersGet()).data;
+ subscriber.next(dispensers);
+ })();
+ }).pipe(shareReplay(1));
+
+ this.ingestorsObs = new Observable((subscriber) => {
+ (async () => {
+ const ingestors = (await this.ingestorsApi.getIngestorsIngestorsGet()).data;
+ subscriber.next(ingestors);
+ })();
+ }).pipe(shareReplay(1));
+
+ this.fleetsObs = new Observable((subscriber) => {
+ (async () => {
+ const fleets = (await this.fleetsApi.getFleetsFleetsGet()).data;
+ subscriber.next(fleets);
+ })();
+ }).pipe(shareReplay(1));
+
+ this.alertRequestsObsStore = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeAlertRequests(handler),
+ );
+
+ this.alertResponsesObsStore = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeAlertResponses(handler),
+ );
+
+ this.deliveryAlertObsStore = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeDeliveryAlerts(handler),
+ );
+
+ try {
+ const ws = new WebSocket(trajectoryServerUrl);
+ this.trajectoryManager = new DefaultTrajectoryManager(ws, authenticator);
+ this.negotiationStatusManager = new NegotiationStatusManager(ws, authenticator);
+ } catch (e) {
+ const errorMessage = `Failed to connect to trajectory server at [${trajectoryServerUrl}], ${
+ (e as Error).message
+ }`;
+ console.error(errorMessage);
+ return;
+ }
+ }
+
+ private _makeSioClient(): Observable {
+ if (!this.authenticator.user) {
+ return of(null);
+ }
+
+ return new Observable((subscriber) => {
+ const url = new URL(this.apiServerUrl);
+ const path = url.pathname === '/' ? '' : url.pathname;
+ const options: ConstructorParameters[1] = {
+ path: `${path}/socket.io`,
+ };
+ options.auth = async (cb) => {
+ await this.authenticator.refreshToken();
+ if (this.authenticator.token) {
+ cb({ token: this.authenticator.token });
+ } else {
+ cb({});
+ }
+ };
+ const sioClient = new SioClient(url.origin, options);
+ sioClient.sio.on('error', console.error);
+ subscriber.next(sioClient);
+ return () => sioClient.sio.disconnect();
+ });
+ }
+
+ private _convertSioToRxObs(
+ sioSubscribe: (sioClient: SioClient, handler: (data: T) => void) => SioSubscription,
+ ): Observable {
+ return this._sioClient.pipe(
+ switchMap((sioClient) => {
+ if (!sioClient) {
+ return EMPTY;
+ }
+ return new Observable((subscriber) => {
+ let sioSub: SioSubscription | null = null;
+ const onConnect = () => {
+ sioSub = sioSubscribe(sioClient, subscriber.next.bind(subscriber));
+ };
+ onConnect();
+ sioClient.sio.on('connect', onConnect);
+ return () => {
+ sioSub && sioClient.unsubscribe(sioSub);
+ sioClient.sio.off('connect', onConnect);
+ };
+ });
+ }),
+ shareReplay(1),
+ );
+ }
+
+ buildingMapObs: Observable;
+ beaconsObsStore: Observable;
+ doorsObs: Observable;
+
+ private _doorStateObsStore: Record> = {};
+ getDoorStateObs(name: string): Observable {
+ if (!this._doorStateObsStore[name]) {
+ this._doorStateObsStore[name] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeDoorState(name, handler),
+ );
+ }
+ return this._doorStateObsStore[name];
+ }
+
+ liftsObs: Observable;
+ private _liftStateObsStore: Record> = {};
+ getLiftStateObs(name: string): Observable {
+ if (!this._liftStateObsStore[name]) {
+ this._liftStateObsStore[name] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeLiftState(name, handler),
+ );
+ }
+ return this._liftStateObsStore[name];
+ }
+
+ dispensersObs: Observable;
+ private _dispenserStateObsStore: Record> = {};
+ getDispenserStateObs(guid: string): Observable {
+ if (!this._dispenserStateObsStore[guid]) {
+ this._dispenserStateObsStore[guid] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeDispenserState(guid, handler),
+ );
+ }
+ return this._dispenserStateObsStore[guid];
+ }
+
+ ingestorsObs: Observable;
+ private _ingestorStateObsStore: Record> = {};
+ getIngestorStateObs(guid: string): Observable {
+ if (!this._ingestorStateObsStore[guid]) {
+ this._ingestorStateObsStore[guid] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeIngestorState(guid, handler),
+ );
+ }
+ return this._ingestorStateObsStore[guid];
+ }
+
+ fleetsObs: Observable;
+ private _fleetStateObsStore: Record> = {};
+ getFleetStateObs(name: string): Observable {
+ if (!this._fleetStateObsStore[name]) {
+ this._fleetStateObsStore[name] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeFleetState(name, handler),
+ );
+ }
+ return this._fleetStateObsStore[name];
+ }
+
+ private _taskStateObsStore: Record> = {};
+ getTaskStateObs(taskId: string): Observable {
+ if (!this._taskStateObsStore[taskId]) {
+ this._taskStateObsStore[taskId] = this._convertSioToRxObs((sioClient, handler) =>
+ sioClient.subscribeTaskState(taskId, handler),
+ );
+ }
+ return this._taskStateObsStore[taskId];
+ }
+
+ alertRequestsObsStore: Observable;
+ alertResponsesObsStore: Observable;
+ deliveryAlertObsStore: Observable;
+}
diff --git a/packages/dashboard/src/services/rmf-ingress.ts b/packages/dashboard/src/services/rmf-ingress.ts
deleted file mode 100644
index f68cfbf84..000000000
--- a/packages/dashboard/src/services/rmf-ingress.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import {
- AdminApi,
- AlertRequest,
- AlertResponse,
- AlertsApi,
- BeaconsApi,
- BeaconState,
- BuildingApi,
- BuildingMap,
- Configuration,
- DefaultApi,
- DeliveryAlert,
- DeliveryAlertsApi,
- Dispenser,
- DispensersApi,
- DispenserState,
- Door,
- DoorsApi,
- DoorState,
- FleetsApi,
- FleetState,
- Ingestor,
- IngestorsApi,
- IngestorState,
- Lift,
- LiftsApi,
- LiftState,
- SioClient,
- Subscription as SioSubscription,
- TasksApi,
- TaskStateOutput as TaskState,
-} from 'api-client';
-import axios from 'axios';
-import { map, Observable, shareReplay } from 'rxjs';
-
-import { AppConfig } from '../app-config';
-import { Authenticator } from './authenticator';
-import { NegotiationStatusManager } from './negotiation-status-manager';
-import { DefaultTrajectoryManager, RobotTrajectoryManager } from './robot-trajectory-manager';
-
-export class RmfIngress {
- // This should be private because socketio does not support "replaying" subscription. If
- // subscription is made before the one made by the observables, the replays will not work
- // correctly.
- private _sioClient: SioClient;
-
- beaconsApi: BeaconsApi;
- buildingApi: BuildingApi;
- defaultApi: DefaultApi;
- doorsApi: DoorsApi;
- liftsApi: LiftsApi;
- dispensersApi: DispensersApi;
- ingestorsApi: IngestorsApi;
- fleetsApi: FleetsApi;
- tasksApi: TasksApi;
- alertsApi: AlertsApi;
- adminApi: AdminApi;
- deliveryAlertsApi: DeliveryAlertsApi;
- negotiationStatusManager?: NegotiationStatusManager;
- trajectoryManager?: RobotTrajectoryManager;
-
- constructor(appConfig: AppConfig, authenticator: Authenticator) {
- if (!authenticator.user) {
- throw new Error(
- 'user is undefined, RmfIngress should only be initialized after the authenticator is ready',
- );
- }
-
- this._sioClient = (() => {
- const token = authenticator.token;
- const url = new URL(appConfig.rmfServerUrl);
- const path = url.pathname === '/' ? '' : url.pathname;
-
- const options: ConstructorParameters[1] = {
- path: `${path}/socket.io`,
- };
- if (token) {
- options.auth = { token };
- }
- return new SioClient(url.origin, options);
- })();
- this._sioClient.sio.on('error', console.error);
-
- // the axios swagger generator is bugged, it does not properly attach the token so we have
- // to manually add them.
- const axiosInst = axios.create();
- axiosInst.interceptors.request.use(
- async (req) => {
- await authenticator.refreshToken();
- const token = authenticator.token;
- if (!token) {
- return req;
- }
- req.headers['Authorization'] = `Bearer ${token}`;
- return req;
- },
- (error) => {
- console.error(`Axios request error: ${error}`);
- },
- );
- axiosInst.interceptors.response.use(
- (response) => response,
- (error) => {
- console.error(`Axios response error: ${error}`);
- if (error.response.status === 401) {
- window.location.href = '/';
- }
- },
- );
- const apiConfig = new Configuration({
- accessToken: authenticator.token,
- basePath: appConfig.rmfServerUrl,
- });
-
- this.beaconsApi = new BeaconsApi(apiConfig, undefined, axiosInst);
- this.buildingApi = new BuildingApi(apiConfig, undefined, axiosInst);
- this.defaultApi = new DefaultApi(apiConfig, undefined, axiosInst);
- this.doorsApi = new DoorsApi(apiConfig, undefined, axiosInst);
- this.liftsApi = new LiftsApi(apiConfig, undefined, axiosInst);
- this.dispensersApi = new DispensersApi(apiConfig, undefined, axiosInst);
- this.ingestorsApi = new IngestorsApi(apiConfig, undefined, axiosInst);
- this.fleetsApi = new FleetsApi(apiConfig, undefined, axiosInst);
- this.tasksApi = new TasksApi(apiConfig, undefined, axiosInst);
- this.alertsApi = new AlertsApi(apiConfig, undefined, axiosInst);
- this.adminApi = new AdminApi(apiConfig, undefined, axiosInst);
- this.deliveryAlertsApi = new DeliveryAlertsApi(apiConfig, undefined, axiosInst);
-
- try {
- const ws = new WebSocket(appConfig.trajectoryServerUrl);
- this.trajectoryManager = new DefaultTrajectoryManager(ws, authenticator);
- this.negotiationStatusManager = new NegotiationStatusManager(ws, authenticator);
- } catch (e) {
- const errorMessage = `Failed to connect to trajectory server at [${appConfig.trajectoryServerUrl}], ${
- (e as Error).message
- }`;
- console.error(errorMessage);
- return;
- }
- }
-
- private _convertSioToRxObs(
- sioSubscribe: (handler: (data: T) => void) => SioSubscription,
- ): Observable {
- return new Observable((subscriber) => {
- let sioSub: SioSubscription | null = null;
- const onConnect = () => {
- sioSub = sioSubscribe(subscriber.next.bind(subscriber));
- };
- onConnect();
- this._sioClient.sio.on('connect', onConnect);
- return () => {
- sioSub && this._sioClient.unsubscribe(sioSub);
- this._sioClient.sio.off('connect', onConnect);
- };
- }).pipe(shareReplay(1));
- }
-
- buildingMapObs: Observable = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeBuildingMap(handler),
- );
-
- beaconsObsStore: Observable = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeBeaconState(handler),
- );
-
- doorsObs: Observable = this.buildingMapObs.pipe(
- map((buildingMap) => buildingMap.levels.flatMap((level) => level.doors)),
- );
-
- private _doorStateObsStore: Record> = {};
- getDoorStateObs(name: string): Observable {
- if (!this._doorStateObsStore[name]) {
- this._doorStateObsStore[name] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeDoorState(name, handler),
- );
- }
- return this._doorStateObsStore[name];
- }
-
- liftsObs: Observable = this.buildingMapObs.pipe(map((buildingMap) => buildingMap.lifts));
-
- private _liftStateObsStore: Record> = {};
- getLiftStateObs(name: string): Observable {
- if (!this._liftStateObsStore[name]) {
- this._liftStateObsStore[name] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeLiftState(name, handler),
- );
- }
- return this._liftStateObsStore[name];
- }
-
- dispensersObs: Observable = new Observable((subscriber) => {
- (async () => {
- const dispensers = (await this.dispensersApi.getDispensersDispensersGet()).data;
- subscriber.next(dispensers);
- })();
- }).pipe(shareReplay(1));
-
- private _dispenserStateObsStore: Record> = {};
- getDispenserStateObs(guid: string): Observable {
- if (!this._dispenserStateObsStore[guid]) {
- this._dispenserStateObsStore[guid] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeDispenserState(guid, handler),
- );
- }
- return this._dispenserStateObsStore[guid];
- }
-
- ingestorsObs: Observable = new Observable((subscriber) => {
- (async () => {
- const ingestors = (await this.ingestorsApi.getIngestorsIngestorsGet()).data;
- subscriber.next(ingestors);
- })();
- }).pipe(shareReplay(1));
-
- private _ingestorStateObsStore: Record> = {};
- getIngestorStateObs(guid: string): Observable {
- if (!this._ingestorStateObsStore[guid]) {
- this._ingestorStateObsStore[guid] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeIngestorState(guid, handler),
- );
- }
- return this._ingestorStateObsStore[guid];
- }
-
- fleetsObs: Observable = new Observable((subscriber) => {
- (async () => {
- const fleets = (await this.fleetsApi.getFleetsFleetsGet()).data;
- subscriber.next(fleets);
- })();
- }).pipe(shareReplay(1));
-
- private _fleetStateObsStore: Record> = {};
- getFleetStateObs(name: string): Observable {
- if (!this._fleetStateObsStore[name]) {
- this._fleetStateObsStore[name] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeFleetState(name, handler),
- );
- }
- return this._fleetStateObsStore[name];
- }
-
- private _taskStateObsStore: Record> = {};
- getTaskStateObs(taskId: string): Observable {
- if (!this._taskStateObsStore[taskId]) {
- this._taskStateObsStore[taskId] = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeTaskState(taskId, handler),
- );
- }
- return this._taskStateObsStore[taskId];
- }
-
- alertRequestsObsStore: Observable = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeAlertRequests(handler),
- );
-
- alertResponsesObsStore: Observable = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeAlertResponses(handler),
- );
-
- deliveryAlertObsStore: Observable = this._convertSioToRxObs((handler) =>
- this._sioClient.subscribeDeliveryAlerts(handler),
- );
-}
diff --git a/packages/dashboard/src/services/settings.ts b/packages/dashboard/src/services/settings.ts
index 9ad7cf8da..fb51f9e4e 100644
--- a/packages/dashboard/src/services/settings.ts
+++ b/packages/dashboard/src/services/settings.ts
@@ -1,7 +1,8 @@
-export type ThemeMode = 'default';
+export type ThemeMode = 'default' | 'dark';
export interface Settings {
themeMode: ThemeMode;
+ microAppSettings: { [k: string]: unknown };
}
export function saveSettings(settings: Settings): void {
@@ -11,13 +12,12 @@ export function saveSettings(settings: Settings): void {
export function loadSettings(): Settings {
const settingsStr = localStorage.getItem('settings');
if (!settingsStr) {
- return defaultSettings();
+ return defaultSettings;
}
return JSON.parse(settingsStr);
}
-export function defaultSettings(): Settings {
- return {
- themeMode: 'default',
- };
-}
+const defaultSettings: Settings = {
+ themeMode: 'default',
+ microAppSettings: {},
+};
diff --git a/packages/dashboard/src/utils/test-utils.test.tsx b/packages/dashboard/src/utils/test-utils.test.tsx
index 495c6bfe5..15979e284 100644
--- a/packages/dashboard/src/utils/test-utils.test.tsx
+++ b/packages/dashboard/src/utils/test-utils.test.tsx
@@ -1,13 +1,51 @@
import '@testing-library/dom';
-import { ThemeProvider } from '@mui/material/styles';
import { render as render_, RenderOptions as RenderOptions_ } from '@testing-library/react';
+import {
+ AdminApi,
+ AlertRequest,
+ AlertResponse,
+ AlertsApi,
+ BeaconsApi,
+ BeaconState,
+ BuildingApi,
+ BuildingMap,
+ DefaultApi,
+ DeliveryAlert,
+ DeliveryAlertsApi,
+ Dispenser,
+ DispensersApi,
+ DispenserState,
+ Door,
+ DoorsApi,
+ DoorState,
+ FleetsApi,
+ FleetState,
+ Ingestor,
+ IngestorsApi,
+ IngestorState,
+ Lift,
+ LiftsApi,
+ LiftState,
+ TasksApi,
+ TaskStateOutput,
+} from 'api-client';
+import axios from 'axios';
import React from 'react';
-import { rmfLight } from 'react-components';
-import { MemoryRouter } from 'react-router';
+import { Subject } from 'rxjs';
+import { vi } from 'vitest';
-import { UserProfileContext } from '../components/user-profile-provider';
+import { AppController, AppControllerProvider } from '../hooks/use-app-controller';
+import { AuthenticatorProvider } from '../hooks/use-authenticator';
+import { Resources, ResourcesProvider } from '../hooks/use-resources';
+import { RmfApiProvider } from '../hooks/use-rmf-api';
+import { SettingsProvider } from '../hooks/use-settings';
+import { TaskRegistry, TaskRegistryProvider } from '../hooks/use-task-registry';
+import { UserProfileProvider } from '../hooks/use-user-profile';
import { UserProfile } from '../services/authenticator';
+import { RmfApi } from '../services/rmf-api';
+import { Settings } from '../services/settings';
+import StubAuthenticator from '../services/stub-authenticator';
export const superUser: UserProfile = {
user: {
@@ -18,23 +56,120 @@ export const superUser: UserProfile = {
permissions: [],
};
-export interface TestProivderProps {
+export function makeMockAppController(): AppController {
+ return {
+ updateSettings: vi.fn(),
+ showAlert: vi.fn(),
+ setExtraAppbarItems: vi.fn(),
+ };
+}
+
+export class MockRmfApi implements RmfApi {
+ axiosInst = axios.create({
+ adapter: (config) =>
+ Promise.reject({ config, data: null, headers: {}, status: 500, statusText: '' }),
+ });
+ beaconsApi = new BeaconsApi(undefined, undefined, this.axiosInst);
+ buildingApi = new BuildingApi(undefined, undefined, this.axiosInst);
+ defaultApi = new DefaultApi(undefined, undefined, this.axiosInst);
+ doorsApi = new DoorsApi(undefined, undefined, this.axiosInst);
+ liftsApi = new LiftsApi(undefined, undefined, this.axiosInst);
+ dispensersApi = new DispensersApi(undefined, undefined, this.axiosInst);
+ ingestorsApi = new IngestorsApi(undefined, undefined, this.axiosInst);
+ fleetsApi = new FleetsApi(undefined, undefined, this.axiosInst);
+ tasksApi = new TasksApi(undefined, undefined, this.axiosInst);
+ alertsApi = new AlertsApi(undefined, undefined, this.axiosInst);
+ adminApi = new AdminApi(undefined, undefined, this.axiosInst);
+ deliveryAlertsApi = new DeliveryAlertsApi(undefined, undefined, this.axiosInst);
+ negotiationStatusManager = undefined;
+ trajectoryManager = undefined;
+ buildingMapObs = new Subject();
+ beaconsObsStore = new Subject();
+ doorsObs = new Subject();
+ doorStateObsStore: Record> = {};
+ getDoorStateObs(name: string) {
+ return this._cacheObs(this.doorStateObsStore, name);
+ }
+ liftsObs = new Subject();
+ liftStateObsStore: Record> = {};
+ getLiftStateObs(name: string) {
+ return this._cacheObs(this.liftStateObsStore, name);
+ }
+ dispensersObs = new Subject();
+ dispenserStateObsStore: Record> = {};
+ getDispenserStateObs(guid: string) {
+ return this._cacheObs(this.dispenserStateObsStore, guid);
+ }
+ ingestorsObs = new Subject();
+ ingestorStateObsStore: Record> = {};
+ getIngestorStateObs(guid: string) {
+ return this._cacheObs(this.ingestorStateObsStore, guid);
+ }
+ fleetsObs = new Subject();
+ fleetStateObsStore: Record> = {};
+ getFleetStateObs(name: string) {
+ return this._cacheObs(this.fleetStateObsStore, name);
+ }
+ taskStateObsStore: Record> = {};
+ getTaskStateObs(taskId: string) {
+ return this._cacheObs(this.taskStateObsStore, taskId);
+ }
+ alertRequestsObsStore = new Subject();
+ alertResponsesObsStore = new Subject();
+ deliveryAlertObsStore = new Subject();
+
+ private _cacheObs(store: Record>, key: string): Subject {
+ if (!(key in store)) {
+ store[key] = new Subject();
+ }
+ return store[key];
+ }
+}
+
+export interface TestProviderProps {
profile?: UserProfile;
+ children?: React.ReactNode;
}
/**
* Provides contexts required for routing and theming.
*/
-export const TestProviders: React.FC> = ({
- profile = superUser,
- children,
-}) => {
+export const TestProviders = ({ profile = superUser, children }: TestProviderProps) => {
+ const authenticator = React.useMemo(() => new StubAuthenticator(), []);
+ const resources = React.useMemo(
+ () => ({
+ fleets: {},
+ logos: {
+ header: '/test-logo.png',
+ },
+ }),
+ [],
+ );
+ const taskRegistry = React.useMemo(
+ () => ({ taskDefinitions: [], pickupZones: [], cartIds: [] }),
+ [],
+ );
+ const settings = React.useMemo(
+ () => ({ themeMode: 'default', microAppSettings: {} }),
+ [],
+ );
+ const rmfApi = React.useMemo(() => new MockRmfApi(), []);
+ const appController = React.useMemo(() => makeMockAppController(), []);
+
return (
-
-
- {children}
-
-
+
+
+
+
+
+
+ {children}
+
+
+
+
+
+
);
};
diff --git a/packages/dashboard/tsconfig.app.json b/packages/dashboard/tsconfig.app.json
index 1babef830..e61d21a5b 100644
--- a/packages/dashboard/tsconfig.app.json
+++ b/packages/dashboard/tsconfig.app.json
@@ -21,7 +21,11 @@
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
- "noFallthroughCasesInSwitch": true
+ "noFallthroughCasesInSwitch": true,
+
+ "paths": {
+ "rmf-dashboard/*": ["./src/*"]
+ }
},
- "include": ["src", "app-config.json"]
+ "include": ["src", "examples", "app-config.json"]
}
diff --git a/packages/react-components/lib/doors/door-table-datagrid.tsx b/packages/react-components/lib/doors/door-table-datagrid.tsx
index bb0d1af71..d8481cbe7 100644
--- a/packages/react-components/lib/doors/door-table-datagrid.tsx
+++ b/packages/react-components/lib/doors/door-table-datagrid.tsx
@@ -232,32 +232,28 @@ export function DoorDataGridTable({ doors, onDoorClick }: DoorDataGridTableProps
];
return (
- l.index}
+ rows={doors}
+ pageSize={5}
+ rowHeight={38}
+ columns={columns}
+ rowsPerPageOptions={[5]}
+ sx={{
+ fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
+ }}
+ autoPageSize={isScreenHeightLessThan800}
+ density={isScreenHeightLessThan800 ? 'compact' : 'standard'}
+ localeText={{
+ noRowsLabel: 'No doors available.',
+ }}
+ onRowClick={handleEvent}
+ initialState={{
+ sorting: {
+ sortModel: [{ field: 'doorName', sort: 'asc' }],
+ },
+ }}
+ disableVirtualization={true}
+ />
);
}
diff --git a/packages/react-components/lib/lifts/lift-table-datagrid.tsx b/packages/react-components/lib/lifts/lift-table-datagrid.tsx
index c5055ef70..b59bbdd6b 100644
--- a/packages/react-components/lib/lifts/lift-table-datagrid.tsx
+++ b/packages/react-components/lib/lifts/lift-table-datagrid.tsx
@@ -236,31 +236,28 @@ export function LiftDataGridTable({ lifts, onLiftClick }: LiftDataGridTableProps
];
return (
- l.index}
+ rows={lifts}
+ pageSize={5}
+ rowHeight={38}
+ columns={columns}
+ rowsPerPageOptions={[5]}
+ sx={{
+ fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
+ }}
+ autoPageSize={isScreenHeightLessThan800}
+ density={isScreenHeightLessThan800 ? 'compact' : 'standard'}
+ localeText={{
+ noRowsLabel: 'No lifts available.',
+ }}
+ onRowClick={handleEvent}
+ initialState={{
+ sorting: {
+ sortModel: [{ field: 'name', sort: 'asc' }],
+ },
+ }}
+ disableVirtualization={true}
+ />
);
}
diff --git a/packages/react-components/lib/react-three-fiber-hack.d.ts b/packages/react-components/lib/react-three-fiber-hack.d.ts
new file mode 100644
index 000000000..f0d7d64bc
--- /dev/null
+++ b/packages/react-components/lib/react-three-fiber-hack.d.ts
@@ -0,0 +1,22 @@
+// hack to export only the intrinsic elements that we use
+import { ThreeElements } from '@react-three/fiber';
+
+declare global {
+ namespace JSX {
+ interface IntrinsicElements
+ extends Pick<
+ ThreeElements,
+ | 'mesh'
+ | 'planeGeometry'
+ | 'meshStandardMaterial'
+ | 'meshBasicMaterial'
+ | 'group'
+ | 'boxGeometry'
+ | 'shaderMaterial'
+ | 'instancedMesh'
+ | 'meshPhysicalMaterial'
+ | 'pointsMaterial'
+ | 'points'
+ > {}
+ }
+}
diff --git a/packages/react-components/lib/robots/mutex-group-table.tsx b/packages/react-components/lib/robots/mutex-group-table.tsx
index 1a613d971..5f48bbea6 100644
--- a/packages/react-components/lib/robots/mutex-group-table.tsx
+++ b/packages/react-components/lib/robots/mutex-group-table.tsx
@@ -68,7 +68,6 @@ export function MutexGroupTable({
return (
r.name}
rows={mutexGroups}
pageSize={5}
diff --git a/packages/react-components/lib/robots/robot-table-datagrid.tsx b/packages/react-components/lib/robots/robot-table-datagrid.tsx
index 66bc743ae..11afe6b7f 100644
--- a/packages/react-components/lib/robots/robot-table-datagrid.tsx
+++ b/packages/react-components/lib/robots/robot-table-datagrid.tsx
@@ -166,7 +166,6 @@ export function RobotDataGridTable({ onRobotClick, robots }: RobotDataGridTableP
return (
r.name}
rows={robots}
pageSize={5}
diff --git a/packages/react-components/lib/tasks/task-table-datagrid.tsx b/packages/react-components/lib/tasks/task-table-datagrid.tsx
index d91933e20..f4fe741f1 100644
--- a/packages/react-components/lib/tasks/task-table-datagrid.tsx
+++ b/packages/react-components/lib/tasks/task-table-datagrid.tsx
@@ -378,7 +378,6 @@ export function TaskDataGridTable({
return (
r.state.booking.id}
rows={taskData}
rowCount={tasks.total}
diff --git a/packages/react-components/lib/transfer-list.tsx b/packages/react-components/lib/transfer-list.tsx
index ec12afb5c..98c365e34 100644
--- a/packages/react-components/lib/transfer-list.tsx
+++ b/packages/react-components/lib/transfer-list.tsx
@@ -88,7 +88,7 @@ function CustomList({ title, items, checked, setChecked }: CustomListProps) {
subheader={`${numberOfChecked}/${items.length} selected`}
/>
( + appId: string, + displayName: string, + loadComponent: () => Promise<{ default: React.ComponentType
}>, + props: (settings: Settings) => React.PropsWithoutRef
& React.Attributes,
+): MicroAppManifest {
+ const LazyComponent = React.lazy(loadComponent);
+ return {
+ appId,
+ displayName,
+ Component: React.forwardRef
- l.index}
- rows={doors}
- pageSize={5}
- rowHeight={38}
- columns={columns}
- rowsPerPageOptions={[5]}
- sx={{
- fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
- overflowX: 'scroll',
- }}
- autoPageSize={isScreenHeightLessThan800}
- density={isScreenHeightLessThan800 ? 'compact' : 'standard'}
- localeText={{
- noRowsLabel: 'No doors available.',
- }}
- onRowClick={handleEvent}
- initialState={{
- sorting: {
- sortModel: [{ field: 'doorName', sort: 'asc' }],
- },
- }}
- disableVirtualization={true}
- />
-
+
- l.index}
- rows={lifts}
- pageSize={5}
- rowHeight={38}
- columns={columns}
- rowsPerPageOptions={[5]}
- sx={{
- fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
- }}
- autoPageSize={isScreenHeightLessThan800}
- density={isScreenHeightLessThan800 ? 'compact' : 'standard'}
- localeText={{
- noRowsLabel: 'No lifts available.',
- }}
- onRowClick={handleEvent}
- initialState={{
- sorting: {
- sortModel: [{ field: 'name', sort: 'asc' }],
- },
- }}
- disableVirtualization={true}
- />
-
+ -
+
-
{items.map((item) => {
const labelId = `transfer-list-all-item-${item}-label`;
diff --git a/packages/react-components/lib/window/demo.stories.tsx b/packages/react-components/lib/window/demo.stories.tsx
index 400a21410..4589969f0 100644
--- a/packages/react-components/lib/window/demo.stories.tsx
+++ b/packages/react-components/lib/window/demo.stories.tsx
@@ -1,4 +1,4 @@
-import { Typography, useTheme } from '@mui/material';
+import { Typography } from '@mui/material';
import { Meta, StoryFn } from '@storybook/react';
import React from 'react';
@@ -16,7 +16,6 @@ export const Demo: StoryFn
+
+ {toolbar}
+ {windowManagerState.designMode && (
+ onClose && onClose()}>
+
+ )}
+
+
{childComponents}
-
- {resizeComponent}
+
+ {windowManagerState.designMode && resizeComponent}
);
},
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index 1aa5beea8..8cdc7204b 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -83,7 +83,7 @@
"puppeteer": "*",
"require-from-string": "^2.0.2",
"storybook": "^8.2.6",
- "typescript": "~5.4.3",
+ "typescript": "~5.5.4",
"typescript-eslint": "^7.5.0",
"vitest": "^2.0.4"
}
diff --git a/packages/rmf-models/package.json b/packages/rmf-models/package.json
index 0f6a18ded..58ff65681 100644
--- a/packages/rmf-models/package.json
+++ b/packages/rmf-models/package.json
@@ -15,7 +15,7 @@
"license": "Apache-2.0",
"devDependencies": {
"ts-node": "^9.1.1",
- "typescript": "~5.4.3"
+ "typescript": "~5.5.4"
},
"publishConfig": {
"directory": "dist"
diff --git a/packages/ros-translator/package.json b/packages/ros-translator/package.json
index a66ba066c..0b940d761 100644
--- a/packages/ros-translator/package.json
+++ b/packages/ros-translator/package.json
@@ -14,6 +14,6 @@
"jasmine": "^3.6.6",
"pipenv-install": "workspace:*",
"ts-node": "^9.1.1",
- "typescript": "~5.4.3"
+ "typescript": "~5.5.4"
}
}
diff --git a/patches/@react-three__fiber.patch b/patches/@react-three__fiber.patch
new file mode 100644
index 000000000..efe402d94
--- /dev/null
+++ b/patches/@react-three__fiber.patch
@@ -0,0 +1,22 @@
+diff --git a/dist/declarations/src/three-types.d.ts b/dist/declarations/src/three-types.d.ts
+index 7668a42e27ac2c51ebaaac88db8bfd8fe823ae75..beb86ce6dd562fffe0048c04ae570b1b9f499475 100644
+--- a/dist/declarations/src/three-types.d.ts
++++ b/dist/declarations/src/three-types.d.ts
+@@ -384,10 +384,11 @@ export interface ThreeElements {
+ fogExp2: FogExp2Props;
+ shape: ShapeProps;
+ }
+-declare global {
+- namespace JSX {
+- interface IntrinsicElements extends ThreeElements {
+- }
+- }
+-}
++// PATCH: @react-three/fiber conflicts with @mui/material because it exports too many IntrinsicElements.
++// declare global {
++// namespace JSX {
++// interface IntrinsicElements extends ThreeElements {
++// }
++// }
++// }
+ export {};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 90f41a1c0..9568a5a43 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,11 @@ settings:
overrides:
typescript-json-schema>@types/node: '*'
+patchedDependencies:
+ '@react-three/fiber':
+ hash: 72hazlorpk2kzn3denlucgiftu
+ path: patches/@react-three__fiber.patch
+
importers:
.:
@@ -25,7 +30,7 @@ importers:
version: 12.1.1(eslint@8.57.0)
eslint-plugin-storybook:
specifier: ^0.8.0
- version: 0.8.0(eslint@8.57.0)(typescript@5.4.5)
+ version: 0.8.0(eslint@8.57.0)(typescript@5.5.4)
husky:
specifier: ^9.0.11
version: 9.0.11
@@ -39,11 +44,11 @@ importers:
specifier: 1.1.369
version: 1.1.369
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
typescript-eslint:
specifier: ^7.5.0
- version: 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ version: 7.16.0(eslint@8.57.0)(typescript@5.5.4)
packages/api-client:
dependencies:
@@ -62,10 +67,10 @@ importers:
version: 2.13.4(debug@4.3.5)
'@typescript-eslint/eslint-plugin':
specifier: ^7.5.0
- version: 7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)
+ version: 7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)
'@typescript-eslint/parser':
specifier: ^7.5.0
- version: 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ version: 7.16.0(eslint@8.57.0)(typescript@5.5.4)
axios:
specifier: 1.7.4
version: 1.7.4(debug@4.3.5)
@@ -73,11 +78,11 @@ importers:
specifier: ^8.57.0
version: 8.57.0
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
vitest:
specifier: ^2.0.4
- version: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3)
+ version: 2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
packages/api-server:
devDependencies:
@@ -113,10 +118,10 @@ importers:
version: 6.19.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.1(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.16.1(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(date-fns@2.30.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@react-three/drei':
specifier: ^9.103.0
- version: 9.108.3(@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ version: 9.108.3(@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
'@react-three/fiber':
specifier: ^8.16.1
- version: 8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ version: 8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
'@types/debug':
specifier: ^4.1.5
version: 4.1.12
@@ -150,9 +155,6 @@ importers:
eventemitter3:
specifier: ^4.0.7
version: 4.0.7
- jsdom:
- specifier: ^24.1.1
- version: 24.1.1(canvas@2.11.2)
keycloak-js:
specifier: ^25.0.2
version: 25.0.2
@@ -195,7 +197,7 @@ importers:
version: 8.2.2(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@storybook/addon-interactions':
specifier: ^8.0.5
- version: 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@storybook/addon-links':
specifier: ^8.0.5
version: 8.2.2(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
@@ -207,10 +209,10 @@ importers:
version: 8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@storybook/react':
specifier: ^8.0.5
- version: 8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)
+ version: 8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)
'@storybook/test':
specifier: ^8.0.5
- version: 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@testing-library/dom':
specifier: ^9.3.4
version: 9.3.4
@@ -220,15 +222,12 @@ importers:
'@testing-library/user-event':
specifier: ^14.5.2
version: 14.5.2(@testing-library/dom@9.3.4)
- '@types/history':
- specifier: ^5.0.0
- version: 5.0.0
'@vitejs/plugin-react-swc':
specifier: ^3.7.0
- version: 3.7.0(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))
+ version: 3.7.0(vite@5.3.5(@types/node@20.14.12)(terser@5.31.6))
'@vitest/coverage-v8':
specifier: ^2.0.4
- version: 2.0.4(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 2.0.4(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
api-server:
specifier: file:../api-server
version: link:../api-server
@@ -241,21 +240,24 @@ importers:
history:
specifier: ^5.3.0
version: 5.3.0
+ jsdom:
+ specifier: ^24.1.1
+ version: 24.1.1(canvas@2.11.2)
storybook:
specifier: ^8.0.5
version: 8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8))
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
typescript-json-schema:
specifier: ^0.64.0
version: 0.64.0(@swc/core@1.5.7)
vite:
specifier: ^5.3.5
- version: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ version: 5.3.5(@types/node@20.14.12)(terser@5.31.6)
vitest:
specifier: ^2.0.4
- version: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3)
+ version: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
packages/dashboard-e2e:
devDependencies:
@@ -291,10 +293,10 @@ importers:
version: 11.3.2
ts-node:
specifier: ^9.1.1
- version: 9.1.1(typescript@5.4.5)
+ version: 9.1.1(typescript@5.5.4)
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
packages/react-components:
dependencies:
@@ -330,10 +332,10 @@ importers:
version: 6.19.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.1(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.16.1(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(date-fns@2.30.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@react-three/drei':
specifier: ^9.103.0
- version: 9.108.3(@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ version: 9.108.3(@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
'@react-three/fiber':
specifier: ^8.16.1
- version: 8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ version: 8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
'@types/crc':
specifier: ^3.4.0
version: 3.8.3
@@ -418,7 +420,7 @@ importers:
version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@storybook/addon-interactions':
specifier: ^8.2.6
- version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@storybook/addon-links':
specifier: ^8.2.6
version: 8.2.6(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
@@ -430,13 +432,13 @@ importers:
version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@storybook/react':
specifier: ^8.2.6
- version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)
+ version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)
'@storybook/react-vite':
specifier: ^8.2.6
- version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.0)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))
+ version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.0)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))
'@storybook/test':
specifier: ^8.2.6
- version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@testing-library/dom':
specifier: ^9.3.4
version: 9.3.4
@@ -463,7 +465,7 @@ importers:
version: 1.8.8
'@vitest/coverage-v8':
specifier: ^2.0.4
- version: 2.0.4(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ version: 2.0.4(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
concurrently:
specifier: ^8.2.2
version: 8.2.2
@@ -490,7 +492,7 @@ importers:
version: 0.11.10
puppeteer:
specifier: '*'
- version: 22.13.0(typescript@5.4.5)
+ version: 22.13.0(typescript@5.5.4)
require-from-string:
specifier: ^2.0.2
version: 2.0.2
@@ -498,23 +500,23 @@ importers:
specifier: ^8.2.6
version: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
typescript-eslint:
specifier: ^7.5.0
- version: 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ version: 7.16.0(eslint@8.57.0)(typescript@5.5.4)
vitest:
specifier: ^2.0.4
- version: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3)
+ version: 2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
packages/rmf-models:
devDependencies:
ts-node:
specifier: ^9.1.1
- version: 9.1.1(typescript@5.4.5)
+ version: 9.1.1(typescript@5.5.4)
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
publishDirectory: dist
packages/ros-translator:
@@ -530,10 +532,10 @@ importers:
version: link:../../pipenv-install
ts-node:
specifier: ^9.1.1
- version: 9.1.1(typescript@5.4.5)
+ version: 9.1.1(typescript@5.5.4)
typescript:
- specifier: ~5.4.3
- version: 5.4.5
+ specifier: ~5.5.4
+ version: 5.5.4
pipenv-install: {}
@@ -563,14 +565,26 @@ packages:
resolution: {integrity: sha512-c4IM7OTg6k1Q+AJ153e2mc2QVTezTwnb4VzquwcyiEzGnW0Kedv4do/TrkU98qPeC5LNiMt/QXwIjzYXLBpyZg==}
engines: {node: '>=6.9.0'}
+ '@babel/compat-data@7.25.2':
+ resolution: {integrity: sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==}
+ engines: {node: '>=6.9.0'}
+
'@babel/core@7.24.8':
resolution: {integrity: sha512-6AWcmZC/MZCO0yKys4uhg5NlxL0ESF3K6IAaoQ+xSXvPyPyxNWRafP+GDbI88Oh68O7QkJgmEtedWPM9U0pZNg==}
engines: {node: '>=6.9.0'}
+ '@babel/core@7.25.2':
+ resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==}
+ engines: {node: '>=6.9.0'}
+
'@babel/generator@7.24.8':
resolution: {integrity: sha512-47DG+6F5SzOi0uEvK4wMShmn5yY0mVjVJoWTphdY2B4Rx9wHgjK7Yhtr0ru6nE+sn0v38mzrWOlah0p/YlHHOQ==}
engines: {node: '>=6.9.0'}
+ '@babel/generator@7.25.0':
+ resolution: {integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==}
+ engines: {node: '>=6.9.0'}
+
'@babel/helper-annotate-as-pure@7.24.7':
resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==}
engines: {node: '>=6.9.0'}
@@ -583,6 +597,10 @@ packages:
resolution: {integrity: sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==}
engines: {node: '>=6.9.0'}
+ '@babel/helper-compilation-targets@7.25.2':
+ resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==}
+ engines: {node: '>=6.9.0'}
+
'@babel/helper-create-class-features-plugin@7.24.8':
resolution: {integrity: sha512-4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA==}
engines: {node: '>=6.9.0'}
@@ -626,6 +644,12 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0
+ '@babel/helper-module-transforms@7.25.2':
+ resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==}
+ engines: {node: '>=6.9.0'}
+ peerDependencies:
+ '@babel/core': ^7.0.0
+
'@babel/helper-optimise-call-expression@7.24.7':
resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==}
engines: {node: '>=6.9.0'}
@@ -678,6 +702,10 @@ packages:
resolution: {integrity: sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==}
engines: {node: '>=6.9.0'}
+ '@babel/helpers@7.25.0':
+ resolution: {integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==}
+ engines: {node: '>=6.9.0'}
+
'@babel/highlight@7.24.7':
resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
engines: {node: '>=6.9.0'}
@@ -687,6 +715,11 @@ packages:
engines: {node: '>=6.0.0'}
hasBin: true
+ '@babel/parser@7.25.3':
+ resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==}
+ engines: {node: '>=6.0.0'}
+ hasBin: true
+
'@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.7':
resolution: {integrity: sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==}
engines: {node: '>=6.9.0'}
@@ -1180,10 +1213,18 @@ packages:
resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==}
engines: {node: '>=6.9.0'}
+ '@babel/template@7.25.0':
+ resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
+ engines: {node: '>=6.9.0'}
+
'@babel/traverse@7.24.8':
resolution: {integrity: sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==}
engines: {node: '>=6.9.0'}
+ '@babel/traverse@7.25.3':
+ resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==}
+ engines: {node: '>=6.9.0'}
+
'@babel/types@7.24.8':
resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==}
engines: {node: '>=6.9.0'}
@@ -1192,6 +1233,10 @@ packages:
resolution: {integrity: sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==}
engines: {node: '>=6.9.0'}
+ '@babel/types@7.25.2':
+ resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==}
+ engines: {node: '>=6.9.0'}
+
'@base2/pretty-print-object@1.0.1':
resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
@@ -2590,8 +2635,8 @@ packages:
'@types/eslint-scope@3.7.7':
resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
- '@types/eslint@8.56.10':
- resolution: {integrity: sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==}
+ '@types/eslint@9.6.0':
+ resolution: {integrity: sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==}
'@types/estree@0.0.51':
resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
@@ -2620,10 +2665,6 @@ packages:
'@types/hast@3.0.4':
resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
- '@types/history@5.0.0':
- resolution: {integrity: sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ==}
- deprecated: This is a stub types definition. history provides its own type definitions, so you do not need this installed.
-
'@types/http-cache-semantics@4.0.4':
resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
@@ -2702,6 +2743,9 @@ packages:
'@types/node@20.14.12':
resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==}
+ '@types/node@22.2.0':
+ resolution: {integrity: sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==}
+
'@types/object-inspect@1.13.0':
resolution: {integrity: sha512-lwGTVESDDV+XsQ1pH4UifpJ1f7OtXzQ6QBOX2Afq2bM/T3oOt8hF6exJMjjIjtEWeAN2YAo25J7HxWh97CCz9w==}
@@ -2807,6 +2851,9 @@ packages:
'@types/yargs@17.0.32':
resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==}
+ '@types/yargs@17.0.33':
+ resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
+
'@types/yauzl@2.10.3':
resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
@@ -3340,8 +3387,8 @@ packages:
peerDependencies:
'@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
- babel-preset-current-node-syntax@1.0.1:
- resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+ babel-preset-current-node-syntax@1.1.0:
+ resolution: {integrity: sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==}
peerDependencies:
'@babel/core': ^7.0.0
@@ -3421,6 +3468,11 @@ packages:
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true
+ browserslist@4.23.3:
+ resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
+ engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+ hasBin: true
+
browserstack-local@1.5.5:
resolution: {integrity: sha512-jKne7yosrMcptj3hqxp36TP9k0ZW2sCqhyurX24rUL4G3eT7OLgv+CSQN8iq5dtkv5IK+g+v8fWvsiC/S9KxMg==}
@@ -3503,6 +3555,9 @@ packages:
caniuse-lite@1.0.30001641:
resolution: {integrity: sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==}
+ caniuse-lite@1.0.30001651:
+ resolution: {integrity: sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==}
+
canvas@2.11.2:
resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==}
engines: {node: '>=6'}
@@ -4112,6 +4167,9 @@ packages:
electron-to-chromium@1.4.827:
resolution: {integrity: sha512-VY+J0e4SFcNfQy19MEoMdaIcZLmDCprqvBtkii1WTCTQHpRvf5N8+3kTYCgL/PcntvwQvmMJWTuDPsq+IlhWKQ==}
+ electron-to-chromium@1.5.7:
+ resolution: {integrity: sha512-6FTNWIWMxMy/ZY6799nBlPtF1DFDQ6VQJ7yyDP27SJNt5lwtQ5ufqVvHylb3fdQefvRcgA3fKcFMJi9OLwBRNw==}
+
emittery@0.13.1:
resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
engines: {node: '>=12'}
@@ -4143,8 +4201,8 @@ packages:
resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==}
engines: {node: '>=10.0.0'}
- enhanced-resolve@5.17.0:
- resolution: {integrity: sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==}
+ enhanced-resolve@5.17.1:
+ resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
engines: {node: '>=10.13.0'}
entities@4.5.0:
@@ -4864,8 +4922,8 @@ packages:
resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
engines: {node: '>=6'}
- import-local@3.1.0:
- resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
+ import-local@3.2.0:
+ resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
engines: {node: '>=8'}
hasBin: true
@@ -5836,6 +5894,9 @@ packages:
node-releases@2.0.14:
resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
+ node-releases@2.0.18:
+ resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+
node-vibrant@3.1.6:
resolution: {integrity: sha512-Wlc/hQmBMOu6xon12ZJHS2N3M+I6J8DhrD3Yo6m5175v8sFkVIN+UjhKVRcO+fqvre89ASTpmiFEP3nPO13SwA==}
@@ -7150,8 +7211,8 @@ packages:
uglify-js:
optional: true
- terser@5.31.3:
- resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==}
+ terser@5.31.6:
+ resolution: {integrity: sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==}
engines: {node: '>=10'}
hasBin: true
@@ -7383,8 +7444,8 @@ packages:
engines: {node: '>=14.17'}
hasBin: true
- typescript@5.4.5:
- resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+ typescript@5.5.4:
+ resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
engines: {node: '>=14.17'}
hasBin: true
@@ -7410,6 +7471,9 @@ packages:
undici-types@5.26.5:
resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+ undici-types@6.13.0:
+ resolution: {integrity: sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==}
+
unicode-canonical-property-names-ecmascript@2.0.0:
resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
engines: {node: '>=4'}
@@ -7592,8 +7656,8 @@ packages:
walker@1.0.8:
resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
- watchpack@2.4.1:
- resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
+ watchpack@2.4.2:
+ resolution: {integrity: sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==}
engines: {node: '>=10.13.0'}
wcwidth@1.0.1:
@@ -7903,6 +7967,9 @@ snapshots:
'@babel/compat-data@7.24.8': {}
+ '@babel/compat-data@7.25.2':
+ optional: true
+
'@babel/core@7.24.8':
dependencies:
'@ampproject/remapping': 2.3.0
@@ -7923,6 +7990,27 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@babel/core@7.25.2':
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@babel/code-frame': 7.24.7
+ '@babel/generator': 7.25.0
+ '@babel/helper-compilation-targets': 7.25.2
+ '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+ '@babel/helpers': 7.25.0
+ '@babel/parser': 7.25.3
+ '@babel/template': 7.25.0
+ '@babel/traverse': 7.25.3
+ '@babel/types': 7.25.2
+ convert-source-map: 2.0.0
+ debug: 4.3.6
+ gensync: 1.0.0-beta.2
+ json5: 2.2.3
+ semver: 6.3.1
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
'@babel/generator@7.24.8':
dependencies:
'@babel/types': 7.24.8
@@ -7930,6 +8018,14 @@ snapshots:
'@jridgewell/trace-mapping': 0.3.25
jsesc: 2.5.2
+ '@babel/generator@7.25.0':
+ dependencies:
+ '@babel/types': 7.25.2
+ '@jridgewell/gen-mapping': 0.3.5
+ '@jridgewell/trace-mapping': 0.3.25
+ jsesc: 2.5.2
+ optional: true
+
'@babel/helper-annotate-as-pure@7.24.7':
dependencies:
'@babel/types': 7.24.8
@@ -7949,6 +8045,15 @@ snapshots:
lru-cache: 5.1.1
semver: 6.3.1
+ '@babel/helper-compilation-targets@7.25.2':
+ dependencies:
+ '@babel/compat-data': 7.25.2
+ '@babel/helper-validator-option': 7.24.8
+ browserslist: 4.23.3
+ lru-cache: 5.1.1
+ semver: 6.3.1
+ optional: true
+
'@babel/helper-create-class-features-plugin@7.24.8(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
@@ -8020,6 +8125,17 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-module-imports': 7.24.7
+ '@babel/helper-simple-access': 7.24.7
+ '@babel/helper-validator-identifier': 7.24.7
+ '@babel/traverse': 7.25.3
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
'@babel/helper-optimise-call-expression@7.24.7':
dependencies:
'@babel/types': 7.24.8
@@ -8082,6 +8198,12 @@ snapshots:
'@babel/template': 7.24.7
'@babel/types': 7.24.8
+ '@babel/helpers@7.25.0':
+ dependencies:
+ '@babel/template': 7.25.0
+ '@babel/types': 7.25.2
+ optional: true
+
'@babel/highlight@7.24.7':
dependencies:
'@babel/helper-validator-identifier': 7.24.7
@@ -8093,6 +8215,11 @@ snapshots:
dependencies:
'@babel/types': 7.24.8
+ '@babel/parser@7.25.3':
+ dependencies:
+ '@babel/types': 7.25.2
+ optional: true
+
'@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.7(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
@@ -8128,9 +8255,15 @@ snapshots:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.8)':
+ '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)':
dependencies:
- '@babel/core': 7.24.8
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
+ '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
optional: true
@@ -8139,11 +8272,23 @@ snapshots:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
@@ -8169,66 +8314,144 @@ snapshots:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
'@babel/helper-plugin-utils': 7.24.8
+ '@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.25.2)':
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.8
+ optional: true
+
'@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.8)':
dependencies:
'@babel/core': 7.24.8
@@ -8712,6 +8935,13 @@ snapshots:
'@babel/parser': 7.24.8
'@babel/types': 7.24.8
+ '@babel/template@7.25.0':
+ dependencies:
+ '@babel/code-frame': 7.24.7
+ '@babel/parser': 7.25.3
+ '@babel/types': 7.25.2
+ optional: true
+
'@babel/traverse@7.24.8':
dependencies:
'@babel/code-frame': 7.24.7
@@ -8727,6 +8957,19 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@babel/traverse@7.25.3':
+ dependencies:
+ '@babel/code-frame': 7.24.7
+ '@babel/generator': 7.25.0
+ '@babel/parser': 7.25.3
+ '@babel/template': 7.25.0
+ '@babel/types': 7.25.2
+ debug: 4.3.6
+ globals: 11.12.0
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
'@babel/types@7.24.8':
dependencies:
'@babel/helper-string-parser': 7.24.8
@@ -8739,6 +8982,13 @@ snapshots:
'@babel/helper-validator-identifier': 7.24.7
to-fast-properties: 2.0.0
+ '@babel/types@7.25.2':
+ dependencies:
+ '@babel/helper-string-parser': 7.24.8
+ '@babel/helper-validator-identifier': 7.24.7
+ to-fast-properties: 2.0.0
+ optional: true
+
'@base2/pretty-print-object@1.0.1': {}
'@bcoe/v8-coverage@0.2.3': {}
@@ -9000,28 +9250,64 @@ snapshots:
'@jest/console@29.7.0':
dependencies:
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
jest-message-util: 29.7.0
jest-util: 29.7.0
slash: 3.0.0
optional: true
- '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))':
+ '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))':
dependencies:
'@jest/console': 29.7.0
'@jest/reporters': 29.7.0
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
ansi-escapes: 4.3.2
chalk: 4.1.2
ci-info: 3.9.0
exit: 0.1.2
graceful-fs: 4.2.11
jest-changed-files: 29.7.0
- jest-config: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ jest-config: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
+ jest-haste-map: 29.7.0
+ jest-message-util: 29.7.0
+ jest-regex-util: 29.6.3
+ jest-resolve: 29.7.0
+ jest-resolve-dependencies: 29.7.0
+ jest-runner: 29.7.0
+ jest-runtime: 29.7.0
+ jest-snapshot: 29.7.0
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ jest-watcher: 29.7.0
+ micromatch: 4.0.7
+ pretty-format: 29.7.0
+ slash: 3.0.0
+ strip-ansi: 6.0.1
+ transitivePeerDependencies:
+ - babel-plugin-macros
+ - supports-color
+ - ts-node
+ optional: true
+
+ '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))':
+ dependencies:
+ '@jest/console': 29.7.0
+ '@jest/reporters': 29.7.0
+ '@jest/test-result': 29.7.0
+ '@jest/transform': 29.7.0
+ '@jest/types': 29.6.3
+ '@types/node': 22.2.0
+ ansi-escapes: 4.3.2
+ chalk: 4.1.2
+ ci-info: 3.9.0
+ exit: 0.1.2
+ graceful-fs: 4.2.11
+ jest-changed-files: 29.7.0
+ jest-config: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
jest-haste-map: 29.7.0
jest-message-util: 29.7.0
jest-regex-util: 29.6.3
@@ -9047,7 +9333,7 @@ snapshots:
dependencies:
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
jest-mock: 29.7.0
optional: true
@@ -9072,7 +9358,7 @@ snapshots:
dependencies:
'@jest/types': 29.6.3
'@sinonjs/fake-timers': 10.3.0
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
jest-message-util: 29.7.0
jest-mock: 29.7.0
jest-util: 29.7.0
@@ -9096,7 +9382,7 @@ snapshots:
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
'@jridgewell/trace-mapping': 0.3.25
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
collect-v8-coverage: 1.0.2
exit: 0.1.2
@@ -9151,7 +9437,7 @@ snapshots:
'@jest/transform@29.7.0':
dependencies:
- '@babel/core': 7.24.8
+ '@babel/core': 7.25.2
'@jest/types': 29.6.3
'@jridgewell/trace-mapping': 0.3.25
babel-plugin-istanbul: 6.1.1
@@ -9184,8 +9470,8 @@ snapshots:
'@jest/schemas': 29.6.3
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
- '@types/node': 20.14.12
- '@types/yargs': 17.0.32
+ '@types/node': 22.2.0
+ '@types/yargs': 17.0.33
chalk: 4.1.2
optional: true
@@ -9269,15 +9555,15 @@ snapshots:
'@babel/runtime': 7.24.8
regenerator-runtime: 0.13.11
- '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))':
+ '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))':
dependencies:
glob: 7.2.3
glob-promise: 4.2.2(glob@7.2.3)
magic-string: 0.27.0
- react-docgen-typescript: 2.2.2(typescript@5.4.5)
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ react-docgen-typescript: 2.2.2(typescript@5.5.4)
+ vite: 5.3.5(@types/node@22.2.0)(terser@5.31.6)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
'@jridgewell/gen-mapping@0.3.5':
dependencies:
@@ -9621,25 +9907,25 @@ snapshots:
'@react-spring/types': 9.6.1
react: 18.3.1
- '@react-spring/three@9.6.1(@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(react@18.3.1)(three@0.166.1)':
+ '@react-spring/three@9.6.1(@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(react@18.3.1)(three@0.166.1)':
dependencies:
'@react-spring/animated': 9.6.1(react@18.3.1)
'@react-spring/core': 9.6.1(react@18.3.1)
'@react-spring/shared': 9.6.1(react@18.3.1)
'@react-spring/types': 9.6.1
- '@react-three/fiber': 8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ '@react-three/fiber': 8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
react: 18.3.1
three: 0.166.1
'@react-spring/types@9.6.1': {}
- '@react-three/drei@9.108.3(@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)':
+ '@react-three/drei@9.108.3(@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(@types/react@18.3.3)(@types/three@0.166.0)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)':
dependencies:
'@babel/runtime': 7.24.8
'@mediapipe/tasks-vision': 0.10.8
'@monogrid/gainmap-js': 3.0.5(three@0.166.1)
- '@react-spring/three': 9.6.1(@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(react@18.3.1)(three@0.166.1)
- '@react-three/fiber': 8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
+ '@react-spring/three': 9.6.1(@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1))(react@18.3.1)(three@0.166.1)
+ '@react-three/fiber': 8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)
'@use-gesture/react': 10.3.1(react@18.3.1)
camera-controls: 2.8.5(three@0.166.1)
cross-env: 7.0.3
@@ -9668,7 +9954,7 @@ snapshots:
- '@types/three'
- immer
- '@react-three/fiber@8.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)':
+ '@react-three/fiber@8.16.8(patch_hash=72hazlorpk2kzn3denlucgiftu)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(three@0.166.1)':
dependencies:
'@babel/runtime': 7.24.8
'@types/react-reconciler': 0.26.7
@@ -9890,11 +10176,11 @@ snapshots:
'@storybook/global': 5.0.0
storybook: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
- '@storybook/addon-interactions@8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@storybook/addon-interactions@8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@storybook/global': 5.0.0
'@storybook/instrumenter': 8.2.2(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
- '@storybook/test': 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ '@storybook/test': 8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
polished: 4.3.1
storybook: 8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8))
ts-dedent: 2.2.0
@@ -9905,11 +10191,11 @@ snapshots:
- jest
- vitest
- '@storybook/addon-interactions@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@storybook/addon-interactions@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@storybook/global': 5.0.0
'@storybook/instrumenter': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
- '@storybook/test': 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ '@storybook/test': 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
polished: 4.3.1
storybook: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
ts-dedent: 2.2.0
@@ -10036,7 +10322,7 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
- '@storybook/builder-vite@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))':
+ '@storybook/builder-vite@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))':
dependencies:
'@storybook/csf-plugin': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@types/find-cache-dir': 3.2.1
@@ -10048,9 +10334,9 @@ snapshots:
magic-string: 0.30.10
storybook: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
ts-dedent: 2.2.0
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ vite: 5.3.5(@types/node@22.2.0)(terser@5.31.6)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
@@ -10193,12 +10479,12 @@ snapshots:
react-dom: 18.3.1(react@18.3.1)
storybook: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
- '@storybook/react-vite@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.0)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))':
+ '@storybook/react-vite@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.0)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))':
dependencies:
- '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))
+ '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))
'@rollup/pluginutils': 5.1.0(rollup@4.19.0)
- '@storybook/builder-vite': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))
- '@storybook/react': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)
+ '@storybook/builder-vite': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)(vite@5.3.5(@types/node@22.2.0)(terser@5.31.6))
+ '@storybook/react': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)
find-up: 5.0.0
magic-string: 0.30.10
react: 18.3.1
@@ -10207,7 +10493,7 @@ snapshots:
resolve: 1.22.8
storybook: 8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8))
tsconfig-paths: 4.2.0
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ vite: 5.3.5(@types/node@22.2.0)(terser@5.31.6)
transitivePeerDependencies:
- '@preact/preset-vite'
- rollup
@@ -10215,7 +10501,7 @@ snapshots:
- typescript
- vite-plugin-glimmerx
- '@storybook/react@8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)':
+ '@storybook/react@8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)':
dependencies:
'@storybook/global': 5.0.0
'@storybook/react-dom-shim': 8.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
@@ -10238,9 +10524,9 @@ snapshots:
type-fest: 2.19.0
util-deprecate: 1.0.2
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
- '@storybook/react@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.4.5)':
+ '@storybook/react@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(typescript@5.5.4)':
dependencies:
'@storybook/components': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@storybook/global': 5.0.0
@@ -10267,14 +10553,14 @@ snapshots:
type-fest: 2.19.0
util-deprecate: 1.0.2
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
- '@storybook/test@8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@storybook/test@8.2.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@storybook/csf': 0.1.11
'@storybook/instrumenter': 8.2.2(storybook@8.2.2(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@testing-library/dom': 10.1.0
- '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
'@vitest/expect': 1.6.0
'@vitest/spy': 1.6.0
@@ -10287,12 +10573,12 @@ snapshots:
- jest
- vitest
- '@storybook/test@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@storybook/test@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@storybook/csf': 0.1.11
'@storybook/instrumenter': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.8(@babel/core@7.24.8)))
'@testing-library/dom': 10.1.0
- '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))
+ '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))
'@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
'@vitest/expect': 1.6.0
'@vitest/spy': 1.6.0
@@ -10387,7 +10673,23 @@ snapshots:
lz-string: 1.5.0
pretty-format: 27.5.1
- '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)))(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
+ dependencies:
+ '@adobe/css-tools': 4.4.0
+ '@babel/runtime': 7.24.8
+ aria-query: 5.3.0
+ chalk: 3.0.0
+ css.escape: 1.5.1
+ dom-accessibility-api: 0.6.3
+ lodash: 4.17.21
+ redent: 3.0.0
+ optionalDependencies:
+ '@jest/globals': 29.7.0
+ '@types/jest': 29.5.12
+ jest: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
+ vitest: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
+
+ '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)))(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@adobe/css-tools': 4.4.0
'@babel/runtime': 7.24.8
@@ -10400,8 +10702,8 @@ snapshots:
optionalDependencies:
'@jest/globals': 29.7.0
'@types/jest': 29.5.12
- jest: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
- vitest: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3)
+ jest: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
+ vitest: 2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
'@testing-library/react@14.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
@@ -10502,10 +10804,10 @@ snapshots:
'@types/eslint-scope@3.7.7':
dependencies:
- '@types/eslint': 8.56.10
+ '@types/eslint': 9.6.0
'@types/estree': 1.0.5
- '@types/eslint@8.56.10':
+ '@types/eslint@9.6.0':
dependencies:
'@types/estree': 1.0.5
'@types/json-schema': 7.0.15
@@ -10541,17 +10843,13 @@ snapshots:
'@types/graceful-fs@4.1.9':
dependencies:
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
optional: true
'@types/hast@3.0.4':
dependencies:
'@types/unist': 3.0.2
- '@types/history@5.0.0':
- dependencies:
- history: 5.3.0
-
'@types/http-cache-semantics@4.0.4': {}
'@types/http-errors@2.0.4': {}
@@ -10631,6 +10929,10 @@ snapshots:
dependencies:
undici-types: 5.26.5
+ '@types/node@22.2.0':
+ dependencies:
+ undici-types: 6.13.0
+
'@types/object-inspect@1.13.0': {}
'@types/offscreencanvas@2019.7.3': {}
@@ -10747,39 +11049,44 @@ snapshots:
dependencies:
'@types/yargs-parser': 21.0.3
+ '@types/yargs@17.0.33':
+ dependencies:
+ '@types/yargs-parser': 21.0.3
+ optional: true
+
'@types/yauzl@2.10.3':
dependencies:
'@types/node': 20.14.10
optional: true
- '@typescript-eslint/eslint-plugin@7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/eslint-plugin@7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)':
dependencies:
'@eslint-community/regexpp': 4.11.0
- '@typescript-eslint/parser': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/parser': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
'@typescript-eslint/scope-manager': 7.16.0
- '@typescript-eslint/type-utils': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/type-utils': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
+ '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
'@typescript-eslint/visitor-keys': 7.16.0
eslint: 8.57.0
graphemer: 1.4.0
ignore: 5.3.1
natural-compare: 1.4.0
- ts-api-utils: 1.3.0(typescript@5.4.5)
+ ts-api-utils: 1.3.0(typescript@5.5.4)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.4)':
dependencies:
'@typescript-eslint/scope-manager': 7.16.0
'@typescript-eslint/types': 7.16.0
- '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.4.5)
+ '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.5.4)
'@typescript-eslint/visitor-keys': 7.16.0
debug: 4.3.5
eslint: 8.57.0
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
@@ -10793,15 +11100,15 @@ snapshots:
'@typescript-eslint/types': 7.16.0
'@typescript-eslint/visitor-keys': 7.16.0
- '@typescript-eslint/type-utils@7.16.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/type-utils@7.16.0(eslint@8.57.0)(typescript@5.5.4)':
dependencies:
- '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.4.5)
- '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.5.4)
+ '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
debug: 4.3.5
eslint: 8.57.0
- ts-api-utils: 1.3.0(typescript@5.4.5)
+ ts-api-utils: 1.3.0(typescript@5.5.4)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
@@ -10809,7 +11116,7 @@ snapshots:
'@typescript-eslint/types@7.16.0': {}
- '@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.5)':
+ '@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.4)':
dependencies:
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/visitor-keys': 5.62.0
@@ -10817,13 +11124,13 @@ snapshots:
globby: 11.1.0
is-glob: 4.0.3
semver: 7.6.3
- tsutils: 3.21.0(typescript@5.4.5)
+ tsutils: 3.21.0(typescript@5.5.4)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/typescript-estree@7.16.0(typescript@5.4.5)':
+ '@typescript-eslint/typescript-estree@7.16.0(typescript@5.5.4)':
dependencies:
'@typescript-eslint/types': 7.16.0
'@typescript-eslint/visitor-keys': 7.16.0
@@ -10832,20 +11139,20 @@ snapshots:
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.6.3
- ts-api-utils: 1.3.0(typescript@5.4.5)
+ ts-api-utils: 1.3.0(typescript@5.5.4)
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.4)':
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
'@types/json-schema': 7.0.15
'@types/semver': 7.5.8
'@typescript-eslint/scope-manager': 5.62.0
'@typescript-eslint/types': 5.62.0
- '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.5)
+ '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.4)
eslint: 8.57.0
eslint-scope: 5.1.1
semver: 7.6.3
@@ -10853,12 +11160,12 @@ snapshots:
- supports-color
- typescript
- '@typescript-eslint/utils@7.16.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/utils@7.16.0(eslint@8.57.0)(typescript@5.5.4)':
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
'@typescript-eslint/scope-manager': 7.16.0
'@typescript-eslint/types': 7.16.0
- '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.4.5)
+ '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.5.4)
eslint: 8.57.0
transitivePeerDependencies:
- supports-color
@@ -10885,14 +11192,14 @@ snapshots:
'@use-gesture/core': 10.3.1
react: 18.3.1
- '@vitejs/plugin-react-swc@3.7.0(vite@5.3.5(@types/node@20.14.12)(terser@5.31.3))':
+ '@vitejs/plugin-react-swc@3.7.0(vite@5.3.5(@types/node@20.14.12)(terser@5.31.6))':
dependencies:
'@swc/core': 1.5.7
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ vite: 5.3.5(@types/node@20.14.12)(terser@5.31.6)
transitivePeerDependencies:
- '@swc/helpers'
- '@vitest/coverage-v8@2.0.4(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3))':
+ '@vitest/coverage-v8@2.0.4(vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
dependencies:
'@ampproject/remapping': 2.3.0
'@bcoe/v8-coverage': 0.2.3
@@ -10906,7 +11213,25 @@ snapshots:
std-env: 3.7.0
test-exclude: 7.0.1
tinyrainbow: 1.2.0
- vitest: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3)
+ vitest: 2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
+ transitivePeerDependencies:
+ - supports-color
+
+ '@vitest/coverage-v8@2.0.4(vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6))':
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@bcoe/v8-coverage': 0.2.3
+ debug: 4.3.5
+ istanbul-lib-coverage: 3.2.2
+ istanbul-lib-report: 3.0.1
+ istanbul-lib-source-maps: 5.0.6
+ istanbul-reports: 3.1.7
+ magic-string: 0.30.10
+ magicast: 0.3.4
+ std-env: 3.7.0
+ test-exclude: 7.0.1
+ tinyrainbow: 1.2.0
+ vitest: 2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6)
transitivePeerDependencies:
- supports-color
@@ -11468,13 +11793,13 @@ snapshots:
dependencies:
'@babel/core': 7.24.8
- babel-jest@29.7.0(@babel/core@7.24.8):
+ babel-jest@29.7.0(@babel/core@7.25.2):
dependencies:
- '@babel/core': 7.24.8
+ '@babel/core': 7.25.2
'@jest/transform': 29.7.0
'@types/babel__core': 7.20.5
babel-plugin-istanbul: 6.1.1
- babel-preset-jest: 29.6.3(@babel/core@7.24.8)
+ babel-preset-jest: 29.6.3(@babel/core@7.25.2)
chalk: 4.1.2
graceful-fs: 4.2.11
slash: 3.0.0
@@ -11495,8 +11820,8 @@ snapshots:
babel-plugin-jest-hoist@29.6.3:
dependencies:
- '@babel/template': 7.24.7
- '@babel/types': 7.24.9
+ '@babel/template': 7.25.0
+ '@babel/types': 7.25.2
'@types/babel__core': 7.20.5
'@types/babel__traverse': 7.20.6
optional: true
@@ -11531,28 +11856,31 @@ snapshots:
transitivePeerDependencies:
- supports-color
- babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.8):
- dependencies:
- '@babel/core': 7.24.8
- '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.8)
- '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.8)
- '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.8)
- '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.8)
- '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.8)
- '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.8)
- '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.8)
+ babel-preset-current-node-syntax@1.1.0(@babel/core@7.25.2):
+ dependencies:
+ '@babel/core': 7.25.2
+ '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2)
+ '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.2)
+ '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2)
+ '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2)
+ '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2)
+ '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2)
+ '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2)
+ '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2)
+ '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2)
+ '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.2)
optional: true
- babel-preset-jest@29.6.3(@babel/core@7.24.8):
+ babel-preset-jest@29.6.3(@babel/core@7.25.2):
dependencies:
- '@babel/core': 7.24.8
+ '@babel/core': 7.25.2
babel-plugin-jest-hoist: 29.6.3
- babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.8)
+ babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.2)
optional: true
balanced-match@1.0.2: {}
@@ -11651,6 +11979,13 @@ snapshots:
node-releases: 2.0.14
update-browserslist-db: 1.1.0(browserslist@4.23.2)
+ browserslist@4.23.3:
+ dependencies:
+ caniuse-lite: 1.0.30001651
+ electron-to-chromium: 1.5.7
+ node-releases: 2.0.18
+ update-browserslist-db: 1.1.0(browserslist@4.23.3)
+
browserstack-local@1.5.5:
dependencies:
agent-base: 6.0.2
@@ -11740,6 +12075,8 @@ snapshots:
caniuse-lite@1.0.30001641: {}
+ caniuse-lite@1.0.30001651: {}
+
canvas@2.11.2:
dependencies:
'@mapbox/node-pre-gyp': 1.0.11
@@ -12053,14 +12390,14 @@ snapshots:
path-type: 4.0.0
yaml: 1.10.2
- cosmiconfig@9.0.0(typescript@5.4.5):
+ cosmiconfig@9.0.0(typescript@5.5.4):
dependencies:
env-paths: 2.2.1
import-fresh: 3.3.0
js-yaml: 4.1.0
parse-json: 5.2.0
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
crc-32@1.2.2: {}
@@ -12073,13 +12410,29 @@ snapshots:
dependencies:
buffer: 5.7.1
- create-jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)):
+ create-jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)):
+ dependencies:
+ '@jest/types': 29.6.3
+ chalk: 4.1.2
+ exit: 0.1.2
+ graceful-fs: 4.2.11
+ jest-config: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
+ jest-util: 29.7.0
+ prompts: 2.4.2
+ transitivePeerDependencies:
+ - '@types/node'
+ - babel-plugin-macros
+ - supports-color
+ - ts-node
+ optional: true
+
+ create-jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)):
dependencies:
'@jest/types': 29.6.3
chalk: 4.1.2
exit: 0.1.2
graceful-fs: 4.2.11
- jest-config: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ jest-config: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
jest-util: 29.7.0
prompts: 2.4.2
transitivePeerDependencies:
@@ -12369,6 +12722,8 @@ snapshots:
electron-to-chromium@1.4.827: {}
+ electron-to-chromium@1.5.7: {}
+
emittery@0.13.1:
optional: true
@@ -12400,7 +12755,7 @@ snapshots:
engine.io-parser@5.2.3: {}
- enhanced-resolve@5.17.0:
+ enhanced-resolve@5.17.1:
dependencies:
graceful-fs: 4.2.11
tapable: 2.2.1
@@ -12609,10 +12964,10 @@ snapshots:
dependencies:
eslint: 8.57.0
- eslint-plugin-storybook@0.8.0(eslint@8.57.0)(typescript@5.4.5):
+ eslint-plugin-storybook@0.8.0(eslint@8.57.0)(typescript@5.5.4):
dependencies:
'@storybook/csf': 0.0.1
- '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4)
eslint: 8.57.0
requireindex: 1.2.0
ts-dedent: 2.2.0
@@ -13384,7 +13739,7 @@ snapshots:
parent-module: 1.0.1
resolve-from: 4.0.0
- import-local@3.1.0:
+ import-local@3.2.0:
dependencies:
pkg-dir: 4.2.0
resolve-cwd: 3.0.0
@@ -13613,8 +13968,8 @@ snapshots:
istanbul-lib-instrument@5.2.1:
dependencies:
- '@babel/core': 7.24.8
- '@babel/parser': 7.24.8
+ '@babel/core': 7.25.2
+ '@babel/parser': 7.25.3
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.2
semver: 6.3.1
@@ -13624,8 +13979,8 @@ snapshots:
istanbul-lib-instrument@6.0.3:
dependencies:
- '@babel/core': 7.24.8
- '@babel/parser': 7.24.8
+ '@babel/core': 7.25.2
+ '@babel/parser': 7.25.3
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.2
semver: 7.6.3
@@ -13709,7 +14064,7 @@ snapshots:
'@jest/expect': 29.7.0
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
co: 4.6.0
dedent: 1.5.3(babel-plugin-macros@3.1.0)
@@ -13730,16 +14085,16 @@ snapshots:
- supports-color
optional: true
- jest-cli@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)):
+ jest-cli@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)):
dependencies:
- '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
chalk: 4.1.2
- create-jest: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ create-jest: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
exit: 0.1.2
- import-local: 3.1.0
- jest-config: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ import-local: 3.2.0
+ jest-config: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
jest-util: 29.7.0
jest-validate: 29.7.0
yargs: 17.7.2
@@ -13750,12 +14105,32 @@ snapshots:
- ts-node
optional: true
- jest-config@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)):
+ jest-cli@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)):
dependencies:
- '@babel/core': 7.24.8
+ '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
+ '@jest/test-result': 29.7.0
+ '@jest/types': 29.6.3
+ chalk: 4.1.2
+ create-jest: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
+ exit: 0.1.2
+ import-local: 3.2.0
+ jest-config: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ yargs: 17.7.2
+ transitivePeerDependencies:
+ - '@types/node'
+ - babel-plugin-macros
+ - supports-color
+ - ts-node
+ optional: true
+
+ jest-config@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)):
+ dependencies:
+ '@babel/core': 7.25.2
'@jest/test-sequencer': 29.7.0
'@jest/types': 29.6.3
- babel-jest: 29.7.0(@babel/core@7.24.8)
+ babel-jest: 29.7.0(@babel/core@7.25.2)
chalk: 4.1.2
ci-info: 3.9.0
deepmerge: 4.3.1
@@ -13776,7 +14151,71 @@ snapshots:
strip-json-comments: 3.1.1
optionalDependencies:
'@types/node': 20.14.12
- ts-node: 10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)
+ ts-node: 10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)
+ transitivePeerDependencies:
+ - babel-plugin-macros
+ - supports-color
+ optional: true
+
+ jest-config@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)):
+ dependencies:
+ '@babel/core': 7.25.2
+ '@jest/test-sequencer': 29.7.0
+ '@jest/types': 29.6.3
+ babel-jest: 29.7.0(@babel/core@7.25.2)
+ chalk: 4.1.2
+ ci-info: 3.9.0
+ deepmerge: 4.3.1
+ glob: 7.2.3
+ graceful-fs: 4.2.11
+ jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+ jest-environment-node: 29.7.0
+ jest-get-type: 29.6.3
+ jest-regex-util: 29.6.3
+ jest-resolve: 29.7.0
+ jest-runner: 29.7.0
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ micromatch: 4.0.7
+ parse-json: 5.2.0
+ pretty-format: 29.7.0
+ slash: 3.0.0
+ strip-json-comments: 3.1.1
+ optionalDependencies:
+ '@types/node': 22.2.0
+ ts-node: 10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)
+ transitivePeerDependencies:
+ - babel-plugin-macros
+ - supports-color
+ optional: true
+
+ jest-config@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)):
+ dependencies:
+ '@babel/core': 7.25.2
+ '@jest/test-sequencer': 29.7.0
+ '@jest/types': 29.6.3
+ babel-jest: 29.7.0(@babel/core@7.25.2)
+ chalk: 4.1.2
+ ci-info: 3.9.0
+ deepmerge: 4.3.1
+ glob: 7.2.3
+ graceful-fs: 4.2.11
+ jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+ jest-environment-node: 29.7.0
+ jest-get-type: 29.6.3
+ jest-regex-util: 29.6.3
+ jest-resolve: 29.7.0
+ jest-runner: 29.7.0
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ micromatch: 4.0.7
+ parse-json: 5.2.0
+ pretty-format: 29.7.0
+ slash: 3.0.0
+ strip-json-comments: 3.1.1
+ optionalDependencies:
+ '@types/node': 22.2.0
+ ts-node: 10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)
transitivePeerDependencies:
- babel-plugin-macros
- supports-color
@@ -13816,7 +14255,7 @@ snapshots:
'@jest/environment': 29.7.0
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
jest-mock: 29.7.0
jest-util: 29.7.0
optional: true
@@ -13830,7 +14269,7 @@ snapshots:
dependencies:
'@jest/types': 29.6.3
'@types/graceful-fs': 4.1.9
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
anymatch: 3.1.3
fb-watchman: 2.0.2
graceful-fs: 4.2.11
@@ -13892,7 +14331,7 @@ snapshots:
jest-mock@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
jest-util: 29.7.0
optional: true
@@ -13932,7 +14371,7 @@ snapshots:
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
emittery: 0.13.1
graceful-fs: 4.2.11
@@ -13961,7 +14400,7 @@ snapshots:
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
cjs-module-lexer: 1.3.1
collect-v8-coverage: 1.0.2
@@ -13982,15 +14421,15 @@ snapshots:
jest-snapshot@29.7.0:
dependencies:
- '@babel/core': 7.24.8
- '@babel/generator': 7.24.8
- '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.8)
- '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.24.8)
- '@babel/types': 7.24.9
+ '@babel/core': 7.25.2
+ '@babel/generator': 7.25.0
+ '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
+ '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2)
+ '@babel/types': 7.25.2
'@jest/expect-utils': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.8)
+ babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.2)
chalk: 4.1.2
expect: 29.7.0
graceful-fs: 4.2.11
@@ -14018,7 +14457,7 @@ snapshots:
jest-util@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
chalk: 4.1.2
ci-info: 3.9.0
graceful-fs: 4.2.11
@@ -14039,7 +14478,7 @@ snapshots:
dependencies:
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
ansi-escapes: 4.3.2
chalk: 4.1.2
emittery: 0.13.1
@@ -14049,24 +14488,37 @@ snapshots:
jest-worker@27.5.1:
dependencies:
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
merge-stream: 2.0.0
supports-color: 8.1.1
jest-worker@29.7.0:
dependencies:
- '@types/node': 20.14.12
+ '@types/node': 22.2.0
jest-util: 29.7.0
merge-stream: 2.0.0
supports-color: 8.1.1
optional: true
- jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5)):
+ jest@29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4)):
+ dependencies:
+ '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
+ '@jest/types': 29.6.3
+ import-local: 3.2.0
+ jest-cli: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4))
+ transitivePeerDependencies:
+ - '@types/node'
+ - babel-plugin-macros
+ - supports-color
+ - ts-node
+ optional: true
+
+ jest@29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4)):
dependencies:
- '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
'@jest/types': 29.6.3
- import-local: 3.1.0
- jest-cli: 29.7.0(@types/node@20.14.12)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5))
+ import-local: 3.2.0
+ jest-cli: 29.7.0(@types/node@22.2.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4))
transitivePeerDependencies:
- '@types/node'
- babel-plugin-macros
@@ -14593,6 +15045,8 @@ snapshots:
node-releases@2.0.14: {}
+ node-releases@2.0.18: {}
+
node-vibrant@3.1.6(debug@4.3.5):
dependencies:
'@jimp/custom': 0.16.13(debug@4.3.5)
@@ -15054,10 +15508,10 @@ snapshots:
- supports-color
- utf-8-validate
- puppeteer@22.13.0(typescript@5.4.5):
+ puppeteer@22.13.0(typescript@5.5.4):
dependencies:
'@puppeteer/browsers': 2.2.3
- cosmiconfig: 9.0.0(typescript@5.4.5)
+ cosmiconfig: 9.0.0(typescript@5.5.4)
devtools-protocol: 0.0.1299070
puppeteer-core: 22.13.0
transitivePeerDependencies:
@@ -15138,9 +15592,9 @@ snapshots:
dependencies:
react: 18.3.1
- react-docgen-typescript@2.2.2(typescript@5.4.5):
+ react-docgen-typescript@2.2.2(typescript@5.5.4):
dependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
react-docgen@7.0.3:
dependencies:
@@ -16112,13 +16566,13 @@ snapshots:
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.2
- terser: 5.31.3
+ terser: 5.31.6
webpack: 5.93.0(@swc/core@1.5.7)(esbuild@0.21.5)
optionalDependencies:
'@swc/core': 1.5.7
esbuild: 0.21.5
- terser@5.31.3:
+ terser@5.31.6:
dependencies:
'@jridgewell/source-map': 0.3.6
acorn: 8.12.1
@@ -16227,9 +16681,9 @@ snapshots:
troika-worker-utils@0.49.0: {}
- ts-api-utils@1.3.0(typescript@5.4.5):
+ ts-api-utils@1.3.0(typescript@5.5.4):
dependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
ts-dedent@2.2.0: {}
@@ -16253,7 +16707,7 @@ snapshots:
optionalDependencies:
'@swc/core': 1.5.7
- ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.4.5):
+ ts-node@10.9.2(@swc/core@1.5.7)(@types/node@20.14.12)(typescript@5.5.4):
dependencies:
'@cspotcode/source-map-support': 0.8.1
'@tsconfig/node10': 1.0.11
@@ -16267,21 +16721,42 @@ snapshots:
create-require: 1.1.1
diff: 4.0.2
make-error: 1.3.6
- typescript: 5.4.5
+ typescript: 5.5.4
+ v8-compile-cache-lib: 3.0.1
+ yn: 3.1.1
+ optionalDependencies:
+ '@swc/core': 1.5.7
+ optional: true
+
+ ts-node@10.9.2(@swc/core@1.5.7)(@types/node@22.2.0)(typescript@5.5.4):
+ dependencies:
+ '@cspotcode/source-map-support': 0.8.1
+ '@tsconfig/node10': 1.0.11
+ '@tsconfig/node12': 1.0.11
+ '@tsconfig/node14': 1.0.3
+ '@tsconfig/node16': 1.0.4
+ '@types/node': 22.2.0
+ acorn: 8.12.1
+ acorn-walk: 8.3.3
+ arg: 4.1.3
+ create-require: 1.1.1
+ diff: 4.0.2
+ make-error: 1.3.6
+ typescript: 5.5.4
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
optionalDependencies:
'@swc/core': 1.5.7
optional: true
- ts-node@9.1.1(typescript@5.4.5):
+ ts-node@9.1.1(typescript@5.5.4):
dependencies:
arg: 4.1.3
create-require: 1.1.1
diff: 4.0.2
make-error: 1.3.6
source-map-support: 0.5.21
- typescript: 5.4.5
+ typescript: 5.5.4
yn: 3.1.1
tsconfig-paths@4.2.0:
@@ -16296,10 +16771,10 @@ snapshots:
tslib@2.6.3: {}
- tsutils@3.21.0(typescript@5.4.5):
+ tsutils@3.21.0(typescript@5.5.4):
dependencies:
tslib: 1.14.1
- typescript: 5.4.5
+ typescript: 5.5.4
tunnel-rat@0.1.2(@types/react@18.3.3)(immer@9.0.21)(react@18.3.1):
dependencies:
@@ -16362,14 +16837,14 @@ snapshots:
is-typed-array: 1.1.13
possible-typed-array-names: 1.0.0
- typescript-eslint@7.16.0(eslint@8.57.0)(typescript@5.4.5):
+ typescript-eslint@7.16.0(eslint@8.57.0)(typescript@5.5.4):
dependencies:
- '@typescript-eslint/eslint-plugin': 7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/parser': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/eslint-plugin': 7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)
+ '@typescript-eslint/parser': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
+ '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.5.4)
eslint: 8.57.0
optionalDependencies:
- typescript: 5.4.5
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
@@ -16389,7 +16864,7 @@ snapshots:
typescript@5.1.6: {}
- typescript@5.4.5: {}
+ typescript@5.5.4: {}
ua-parser-js@0.7.38: {}
@@ -16418,6 +16893,8 @@ snapshots:
undici-types@5.26.5: {}
+ undici-types@6.13.0: {}
+
unicode-canonical-property-names-ecmascript@2.0.0: {}
unicode-match-property-ecmascript@2.0.0:
@@ -16469,6 +16946,12 @@ snapshots:
escalade: 3.1.2
picocolors: 1.0.1
+ update-browserslist-db@1.1.0(browserslist@4.23.3):
+ dependencies:
+ browserslist: 4.23.3
+ escalade: 3.1.2
+ picocolors: 1.0.1
+
update-check@1.5.2:
dependencies:
registry-auth-token: 3.3.2
@@ -16532,13 +17015,30 @@ snapshots:
vary@1.1.2: {}
- vite-node@2.0.4(@types/node@20.14.12)(terser@5.31.3):
+ vite-node@2.0.4(@types/node@20.14.12)(terser@5.31.6):
+ dependencies:
+ cac: 6.7.14
+ debug: 4.3.5
+ pathe: 1.1.2
+ tinyrainbow: 1.2.0
+ vite: 5.3.5(@types/node@20.14.12)(terser@5.31.6)
+ transitivePeerDependencies:
+ - '@types/node'
+ - less
+ - lightningcss
+ - sass
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+
+ vite-node@2.0.4(@types/node@22.2.0)(terser@5.31.6):
dependencies:
cac: 6.7.14
debug: 4.3.5
pathe: 1.1.2
tinyrainbow: 1.2.0
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
+ vite: 5.3.5(@types/node@22.2.0)(terser@5.31.6)
transitivePeerDependencies:
- '@types/node'
- less
@@ -16549,7 +17049,7 @@ snapshots:
- supports-color
- terser
- vite@5.3.5(@types/node@20.14.12)(terser@5.31.3):
+ vite@5.3.5(@types/node@20.14.12)(terser@5.31.6):
dependencies:
esbuild: 0.21.5
postcss: 8.4.39
@@ -16557,9 +17057,19 @@ snapshots:
optionalDependencies:
'@types/node': 20.14.12
fsevents: 2.3.3
- terser: 5.31.3
+ terser: 5.31.6
+
+ vite@5.3.5(@types/node@22.2.0)(terser@5.31.6):
+ dependencies:
+ esbuild: 0.21.5
+ postcss: 8.4.39
+ rollup: 4.19.0
+ optionalDependencies:
+ '@types/node': 22.2.0
+ fsevents: 2.3.3
+ terser: 5.31.6
- vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.3):
+ vitest@2.0.4(@types/node@20.14.12)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6):
dependencies:
'@ampproject/remapping': 2.3.0
'@vitest/expect': 2.0.4
@@ -16577,8 +17087,8 @@ snapshots:
tinybench: 2.8.0
tinypool: 1.0.0
tinyrainbow: 1.2.0
- vite: 5.3.5(@types/node@20.14.12)(terser@5.31.3)
- vite-node: 2.0.4(@types/node@20.14.12)(terser@5.31.3)
+ vite: 5.3.5(@types/node@20.14.12)(terser@5.31.6)
+ vite-node: 2.0.4(@types/node@20.14.12)(terser@5.31.6)
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 20.14.12
@@ -16592,6 +17102,39 @@ snapshots:
- supports-color
- terser
+ vitest@2.0.4(@types/node@22.2.0)(jsdom@24.1.1(canvas@2.11.2))(terser@5.31.6):
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@vitest/expect': 2.0.4
+ '@vitest/pretty-format': 2.0.4
+ '@vitest/runner': 2.0.4
+ '@vitest/snapshot': 2.0.4
+ '@vitest/spy': 2.0.4
+ '@vitest/utils': 2.0.4
+ chai: 5.1.1
+ debug: 4.3.5
+ execa: 8.0.1
+ magic-string: 0.30.10
+ pathe: 1.1.2
+ std-env: 3.7.0
+ tinybench: 2.8.0
+ tinypool: 1.0.0
+ tinyrainbow: 1.2.0
+ vite: 5.3.5(@types/node@22.2.0)(terser@5.31.6)
+ vite-node: 2.0.4(@types/node@22.2.0)(terser@5.31.6)
+ why-is-node-running: 2.3.0
+ optionalDependencies:
+ '@types/node': 22.2.0
+ jsdom: 24.1.1(canvas@2.11.2)
+ transitivePeerDependencies:
+ - less
+ - lightningcss
+ - sass
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+
w3c-xmlserializer@5.0.0:
dependencies:
xml-name-validator: 5.0.0
@@ -16603,7 +17146,7 @@ snapshots:
makeerror: 1.0.12
optional: true
- watchpack@2.4.1:
+ watchpack@2.4.2:
dependencies:
glob-to-regexp: 0.4.1
graceful-fs: 4.2.11
@@ -16681,9 +17224,9 @@ snapshots:
'@webassemblyjs/wasm-parser': 1.12.1
acorn: 8.12.1
acorn-import-attributes: 1.9.5(acorn@8.12.1)
- browserslist: 4.23.2
+ browserslist: 4.23.3
chrome-trace-event: 1.0.4
- enhanced-resolve: 5.17.0
+ enhanced-resolve: 5.17.1
es-module-lexer: 1.5.4
eslint-scope: 5.1.1
events: 3.3.0
@@ -16696,7 +17239,7 @@ snapshots:
schema-utils: 3.3.0
tapable: 2.2.1
terser-webpack-plugin: 5.3.10(@swc/core@1.5.7)(esbuild@0.21.5)(webpack@5.93.0(@swc/core@1.5.7)(esbuild@0.21.5))
- watchpack: 2.4.1
+ watchpack: 2.4.2
webpack-sources: 3.2.3
transitivePeerDependencies:
- '@swc/core'