Skip to content

Commit

Permalink
Merge branch 'main' into separate-the-two-types-HVDC-stations
Browse files Browse the repository at this point in the history
  • Loading branch information
ghazwarhili authored Feb 12, 2025
2 parents cd63884 + 8e27964 commit e563cc0
Show file tree
Hide file tree
Showing 22 changed files with 3,436 additions and 4,442 deletions.
17 changes: 4 additions & 13 deletions demo/src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
FormGroup,
Grid,
IconButton,
styled,
StyledEngineProvider,
Tab,
Tabs,
Expand All @@ -24,30 +25,21 @@ import {
Typography,
} from '@mui/material';
import CommentIcon from '@mui/icons-material/Comment';
import { styled } from '@mui/system';
import { useMatch } from 'react-router';
import { BrowserRouter, useLocation, useMatch, useNavigate } from 'react-router';
import { IntlProvider, useIntl } from 'react-intl';
import { BrowserRouter, useLocation, useNavigate } from 'react-router-dom';
import { useCallback, useEffect, useRef, useState } from 'react';
import translations from './demo_intl';

// eslint-disable-next-line import/no-unresolved
import PowsyblLogo from '../images/powsybl_logo.svg?react';
import PowsyblLogo from '../images/powsybl_logo.svg?react'; // eslint-disable-line import/no-unresolved
import AppPackage from '../../package.json';

import TreeViewFinderConfig from './TreeViewFinderConfig';

import {
fetchInfiniteTestDataList,
fetchInfiniteTestDataTree,
testDataList,
testDataTree,
} from '../data/TreeViewFinder';

import searchEquipments from '../data/EquipmentSearchBar';

import FlatParametersTab from './FlatParametersTab';

import InputsTab from './InputsTab';
import { EquipmentSearchDialog } from './equipment-search';
import { InlineSearch } from './inline-search';
Expand Down Expand Up @@ -814,7 +806,6 @@ function AppContent({ language, onLanguageClick }) {
</div>
<hr />
<Crasher />
<Button onClick={() => setDeveloperMode(!developerMode)}>Toggle developer mode</Button>
</div>
);

Expand All @@ -828,7 +819,7 @@ function AppContent({ language, onLanguageClick }) {
appName="Demo"
appColor="#808080"
appLogo={<PowsyblLogo />}
onUserSettingsClick={() => console.log('user settings')}
onDeveloperModeClick={() => setDeveloperMode(!developerMode)}
developerMode={developerMode}
onLogoutClick={() => logout(dispatch, userManager.instance)}
onLogoClick={() => console.log('logo')}
Expand Down
3 changes: 1 addition & 2 deletions demo/src/right-resizable-box.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import { MoreVert as ResizePanelHandleIcon } from '@mui/icons-material';
import { ResizableBox } from 'react-resizable';
import { useWindowWidth } from '@react-hook/window-size';
import PropTypes from 'prop-types';
import { Box } from '@mui/material';
import { styled } from '@mui/system';
import { Box, styled } from '@mui/material';
import { mergeSx } from '../../src/utils/styles';

const styles = {
Expand Down
Loading

0 comments on commit e563cc0

Please sign in to comment.