Skip to content

Commit

Permalink
Add about dialog (#321)
Browse files Browse the repository at this point in the history 
* Fix prop-types of TopBar
* Move AboutDialog as default in ToolBar

---------

Signed-off-by: Tristan Chuine <[email protected]>
Co-authored-by: BOUTIER Charly <[email protected]>
  • Loading branch information
@Tristan-WorkGH
Tristan-WorkGH and BOUTIER Charly authored Dec 8, 2023
1 parent 179e1d7 commit f15544a
Show file tree
Hide file tree
Showing 9 changed files with 667 additions and 97 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
/node_modules
/umd
npm-debug.log*
/.idea
/.idea
*.tgz
124 changes: 92 additions & 32 deletions demo/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import React, { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useRef, useState } from 'react';

import TopBar from '../../src/components/TopBar';
import SnackbarProvider from '../../src/components/SnackbarProvider';

import {
createTheme,
StyledEngineProvider,
ThemeProvider,
} from '@mui/material/styles';
import makeStyles from '@mui/styles/makeStyles';
import withStyles from '@mui/styles/withStyles';
import { styled } from '@mui/system';
import AuthenticationRouter from '../../src/components/AuthenticationRouter';
import CardErrorBoundary from '../../src/components/CardErrorBoundary';
import {
Expand All @@ -32,19 +23,50 @@ import {
LIGHT_THEME,
logout,
} from '../../src';
import { useSnackMessage } from '../../src/hooks/useSnackMessage';

import {
createTheme,
StyledEngineProvider,
ThemeProvider,
} from '@mui/material/styles';
import { makeStyles, withStyles } from '@mui/styles';
import { styled } from '@mui/system';
import {
Box,
Button,
Checkbox,
CssBaseline,
FormControl,
FormControlLabel,
FormGroup,
Grid,
InputLabel,
MenuItem,
Select,
Tab,
Tabs,
TextField,
Typography,
} from '@mui/material';

import { useMatch } from 'react-router';
import { IntlProvider, useIntl } from 'react-intl';

import { BrowserRouter, useLocation, useNavigate } from 'react-router-dom';
import { useSnackMessage } from '../../src/hooks/useSnackMessage';

import {
card_error_boundary_en,
card_error_boundary_fr,
element_search_en,
element_search_fr,
equipment_search_en,
equipment_search_fr,
flat_parameters_en,
flat_parameters_fr,
login_en,
login_fr,
multiple_selection_dialog_en,
multiple_selection_dialog_fr,
report_viewer_en,
report_viewer_fr,
table_en,
Expand All @@ -53,27 +75,10 @@ import {
top_bar_fr,
treeview_finder_en,
treeview_finder_fr,
card_error_boundary_en,
card_error_boundary_fr,
flat_parameters_en,
flat_parameters_fr,
multiple_selection_dialog_en,
multiple_selection_dialog_fr,
} from '../../src/index';
import CssBaseline from '@mui/material/CssBaseline';
import Typography from '@mui/material/Typography';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import FormControl from '@mui/material/FormControl';
import InputLabel from '@mui/material/InputLabel';
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';

import PowsyblLogo from '-!@svgr/webpack!../images/powsybl_logo.svg';
import AppPackage from '../../package.json';

import ReportViewerDialog from '../../src/components/ReportViewerDialog';
import TreeViewFinder, {
Expand All @@ -91,7 +96,6 @@ import {
import { LOGS_JSON } from '../data/ReportViewer';

import { searchEquipments } from '../data/EquipmentSearchBar';
import { Grid, Tab, Tabs } from '@mui/material';
import { EquipmentItem } from '../../src/components/ElementSearchDialog/equipment-item';
import OverflowableText from '../../src/components/OverflowableText';

Expand Down Expand Up @@ -430,6 +434,57 @@ const AppContent = ({ language, onLanguageClick }) => {
[]
);

const aboutTimerVersion = useRef();
const aboutTimerCmpnt = useRef();
function simulateGetGlobalVersion(setter) {
console.log('getGlobalVersion() called');
aboutTimerVersion.current = window.setTimeout(
() => setter('1.0.0-demo'),
1250
);
}
function simulateGetAdditionalComponents(setComponents) {
console.log('getAdditionalComponents() called');
aboutTimerCmpnt.current = window.setTimeout(
() =>
setComponents(
[
{ type: 'server', name: 'Server 1', version: '1.0.0' },
{ type: 'server', name: 'Server 2', version: '1.0.0' },
{
type: 'server',
name: 'Server 3',
version: '1.0.0',
gitTag: 'v1.0.0',
license: 'MPL',
},
{ type: 'server', name: 'Server 4', version: '1.0.0' },
{ type: 'server', name: 'Server 5', version: '1.0.0' },
{ type: 'server', name: 'Server 6', version: '1.0.0' },
{ type: 'server', name: 'Server 7', version: '1.0.0' },
{ type: 'server', name: 'Server 8', version: '1.0.0' },
{ type: 'server', name: 'Server 9', version: '1.0.0' },
{ type: 'app', name: 'My App 1', version: 'demo' },
{
type: 'app',
name: 'My application with a long name',
version: 'v0.0.1',
},
{ type: 'other', name: 'Something', version: 'none' },
{
name: 'Component with a very long name without version',
},
].concat(
[...new Array(30)].map(() => ({
name: 'Filling for demo',
version: '???',
}))
)
),
3000
);
}

const CustomTreeViewFinder =
stylesProvider === 'emotion'
? CustomTreeViewFinderEmotion
Expand Down Expand Up @@ -657,7 +712,12 @@ const AppContent = ({ language, onLanguageClick }) => {
onLogoClick={() => console.log('logo')}
onThemeClick={handleThemeClick}
theme={theme}
onAboutClick={() => console.log('about')}
appVersion={AppPackage.version}
appLicense={AppPackage.license}
getGlobalVersion={simulateGetGlobalVersion}
getAdditionalModules={
simulateGetAdditionalComponents
}
onEquipmentLabellingClick={
handleEquipmentLabellingClick
}
Expand Down
Loading

0 comments on commit f15544a

Please sign in to comment.